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 [4/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/value/svg/ShapeRenderingManager.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/svg/ShapeRenderingManager.java?rev=384062&r1=384061&r2=384062&view=diff
==============================================================================
--- xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/svg/ShapeRenderingManager.java (original)
+++ xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/svg/ShapeRenderingManager.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 'shape-rendering' 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/SpacingManager.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/svg/SpacingManager.java?rev=384062&r1=384061&r2=384062&view=diff
==============================================================================
--- xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/svg/SpacingManager.java (original)
+++ xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/svg/SpacingManager.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;
@@ -52,6 +54,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_LENGTH_OR_IDENT;
}
/**
Modified: xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/svg/StrokeDasharrayManager.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/svg/StrokeDasharrayManager.java?rev=384062&r1=384061&r2=384062&view=diff
==============================================================================
--- xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/svg/StrokeDasharrayManager.java (original)
+++ xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/svg/StrokeDasharrayManager.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;
@@ -43,6 +45,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_LENGTH_LIST_OR_IDENT;
}
/**
Modified: xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/svg/StrokeDashoffsetManager.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/svg/StrokeDashoffsetManager.java?rev=384062&r1=384061&r2=384062&view=diff
==============================================================================
--- xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/svg/StrokeDashoffsetManager.java (original)
+++ xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/svg/StrokeDashoffsetManager.java Tue Mar 7 16:03:46 2006
@@ -23,6 +23,8 @@
import org.apache.batik.css.engine.value.ValueManager;
import org.apache.batik.util.CSSConstants;
import org.w3c.css.sac.LexicalUnit;
+import org.apache.batik.util.SVGTypes;
+
import org.w3c.dom.DOMException;
/**
@@ -38,6 +40,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_LENGTH_OR_IDENT;
}
/**
Modified: xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/svg/StrokeLinecapManager.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/svg/StrokeLinecapManager.java?rev=384062&r1=384061&r2=384062&view=diff
==============================================================================
--- xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/svg/StrokeLinecapManager.java (original)
+++ xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/svg/StrokeLinecapManager.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 'stroke-linecap' 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/StrokeLinejoinManager.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/svg/StrokeLinejoinManager.java?rev=384062&r1=384061&r2=384062&view=diff
==============================================================================
--- xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/svg/StrokeLinejoinManager.java (original)
+++ xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/svg/StrokeLinejoinManager.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 'stroke-linejoin' 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/StrokeMiterlimitManager.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/svg/StrokeMiterlimitManager.java?rev=384062&r1=384061&r2=384062&view=diff
==============================================================================
--- xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/svg/StrokeMiterlimitManager.java (original)
+++ xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/svg/StrokeMiterlimitManager.java Tue Mar 7 16:03:46 2006
@@ -23,6 +23,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;
@@ -40,6 +42,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_NUMBER_OR_IDENT;
}
/**
Modified: xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/svg/StrokeWidthManager.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/svg/StrokeWidthManager.java?rev=384062&r1=384061&r2=384062&view=diff
==============================================================================
--- xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/svg/StrokeWidthManager.java (original)
+++ xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/svg/StrokeWidthManager.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;
@@ -38,6 +40,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_LENGTH_OR_IDENT;
}
/**
Modified: xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/svg/TextAnchorManager.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/svg/TextAnchorManager.java?rev=384062&r1=384061&r2=384062&view=diff
==============================================================================
--- xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/svg/TextAnchorManager.java (original)
+++ xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/svg/TextAnchorManager.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 'text-anchor' 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/TextRenderingManager.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/svg/TextRenderingManager.java?rev=384062&r1=384061&r2=384062&view=diff
==============================================================================
--- xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/svg/TextRenderingManager.java (original)
+++ xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/svg/TextRenderingManager.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 'text-rendering' 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/WritingModeManager.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/svg/WritingModeManager.java?rev=384062&r1=384061&r2=384062&view=diff
==============================================================================
--- xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/svg/WritingModeManager.java (original)
+++ xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/svg/WritingModeManager.java Tue Mar 7 16:03:46 2006
@@ -22,6 +22,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 'writing-mode' property values.
@@ -56,6 +57,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/svg12/LineHeightManager.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/svg12/LineHeightManager.java?rev=384062&r1=384061&r2=384062&view=diff
==============================================================================
--- xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/svg12/LineHeightManager.java (original)
+++ xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/svg12/LineHeightManager.java Tue Mar 7 16:03:46 2006
@@ -27,6 +27,7 @@
import org.apache.batik.css.engine.value.Value;
import org.apache.batik.css.engine.value.ValueManager;
import org.apache.batik.util.SVG12CSSConstants;
+import org.apache.batik.util.SVGTypes;
import org.w3c.css.sac.LexicalUnit;
import org.w3c.dom.css.CSSPrimitiveValue;
@@ -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 true;
+ }
+
+ /**
+ * 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/svg12/MarginLengthManager.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/svg12/MarginLengthManager.java?rev=384062&r1=384061&r2=384062&view=diff
==============================================================================
--- xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/svg12/MarginLengthManager.java (original)
+++ xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/svg12/MarginLengthManager.java Tue Mar 7 16:03:46 2006
@@ -23,6 +23,8 @@
import org.apache.batik.css.engine.value.Value;
import org.apache.batik.css.engine.value.ValueManager;
import org.apache.batik.css.engine.value.svg.SVGValueConstants;
+import org.apache.batik.util.SVGTypes;
+
import org.w3c.css.sac.LexicalUnit;
import org.w3c.dom.DOMException;
@@ -45,6 +47,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_LENGTH_OR_IDENT;
}
/**
Modified: xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/svg12/MarginShorthandManager.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/svg12/MarginShorthandManager.java?rev=384062&r1=384061&r2=384062&view=diff
==============================================================================
--- xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/svg12/MarginShorthandManager.java (original)
+++ xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/svg12/MarginShorthandManager.java Tue Mar 7 16:03:46 2006
@@ -46,6 +46,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/svg12/TextAlignManager.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/svg12/TextAlignManager.java?rev=384062&r1=384061&r2=384062&view=diff
==============================================================================
--- xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/svg12/TextAlignManager.java (original)
+++ xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/svg12/TextAlignManager.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.SVG12CSSConstants;
+import org.apache.batik.util.SVGTypes;
/**
* This class provides a manager for the 'text-align' property values.
@@ -53,6 +54,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/dom/AbstractStylableDocument.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/anim/sources/org/apache/batik/dom/AbstractStylableDocument.java?rev=384062&r1=384061&r2=384062&view=diff
==============================================================================
--- xmlgraphics/batik/branches/anim/sources/org/apache/batik/dom/AbstractStylableDocument.java (original)
+++ xmlgraphics/batik/branches/anim/sources/org/apache/batik/dom/AbstractStylableDocument.java Tue Mar 7 16:03:46 2006
@@ -121,5 +121,4 @@
String pseudoElt) {
throw new RuntimeException(" !!! Not implemented");
}
-
};
Modified: xmlgraphics/batik/branches/anim/sources/org/apache/batik/dom/events/DOMUIEvent.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/anim/sources/org/apache/batik/dom/events/DOMUIEvent.java?rev=384062&r1=384061&r2=384062&view=diff
==============================================================================
--- xmlgraphics/batik/branches/anim/sources/org/apache/batik/dom/events/DOMUIEvent.java (original)
+++ xmlgraphics/batik/branches/anim/sources/org/apache/batik/dom/events/DOMUIEvent.java Tue Mar 7 16:03:46 2006
@@ -113,6 +113,7 @@
a.add(sb.toString());
break;
}
+ sb.append(c);
}
if (i == len) {
a.add(sb.toString());
Modified: xmlgraphics/batik/branches/anim/sources/org/apache/batik/dom/events/EventSupport.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/anim/sources/org/apache/batik/dom/events/EventSupport.java?rev=384062&r1=384061&r2=384062&view=diff
==============================================================================
--- xmlgraphics/batik/branches/anim/sources/org/apache/batik/dom/events/EventSupport.java (original)
+++ xmlgraphics/batik/branches/anim/sources/org/apache/batik/dom/events/EventSupport.java Tue Mar 7 16:03:46 2006
@@ -1,6 +1,6 @@
/*
- Copyright 2000-2003,2005 The Apache Software Foundation
+ Copyright 2000-2003,2005 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.
@@ -34,7 +34,7 @@
/**
* The class allows registration and removal of EventListeners on
- * an NodeEventTarget and dispatch of events to that NodeEventTarget.
+ * an NodeEventTarget and dispatch of events to that NodeEventTarget.
*
* @see NodeEventTarget
* @author <a href="mailto:Thierry.Kormann@sophia.inria.fr">Thierry Kormann</a>
@@ -91,9 +91,9 @@
* dispatched to any <code>EventTargets</code> beneath them in the
* tree. Events which are bubbling upward through the tree will
* not trigger an <code>EventListener</code> designated to use
- * capture.
+ * capture.
*/
- public void addEventListener(String type, EventListener listener,
+ public void addEventListener(String type, EventListener listener,
boolean useCapture) {
addEventListenerNS(null, type, listener, useCapture, null);
}
@@ -152,9 +152,9 @@
* capturing listener or not. If a listener was registered twice,
* one with capture and one without, each must be removed
* separately. Removal of a capturing listener does not affect a
- * non-capturing version of the same listener, and vice versa.
+ * non-capturing version of the same listener, and vice versa.
*/
- public void removeEventListener(String type, EventListener listener,
+ public void removeEventListener(String type, EventListener listener,
boolean useCapture) {
removeEventListenerNS(null, type, listener, useCapture);
}
@@ -221,9 +221,9 @@
* the event before <code>dispatchEvent</code> was
* called. Specification of the <code>Event</code>'s type as
* <code>null</code> or an empty string will also trigger this
- * exception.
+ * exception.
*/
- public boolean dispatchEvent(NodeEventTarget target, Event e)
+ public boolean dispatchEvent(NodeEventTarget target, Event e)
throws EventException {
if (e == null) {
return false;
@@ -233,7 +233,7 @@
boolean isCustom;
if (e instanceof CustomEvent) {
isCustom = true;
- ce = (CustomEvent) ce;
+ ce = (CustomEvent)e;
} else if (e instanceof org.w3c.dom.events.CustomEvent) {
isCustom = true;
ce = new WrappedEvent((org.w3c.dom.events.CustomEvent) e);
@@ -384,7 +384,7 @@
/**
* Fires the registered listeners on the given event target.
*/
- protected void fireEventListeners(NodeEventTarget node,
+ protected void fireEventListeners(NodeEventTarget node,
Event e,
boolean useCapture,
HashSet stoppedGroups,
@@ -452,10 +452,10 @@
/**
* Returns a list event listeners depending on the specified event
* type and phase.
- * @param type the event type
+ * @param type the event type
* @param useCapture
*/
- public EventListenerList getEventListeners(String type,
+ public EventListenerList getEventListeners(String type,
boolean useCapture) {
HashTable listeners
= useCapture ? capturingListeners : bubblingListeners;
@@ -698,8 +698,8 @@
/**
* Initializes this event object.
*/
- public void initEvent(String eventTypeArg,
- boolean canBubbleArg,
+ public void initEvent(String eventTypeArg,
+ boolean canBubbleArg,
boolean cancelableArg) {
e.initEvent(eventTypeArg, canBubbleArg, cancelableArg);
}
@@ -852,9 +852,9 @@
* Initializes this event object.
* @see org.w3c.dom.events.Event#initEventNS
*/
- public void initEventNS(String namespaceURIArg,
- String eventTypeArg,
- boolean canBubbleArg,
+ public void initEventNS(String namespaceURIArg,
+ String eventTypeArg,
+ boolean canBubbleArg,
boolean cancelableArg) {
// This method is not needed for event processing.
}
Modified: xmlgraphics/batik/branches/anim/sources/org/apache/batik/dom/svg/SVGOMAnimationElement.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/anim/sources/org/apache/batik/dom/svg/SVGOMAnimationElement.java?rev=384062&r1=384061&r2=384062&view=diff
==============================================================================
--- xmlgraphics/batik/branches/anim/sources/org/apache/batik/dom/svg/SVGOMAnimationElement.java (original)
+++ xmlgraphics/batik/branches/anim/sources/org/apache/batik/dom/svg/SVGOMAnimationElement.java Tue Mar 7 16:03:46 2006
@@ -17,15 +17,20 @@
*/
package org.apache.batik.dom.svg;
+import java.util.Calendar;
+
+import org.apache.batik.anim.timing.TimedElement;
import org.apache.batik.dom.AbstractDocument;
+
import org.w3c.dom.DOMException;
+import org.w3c.dom.events.EventTarget;
import org.w3c.dom.svg.SVGAnimatedBoolean;
import org.w3c.dom.svg.SVGAnimationElement;
import org.w3c.dom.svg.SVGElement;
import org.w3c.dom.svg.SVGStringList;
/**
- * This class provides an implementation of the SVGAnimationElement interface.
+ * This class provides an implementation of the {@link SVGAnimationElement} interface.
*
* @author <a href="mailto:stephane@hillion.org">Stephane Hillion</a>
* @version $Id$
@@ -47,7 +52,6 @@
*/
protected SVGOMAnimationElement(String prefix, AbstractDocument owner) {
super(prefix, owner);
-
}
/**
@@ -75,7 +79,14 @@
* <b>DOM</b>: Implements {@link SVGAnimationElement#getSimpleDuration()}.
*/
public float getSimpleDuration() throws DOMException {
- throw new RuntimeException("!!! TODO: getSimpleDuration()");
+ throw new RuntimeException("!!! TODO: getCurrentTime()");
+// float dur = timedElement.getSimpleDur();
+// if (dur == TimedElement.INDEFINITE) {
+// throw createDOMException(DOMException.NOT_SUPPORTED_ERR,
+// "animation.dur.indefinite",
+// null);
+// }
+// return dur;
}
// ElementTimeControl ////////////////////////////////////////////////
Modified: xmlgraphics/batik/branches/anim/sources/org/apache/batik/dom/svg/SVGOMDocument.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/anim/sources/org/apache/batik/dom/svg/SVGOMDocument.java?rev=384062&r1=384061&r2=384062&view=diff
==============================================================================
--- xmlgraphics/batik/branches/anim/sources/org/apache/batik/dom/svg/SVGOMDocument.java (original)
+++ xmlgraphics/batik/branches/anim/sources/org/apache/batik/dom/svg/SVGOMDocument.java Tue Mar 7 16:03:46 2006
@@ -1,6 +1,6 @@
/*
- Copyright 2000-2003,2005 The Apache Software Foundation
+ Copyright 2000-2003,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.
@@ -21,12 +21,18 @@
import java.io.ObjectInputStream;
import java.net.MalformedURLException;
import java.net.URL;
+import java.util.Calendar;
import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
import java.util.Locale;
import java.util.MissingResourceException;
+import org.apache.batik.anim.timing.TimedDocumentRoot;
+import org.apache.batik.anim.timing.TimedElement;
import org.apache.batik.css.engine.CSSNavigableDocument;
import org.apache.batik.css.engine.CSSNavigableDocumentListener;
+import org.apache.batik.css.engine.CSSStylableElement;
import org.apache.batik.dom.AbstractStylableDocument;
import org.apache.batik.dom.GenericAttr;
import org.apache.batik.dom.GenericAttrNS;
@@ -38,6 +44,7 @@
import org.apache.batik.dom.GenericProcessingInstruction;
import org.apache.batik.dom.GenericText;
import org.apache.batik.dom.StyleSheetFactory;
+import org.apache.batik.dom.events.DOMTimeEvent;
import org.apache.batik.dom.events.EventSupport;
import org.apache.batik.dom.util.XMLSupport;
import org.apache.batik.i18n.LocalizableSupport;
@@ -56,8 +63,10 @@
import org.w3c.dom.Node;
import org.w3c.dom.ProcessingInstruction;
import org.w3c.dom.Text;
+import org.w3c.dom.css.CSSStyleDeclaration;
import org.w3c.dom.events.Event;
import org.w3c.dom.events.EventListener;
+import org.w3c.dom.events.EventTarget;
import org.w3c.dom.events.MutationEvent;
import org.w3c.dom.svg.SVGDocument;
import org.w3c.dom.svg.SVGLangSpace;
@@ -73,7 +82,8 @@
extends AbstractStylableDocument
implements SVGDocument,
SVGConstants,
- CSSNavigableDocument {
+ CSSNavigableDocument,
+ IdContainer {
/**
* The error messages bundle class name.
@@ -422,6 +432,45 @@
}
/**
+ * The text of the override style declaration for this element has been
+ * modified.
+ */
+ protected void overrideStyleTextChanged(CSSStylableElement e, String text) {
+ Iterator i = cssNavigableDocumentListeners.keySet().iterator();
+ while (i.hasNext()) {
+ CSSNavigableDocumentListener l =
+ (CSSNavigableDocumentListener) i.next();
+ l.overrideStyleTextChanged(e, text);
+ }
+ }
+
+ /**
+ * A property in the override style declaration has been removed.
+ */
+ protected void overrideStylePropertyRemoved(CSSStylableElement e,
+ String name) {
+ Iterator i = cssNavigableDocumentListeners.keySet().iterator();
+ while (i.hasNext()) {
+ CSSNavigableDocumentListener l =
+ (CSSNavigableDocumentListener) i.next();
+ l.overrideStylePropertyRemoved(e, name);
+ }
+ }
+
+ /**
+ * A property in the override style declaration has been changed.
+ */
+ protected void overrideStylePropertyChanged
+ (CSSStylableElement e, String name, String value, String prio) {
+ Iterator i = cssNavigableDocumentListeners.keySet().iterator();
+ while (i.hasNext()) {
+ CSSNavigableDocumentListener l =
+ (CSSNavigableDocumentListener) i.next();
+ l.overrideStylePropertyChanged(e, name, value, prio);
+ }
+ }
+
+ /**
* DOM node inserted listener wrapper.
*/
protected class DOMNodeInsertedListenerWrapper implements EventListener {
@@ -559,6 +608,20 @@
}
}
+ // DocumentCSS ////////////////////////////////////////////////////////////
+
+ /**
+ * <b>DOM</b>: Implements
+ * {@link DocumentCSS#getOverrideStyle(Element,String)}.
+ */
+ public CSSStyleDeclaration getOverrideStyle(Element elt,
+ String pseudoElt) {
+ if (elt instanceof SVGStylableElement && pseudoElt == null) {
+ return ((SVGStylableElement) elt).getOverrideStyle();
+ }
+ return null;
+ }
+
// AbstractDocument ///////////////////////////////////////////////
/**
@@ -587,13 +650,13 @@
* @param n a node of the type of this.
*/
protected Node copyInto(Node n) {
- super.copyInto(n);
- SVGOMDocument sd = (SVGOMDocument)n;
+ super.copyInto(n);
+ SVGOMDocument sd = (SVGOMDocument)n;
sd.localizableSupport = new LocalizableSupport
(RESOURCES, getClass().getClassLoader());
sd.referrer = referrer;
sd.url = url;
- return n;
+ return n;
}
/**
@@ -601,13 +664,13 @@
* @param n a node of the type of this.
*/
protected Node deepCopyInto(Node n) {
- super.deepCopyInto(n);
+ super.deepCopyInto(n);
SVGOMDocument sd = (SVGOMDocument)n;
sd.localizableSupport = new LocalizableSupport
(RESOURCES, getClass().getClassLoader());
sd.referrer = referrer;
sd.url = url;
- return n;
+ return n;
}
// Serialization //////////////////////////////////////////////////////
Modified: xmlgraphics/batik/branches/anim/sources/org/apache/batik/dom/svg/SVGOMElement.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/anim/sources/org/apache/batik/dom/svg/SVGOMElement.java?rev=384062&r1=384061&r2=384062&view=diff
==============================================================================
--- xmlgraphics/batik/branches/anim/sources/org/apache/batik/dom/svg/SVGOMElement.java (original)
+++ xmlgraphics/batik/branches/anim/sources/org/apache/batik/dom/svg/SVGOMElement.java Tue Mar 7 16:03:46 2006
@@ -19,10 +19,14 @@
import org.apache.batik.css.engine.CSSEngine;
import org.apache.batik.css.engine.CSSNavigableNode;
+import org.apache.batik.css.engine.value.ShorthandManager;
+import org.apache.batik.css.engine.value.ValueManager;
import org.apache.batik.dom.AbstractDocument;
+import org.apache.batik.dom.AbstractStylableDocument;
import org.apache.batik.dom.util.DOMUtilities;
import org.apache.batik.util.ParsedURL;
import org.apache.batik.util.SVGConstants;
+import org.apache.batik.util.SVGTypes;
import org.apache.batik.util.XMLConstants;
import org.w3c.dom.Attr;
import org.w3c.dom.DOMException;
@@ -48,7 +52,8 @@
public abstract class SVGOMElement
extends AbstractElement
implements SVGElement,
- SVGConstants {
+ SVGConstants,
+ ExtendedTraitAccess {
/**
* Is this element immutable?
@@ -367,6 +372,121 @@
putLiveAttributeValue(ns, ln, (LiveAttributeValue)result);
}
return result;
+ }
+
+ // ExtendedTraitAccess ///////////////////////////////////////////////////
+
+ /**
+ * Returns whether the given CSS property is available on this element.
+ */
+ public boolean hasProperty(String pn) {
+ AbstractStylableDocument doc = (AbstractStylableDocument) ownerDocument;
+ CSSEngine eng = doc.getCSSEngine();
+ return eng.getPropertyIndex(pn) != -1
+ || eng.getShorthandIndex(pn) != -1;
+ }
+
+ /**
+ * Returns whether the given trait is available on this element.
+ */
+ public boolean hasTrait(String ns, String ln) {
+ // XXX no traits yet
+ return false;
+ }
+
+ /**
+ * Returns whether the given CSS property is animatable.
+ */
+ public boolean isPropertyAnimatable(String pn) {
+ AbstractStylableDocument doc = (AbstractStylableDocument) ownerDocument;
+ CSSEngine eng = doc.getCSSEngine();
+ int idx = eng.getPropertyIndex(pn);
+ if (idx != -1) {
+ ValueManager[] vms = eng.getValueManagers();
+ return vms[idx].isAnimatableProperty();
+ }
+ idx = eng.getShorthandIndex(pn);
+ if (idx != -1) {
+ ShorthandManager[] sms = eng.getShorthandManagers();
+ return sms[idx].isAnimatableProperty();
+ }
+ return false;
+ }
+
+ /**
+ * Returns whether the given XML attribute is animatable.
+ */
+ public boolean isAttributeAnimatable(String ns, String ln) {
+ // XXX no attributes yet
+ return false;
+ }
+
+ /**
+ * Returns whether the given CSS property is additive.
+ */
+ public boolean isPropertyAdditive(String pn) {
+ AbstractStylableDocument doc = (AbstractStylableDocument) ownerDocument;
+ CSSEngine eng = doc.getCSSEngine();
+ int idx = eng.getPropertyIndex(pn);
+ if (idx != -1) {
+ ValueManager[] vms = eng.getValueManagers();
+ return vms[idx].isAdditiveProperty();
+ }
+ idx = eng.getShorthandIndex(pn);
+ if (idx != -1) {
+ ShorthandManager[] sms = eng.getShorthandManagers();
+ return sms[idx].isAdditiveProperty();
+ }
+ return false;
+ }
+
+ /**
+ * Returns whether the given XML attribute is additive.
+ */
+ public boolean isAttributeAdditive(String ns, String ln) {
+ // XXX no attributes yet
+ return false;
+ }
+
+ /**
+ * Returns whether the given trait is animatable.
+ */
+ public boolean isTraitAnimatable(String ns, String tn) {
+ // XXX no traits yet
+ return false;
+ }
+
+ /**
+ * Returns whether the given trait is additive.
+ */
+ public boolean isTraitAdditive(String ns, String tn) {
+ // XXX no traits yet
+ return false;
+ }
+
+ /**
+ * Returns the type of the given property.
+ * XXX should be in ExtendedTraitAccess
+ */
+ public int getPropertyType(String pn) {
+ AbstractStylableDocument doc =
+ (AbstractStylableDocument) ownerDocument;
+ CSSEngine eng = doc.getCSSEngine();
+ int idx = eng.getPropertyIndex(pn);
+ if (idx != -1) {
+ ValueManager[] vms = eng.getValueManagers();
+ return vms[idx].getPropertyType();
+ }
+ return SVGTypes.TYPE_UNKNOWN;
+ }
+
+ /**
+ * Returns the type of the given attribute.
+ * XXX should be in ExtendedTraitAccess
+ */
+ public int getAttributeType(String ns, String ln) {
+ // XXX no attributes yet
+ return SVGTypes.TYPE_UNKNOWN;
}
// Importation/Cloning ///////////////////////////////////////////
Modified: xmlgraphics/batik/branches/anim/sources/org/apache/batik/dom/svg/SVGOMTransform.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/anim/sources/org/apache/batik/dom/svg/SVGOMTransform.java?rev=384062&r1=384061&r2=384062&view=diff
==============================================================================
--- xmlgraphics/batik/branches/anim/sources/org/apache/batik/dom/svg/SVGOMTransform.java (original)
+++ xmlgraphics/batik/branches/anim/sources/org/apache/batik/dom/svg/SVGOMTransform.java Tue Mar 7 16:03:46 2006
@@ -23,52 +23,52 @@
import org.w3c.dom.svg.SVGMatrix;
/**
- * This class is the implementation of
- * the SVGTransform interface.
- *
- * Create an identity SVGTransform
+ * This class is the implementation of the SVGTransform interface.
*
* @author <a href="mailto:nicolas.socheleau@bitflash.com">Nicolas Socheleau</a>
* @version $Id$
*/
public class SVGOMTransform extends AbstractSVGTransform {
-
- public SVGOMTransform(){
- super();
+ /**
+ * Creates a new SVGOMTransform.
+ */
+ public SVGOMTransform() {
affineTransform = new AffineTransform();
}
- protected SVGMatrix createMatrix(){
- return new AbstractSVGMatrix(){
- protected AffineTransform getAffineTransform(){
- return SVGOMTransform.this.affineTransform;
- }
-
- public void setA(float a) throws DOMException {
- SVGOMTransform.this.setType(SVG_TRANSFORM_MATRIX);
- super.setA(a);
- }
- public void setB(float b) throws DOMException {
- SVGOMTransform.this.setType(SVG_TRANSFORM_MATRIX);
- super.setB(b);
- }
- public void setC(float c) throws DOMException {
- SVGOMTransform.this.setType(SVG_TRANSFORM_MATRIX);
- super.setC(c);
- }
- public void setD(float d) throws DOMException {
- SVGOMTransform.this.setType(SVG_TRANSFORM_MATRIX);
- super.setD(d);
- }
- public void setE(float e) throws DOMException {
- SVGOMTransform.this.setType(SVG_TRANSFORM_MATRIX);
- super.setE(e);
- }
- public void setF(float f) throws DOMException {
- SVGOMTransform.this.setType(SVG_TRANSFORM_MATRIX);
- super.setF(f);
- }
- };
+ /**
+ * Creates a new, modifiable SVGMatrix.
+ */
+ protected SVGMatrix createMatrix() {
+ return new AbstractSVGMatrix() {
+ protected AffineTransform getAffineTransform() {
+ return SVGOMTransform.this.affineTransform;
+ }
+ public void setA(float a) throws DOMException {
+ SVGOMTransform.this.setType(SVG_TRANSFORM_MATRIX);
+ super.setA(a);
+ }
+ public void setB(float b) throws DOMException {
+ SVGOMTransform.this.setType(SVG_TRANSFORM_MATRIX);
+ super.setB(b);
+ }
+ public void setC(float c) throws DOMException {
+ SVGOMTransform.this.setType(SVG_TRANSFORM_MATRIX);
+ super.setC(c);
+ }
+ public void setD(float d) throws DOMException {
+ SVGOMTransform.this.setType(SVG_TRANSFORM_MATRIX);
+ super.setD(d);
+ }
+ public void setE(float e) throws DOMException {
+ SVGOMTransform.this.setType(SVG_TRANSFORM_MATRIX);
+ super.setE(e);
+ }
+ public void setF(float f) throws DOMException {
+ SVGOMTransform.this.setType(SVG_TRANSFORM_MATRIX);
+ super.setF(f);
+ }
+ };
}
}
Modified: xmlgraphics/batik/branches/anim/sources/org/apache/batik/dom/svg/SVGStylableElement.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/anim/sources/org/apache/batik/dom/svg/SVGStylableElement.java?rev=384062&r1=384061&r2=384062&view=diff
==============================================================================
--- xmlgraphics/batik/branches/anim/sources/org/apache/batik/dom/svg/SVGStylableElement.java (original)
+++ xmlgraphics/batik/branches/anim/sources/org/apache/batik/dom/svg/SVGStylableElement.java Tue Mar 7 16:03:46 2006
@@ -1,6 +1,6 @@
/*
- Copyright 2001-2005 The Apache Software Foundation
+ Copyright 2001-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.
@@ -22,16 +22,18 @@
import org.apache.batik.css.dom.CSSOMSVGColor;
import org.apache.batik.css.dom.CSSOMSVGPaint;
-import org.apache.batik.css.dom.CSSOMSVGStyleDeclaration;
+import org.apache.batik.css.dom.CSSOMStoredStyleDeclaration;
import org.apache.batik.css.dom.CSSOMValue;
import org.apache.batik.css.engine.CSSEngine;
import org.apache.batik.css.engine.CSSStylableElement;
import org.apache.batik.css.engine.SVGCSSEngine;
+import org.apache.batik.css.engine.StyleDeclarationProvider;
import org.apache.batik.css.engine.StyleMap;
import org.apache.batik.css.engine.value.Value;
import org.apache.batik.css.engine.value.svg.SVGColorManager;
import org.apache.batik.css.engine.value.svg.SVGPaintManager;
import org.apache.batik.dom.AbstractDocument;
+
import org.w3c.dom.Attr;
import org.w3c.dom.DOMException;
import org.w3c.dom.Node;
@@ -56,6 +58,11 @@
protected StyleMap computedStyleMap;
/**
+ * The override style declaration for this element.
+ */
+ protected OverrideStyleDeclaration overrideStyleDeclaration;
+
+ /**
* Creates a new SVGStylableElement object.
*/
protected SVGStylableElement() {
@@ -70,6 +77,17 @@
super(prefix, owner);
}
+ /**
+ * Returns the override style declaration for this element.
+ */
+ public CSSStyleDeclaration getOverrideStyle() {
+ if (overrideStyleDeclaration == null) {
+ CSSEngine eng = ((SVGOMDocument) getOwnerDocument()).getCSSEngine();
+ overrideStyleDeclaration = new OverrideStyleDeclaration(eng);
+ }
+ return overrideStyleDeclaration;
+ }
+
// CSSStylableElement //////////////////////////////////////////
/**
@@ -135,6 +153,15 @@
return false;
}
+ /**
+ * Returns the object that gives access to the underlying
+ * {@link org.apache.batik.css.engine.StyleDeclaration} for the override
+ * style of this element.
+ */
+ public StyleDeclarationProvider getOverrideStyleDeclarationProvider() {
+ return (StyleDeclarationProvider) getOverrideStyle();
+ }
+
// SVGStylable support ///////////////////////////////////////////////////
/**
@@ -509,18 +536,11 @@
* This class represents the 'style' attribute.
*/
public class StyleDeclaration
- extends CSSOMSVGStyleDeclaration
+ extends CSSOMStoredStyleDeclaration
implements LiveAttributeValue,
- CSSOMSVGStyleDeclaration.ValueProvider,
- CSSOMSVGStyleDeclaration.ModificationHandler,
CSSEngine.MainPropertyReceiver {
/**
- * The associated CSS object.
- */
- protected org.apache.batik.css.engine.StyleDeclaration declaration;
-
- /**
* Whether the mutation comes from this object.
*/
protected boolean mutate;
@@ -529,64 +549,13 @@
* Creates a new StyleDeclaration.
*/
public StyleDeclaration(CSSEngine eng) {
- super(null, null, eng);
- valueProvider = this;
- setModificationHandler(this);
+ super(eng);
declaration = cssEngine.parseStyleDeclaration
(SVGStylableElement.this,
getAttributeNS(null, SVG_STYLE_ATTRIBUTE));
}
- // ValueProvider ////////////////////////////////////////
-
- /**
- * Returns the current value associated with this object.
- */
- public Value getValue(String name) {
- int idx = cssEngine.getPropertyIndex(name);
- for (int i = 0; i < declaration.size(); i++) {
- if (idx == declaration.getIndex(i)) {
- return declaration.getValue(i);
- }
- }
- return null;
- }
-
- /**
- * Tells whether the given property is important.
- */
- public boolean isImportant(String name) {
- int idx = cssEngine.getPropertyIndex(name);
- for (int i = 0; i < declaration.size(); i++) {
- if (idx == declaration.getIndex(i)) {
- return declaration.getPriority(i);
- }
- }
- return false;
- }
-
- /**
- * Returns the text of the declaration.
- */
- public String getText() {
- return declaration.toString(cssEngine);
- }
-
- /**
- * Returns the length of the declaration.
- */
- public int getLength() {
- return declaration.size();
- }
-
- /**
- * Returns the value at the given.
- */
- public String item(int idx) {
- return cssEngine.getPropertyName(declaration.getIndex(idx));
- }
-
// LiveAttributeValue //////////////////////////////////////
/**
@@ -649,13 +618,33 @@
}
}
+ /**
+ * Called when a property was changed.
+ */
+ public void propertyChanged(String name, String value, String prio)
+ throws DOMException {
+ boolean important = prio != null && prio.length() > 0;
+ cssEngine.setMainProperties(SVGStylableElement.this,
+ this, name, value, important);
+ mutate = true;
+ setAttributeNS(null, SVG_STYLE_ATTRIBUTE,
+ declaration.toString(cssEngine));
+ mutate = false;
+ }
+
+ // 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 = cssEngine.getPropertyIndex(name);
if (idx == -1)
return; // unknown property
- int i=0;
- for (; i < declaration.size(); i++) {
+ int i;
+ for (i = 0; i < declaration.size(); i++) {
if (idx == declaration.getIndex(i))
break;
}
@@ -664,19 +653,48 @@
else
declaration.append(v, idx, important);
}
+ }
+
+ /**
+ * This class is a CSSStyleDeclaration for the override style of
+ * the element.
+ */
+ protected class OverrideStyleDeclaration
+ extends CSSOMStoredStyleDeclaration {
+
+ /**
+ * Creates a new OverrideStyleDeclaration.
+ */
+ public OverrideStyleDeclaration(CSSEngine eng) {
+ super(eng);
+ declaration = new org.apache.batik.css.engine.StyleDeclaration();
+ }
+
+ // ModificationHandler ///////////////////////////////////////////////
+
+ /**
+ * Called when the value text has changed.
+ */
+ public void textChanged(String text) throws DOMException {
+ ((SVGOMDocument) ownerDocument).overrideStyleTextChanged
+ (SVGStylableElement.this, text);
+ }
+
+ /**
+ * Called when a property was removed.
+ */
+ public void propertyRemoved(String name) throws DOMException {
+ ((SVGOMDocument) ownerDocument).overrideStylePropertyRemoved
+ (SVGStylableElement.this, name);
+ }
/**
* Called when a property was changed.
*/
public void propertyChanged(String name, String value, String prio)
- throws DOMException {
- boolean important = ((prio != null) && (prio.length() >0));
- cssEngine.setMainProperties(SVGStylableElement.this,
- this, name, value, important);
- mutate = true;
- setAttributeNS(null, SVG_STYLE_ATTRIBUTE,
- declaration.toString(cssEngine));
- mutate = false;
+ throws DOMException {
+ ((SVGOMDocument) ownerDocument).overrideStylePropertyChanged
+ (SVGStylableElement.this, name, value, prio);
}
}
}
Modified: xmlgraphics/batik/branches/anim/sources/org/apache/batik/dom/svg/SVGZoomAndPanSupport.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/anim/sources/org/apache/batik/dom/svg/SVGZoomAndPanSupport.java?rev=384062&r1=384061&r2=384062&view=diff
==============================================================================
--- xmlgraphics/batik/branches/anim/sources/org/apache/batik/dom/svg/SVGZoomAndPanSupport.java (original)
+++ xmlgraphics/batik/branches/anim/sources/org/apache/batik/dom/svg/SVGZoomAndPanSupport.java Tue Mar 7 16:03:46 2006
@@ -54,7 +54,7 @@
default:
throw ((AbstractNode)elt).createDOMException
(DOMException.INVALID_MODIFICATION_ERR,
- "zoom.and.pane",
+ "zoom.and.pan",
new Object[] { new Integer(val) });
}
}
Modified: xmlgraphics/batik/branches/anim/sources/org/apache/batik/dom/svg12/SVGOMFlowDivElement.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/anim/sources/org/apache/batik/dom/svg12/SVGOMFlowDivElement.java?rev=384062&r1=384061&r2=384062&view=diff
==============================================================================
--- xmlgraphics/batik/branches/anim/sources/org/apache/batik/dom/svg12/SVGOMFlowDivElement.java (original)
+++ xmlgraphics/batik/branches/anim/sources/org/apache/batik/dom/svg12/SVGOMFlowDivElement.java Tue Mar 7 16:03:46 2006
@@ -18,9 +18,10 @@
package org.apache.batik.dom.svg12;
import org.apache.batik.dom.AbstractDocument;
-import org.apache.batik.dom.svg.SVGStylableElement;
+import org.apache.batik.dom.svg.SVGOMTextContentElement;
import org.apache.batik.util.SVG12Constants;
import org.w3c.dom.Node;
+import org.w3c.dom.svg.SVGTextContentElement;
/**
* This class implements the flowDiv element from SVG 1.2
@@ -28,7 +29,9 @@
* @author <a href="mailto:thomas.deweese@kodak.com">Thomas DeWeese</a>
* @version $Id$
*/
-public class SVGOMFlowDivElement extends SVGStylableElement {
+public class SVGOMFlowDivElement
+ extends SVGOMTextContentElement
+ implements SVGTextContentElement {
/**
* Creates a new BatikRegularPolygonElement object.
Modified: xmlgraphics/batik/branches/anim/sources/org/apache/batik/dom/svg12/SVGOMFlowLineElement.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/anim/sources/org/apache/batik/dom/svg12/SVGOMFlowLineElement.java?rev=384062&r1=384061&r2=384062&view=diff
==============================================================================
--- xmlgraphics/batik/branches/anim/sources/org/apache/batik/dom/svg12/SVGOMFlowLineElement.java (original)
+++ xmlgraphics/batik/branches/anim/sources/org/apache/batik/dom/svg12/SVGOMFlowLineElement.java Tue Mar 7 16:03:46 2006
@@ -18,9 +18,10 @@
package org.apache.batik.dom.svg12;
import org.apache.batik.dom.AbstractDocument;
-import org.apache.batik.dom.svg.SVGStylableElement;
+import org.apache.batik.dom.svg.SVGOMTextContentElement;
import org.apache.batik.util.SVG12Constants;
import org.w3c.dom.Node;
+import org.w3c.dom.svg.SVGTextContentElement;
/**
* This class implements a regular polygon extension to SVG
@@ -28,7 +29,9 @@
* @author <a href="mailto:thomas.deweese@kodak.com">Thomas DeWeese</a>
* @version $Id$
*/
-public class SVGOMFlowLineElement extends SVGStylableElement {
+public class SVGOMFlowLineElement
+ extends SVGOMTextContentElement
+ implements SVGTextContentElement {
/**
* Creates a new BatikRegularPolygonElement object.
Modified: xmlgraphics/batik/branches/anim/sources/org/apache/batik/dom/svg12/SVGOMFlowParaElement.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/anim/sources/org/apache/batik/dom/svg12/SVGOMFlowParaElement.java?rev=384062&r1=384061&r2=384062&view=diff
==============================================================================
--- xmlgraphics/batik/branches/anim/sources/org/apache/batik/dom/svg12/SVGOMFlowParaElement.java (original)
+++ xmlgraphics/batik/branches/anim/sources/org/apache/batik/dom/svg12/SVGOMFlowParaElement.java Tue Mar 7 16:03:46 2006
@@ -18,9 +18,10 @@
package org.apache.batik.dom.svg12;
import org.apache.batik.dom.AbstractDocument;
-import org.apache.batik.dom.svg.SVGStylableElement;
+import org.apache.batik.dom.svg.SVGOMTextContentElement;
import org.apache.batik.util.SVG12Constants;
import org.w3c.dom.Node;
+import org.w3c.dom.svg.SVGTextContentElement;
/**
* This class implements a regular polygon extension to SVG
@@ -28,7 +29,9 @@
* @author <a href="mailto:thomas.deweese@kodak.com">Thomas DeWeese</a>
* @version $Id$
*/
-public class SVGOMFlowParaElement extends SVGStylableElement {
+public class SVGOMFlowParaElement
+ extends SVGOMTextContentElement
+ implements SVGTextContentElement {
/**
* Creates a new BatikRegularPolygonElement object.
Modified: xmlgraphics/batik/branches/anim/sources/org/apache/batik/dom/svg12/SVGOMFlowSpanElement.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/anim/sources/org/apache/batik/dom/svg12/SVGOMFlowSpanElement.java?rev=384062&r1=384061&r2=384062&view=diff
==============================================================================
--- xmlgraphics/batik/branches/anim/sources/org/apache/batik/dom/svg12/SVGOMFlowSpanElement.java (original)
+++ xmlgraphics/batik/branches/anim/sources/org/apache/batik/dom/svg12/SVGOMFlowSpanElement.java Tue Mar 7 16:03:46 2006
@@ -18,9 +18,10 @@
package org.apache.batik.dom.svg12;
import org.apache.batik.dom.AbstractDocument;
-import org.apache.batik.dom.svg.SVGStylableElement;
+import org.apache.batik.dom.svg.SVGOMTextContentElement;
import org.apache.batik.util.SVG12Constants;
import org.w3c.dom.Node;
+import org.w3c.dom.svg.SVGTextContentElement;
/**
* This class implements a regular polygon extension to SVG
@@ -28,7 +29,9 @@
* @author <a href="mailto:thomas.deweese@kodak.com">Thomas DeWeese</a>
* @version $Id$
*/
-public class SVGOMFlowSpanElement extends SVGStylableElement {
+public class SVGOMFlowSpanElement
+ extends SVGOMTextContentElement
+ implements SVGTextContentElement {
/**
* Creates a new BatikRegularPolygonElement object.
Modified: xmlgraphics/batik/branches/anim/sources/org/apache/batik/dom/svg12/XBLEventSupport.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/anim/sources/org/apache/batik/dom/svg12/XBLEventSupport.java?rev=384062&r1=384061&r2=384062&view=diff
==============================================================================
--- xmlgraphics/batik/branches/anim/sources/org/apache/batik/dom/svg12/XBLEventSupport.java (original)
+++ xmlgraphics/batik/branches/anim/sources/org/apache/batik/dom/svg12/XBLEventSupport.java Tue Mar 7 16:03:46 2006
@@ -488,7 +488,7 @@
AbstractNode nextAncestorNode
= (AbstractNode) ancestors[index];
Node nextBoundElement = nextAncestorNode.getXblBoundElement();
- if (singleScope && nextBoundElement != boundElement) {
+ if (!singleScope && nextBoundElement != boundElement) {
events[index] = retargetEvent
(events[index + 1], ancestors[index], isCustom);
} else {
Modified: xmlgraphics/batik/branches/anim/sources/org/apache/batik/dom/svg12/XBLOMShadowTreeElement.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/anim/sources/org/apache/batik/dom/svg12/XBLOMShadowTreeElement.java?rev=384062&r1=384061&r2=384062&view=diff
==============================================================================
--- xmlgraphics/batik/branches/anim/sources/org/apache/batik/dom/svg12/XBLOMShadowTreeElement.java (original)
+++ xmlgraphics/batik/branches/anim/sources/org/apache/batik/dom/svg12/XBLOMShadowTreeElement.java Tue Mar 7 16:03:46 2006
@@ -18,6 +18,7 @@
package org.apache.batik.dom.svg12;
import org.apache.batik.dom.AbstractDocument;
+import org.apache.batik.dom.svg.IdContainer;
import org.apache.batik.dom.xbl.XBLShadowTreeElement;
import org.w3c.dom.Node;
@@ -29,8 +30,9 @@
* @author <a href="mailto:cam%40mcc%2eid%2eau">Cameron McCormack</a>
* @version $Id$
*/
-public class XBLOMShadowTreeElement extends XBLOMElement
- implements XBLShadowTreeElement {
+public class XBLOMShadowTreeElement
+ extends XBLOMElement
+ implements XBLShadowTreeElement, IdContainer {
/**
* Creates a new XBLOMShadowTreeElement.
Modified: xmlgraphics/batik/branches/anim/sources/org/apache/batik/dom/util/DOMUtilities.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/anim/sources/org/apache/batik/dom/util/DOMUtilities.java?rev=384062&r1=384061&r2=384062&view=diff
==============================================================================
--- xmlgraphics/batik/branches/anim/sources/org/apache/batik/dom/util/DOMUtilities.java (original)
+++ xmlgraphics/batik/branches/anim/sources/org/apache/batik/dom/util/DOMUtilities.java Tue Mar 7 16:03:46 2006
@@ -437,37 +437,37 @@
*/
protected static final String[] MODIFIER_STRINGS = {
"",
- "Alt",
- "AltGraph",
- "Alt AltGraph",
- "Control",
- "Alt Control",
- "AltGraph Control",
- "Alt AltGraph Control",
"Shift",
- "Alt Shift",
- "AltGraph Shift",
- "Alt AltGraph Shift",
+ "Control",
"Control Shift",
- "Alt Control Shift",
- "AltGraph Control Shift",
- "Alt AltGraph Control Shift",
"Meta",
- "Alt Meta",
- "AltGraph Meta",
- "Alt AltGraph Meta",
+ "Meta Shift",
"Control Meta",
+ "Control Meta Shift",
+ "Alt",
+ "Alt Shift",
+ "Alt Control",
+ "Alt Control Shift",
+ "Alt Meta",
+ "Alt Meta Shift",
"Alt Control Meta",
+ "Alt Control Meta Shift",
+ "AltGraph",
+ "AltGraph Shift",
+ "AltGraph Control",
+ "AltGraph Control Shift",
+ "AltGraph Meta",
+ "AltGraph Meta Shift",
"AltGraph Control Meta",
+ "AltGraph Control Meta Shift",
+ "Alt AltGraph",
+ "Alt AltGraph Shift",
+ "Alt AltGraph Control",
+ "Alt AltGraph Control Shift",
+ "Alt AltGraph Meta",
+ "Alt AltGraph Meta Shift",
"Alt AltGraph Control Meta",
- "Shift Meta",
- "Alt Shift Meta",
- "AltGraph Shift Meta",
- "Alt AltGraph Shift Meta",
- "Control Shift Meta",
- "Alt Control Shift Meta",
- "AltGraph Control Shift Meta",
- "Alt AltGraph Control Shift Meta"
+ "Alt AltGraph Control Meta Shift"
};
/**
Modified: xmlgraphics/batik/branches/anim/sources/org/apache/batik/dom/util/SAXDocumentFactory.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/anim/sources/org/apache/batik/dom/util/SAXDocumentFactory.java?rev=384062&r1=384061&r2=384062&view=diff
==============================================================================
--- xmlgraphics/batik/branches/anim/sources/org/apache/batik/dom/util/SAXDocumentFactory.java (original)
+++ xmlgraphics/batik/branches/anim/sources/org/apache/batik/dom/util/SAXDocumentFactory.java Tue Mar 7 16:03:46 2006
@@ -1,6 +1,6 @@
/*
- Copyright 2001-2003 The Apache Software Foundation
+ Copyright 2001-2003,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.
@@ -25,6 +25,11 @@
import java.util.LinkedList;
import java.util.List;
+import javax.xml.parsers.FactoryConfigurationError;
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.parsers.SAXParser;
+import javax.xml.parsers.SAXParserFactory;
+
import org.w3c.dom.DOMImplementation;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -383,6 +388,10 @@
return ret;
}
+ static SAXParserFactory saxFactory;
+ static {
+ saxFactory = SAXParserFactory.newInstance();
+ }
/**
* Creates a Document.
@@ -391,8 +400,19 @@
*/
protected Document createDocument(InputSource is)
throws IOException {
- try {
- parser = XMLReaderFactory.createXMLReader(parserClassName);
+ try {
+ if (parserClassName != null) {
+ parser = XMLReaderFactory.createXMLReader(parserClassName);
+ } else {
+ SAXParser saxParser;
+ try {
+ saxParser = saxFactory.newSAXParser();
+ } catch (ParserConfigurationException pce) {
+ throw new IOException("Could not create SAXParser: "
+ + pce.getMessage());
+ }
+ parser = saxParser.getXMLReader();
+ }
parser.setContentHandler(this);
parser.setDTDHandler(this);
@@ -404,9 +424,9 @@
true);
parser.setFeature("http://xml.org/sax/features/namespace-prefixes",
true);
- parser.setFeature("http://xml.org/sax/features/validation",
+ parser.setFeature("http://xml.org/sax/features/validation",
isValidating);
- parser.setProperty("http://xml.org/sax/properties/lexical-handler",
+ parser.setProperty("http://xml.org/sax/properties/lexical-handler",
this);
parser.parse(is);
} catch (SAXException e) {
Propchange: xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/codec/jpeg/JPEGImageWriter.java
------------------------------------------------------------------------------
svn:executable = *
Propchange: xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/codec/jpeg/JPEGRegistryEntry.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/codec/jpeg/JPEGRegistryEntry.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/codec/png/PNGDecodeParam.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/codec/png/PNGDecodeParam.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/codec/png/PNGEncodeParam.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/codec/png/PNGEncodeParam.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/codec/png/PNGImageDecoder.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/codec/png/PNGImageDecoder.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/codec/png/PNGImageEncoder.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/codec/png/PNGImageEncoder.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/codec/png/PNGImageWriter.java
------------------------------------------------------------------------------
svn:executable = *
Propchange: xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/codec/png/PNGRed.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/codec/png/PNGRed.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/codec/png/PNGRegistryEntry.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/codec/png/PNGRegistryEntry.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/codec/png/PNGSuggestedPaletteEntry.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/codec/png/PNGSuggestedPaletteEntry.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/codec/png/PNGTranscoderInternalCodecWriteAdapter.java
------------------------------------------------------------------------------
svn:executable = *
Modified: xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/codec/tiff/TIFFDecodeParam.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/codec/tiff/TIFFDecodeParam.java?rev=384062&r1=384061&r2=384062&view=diff
==============================================================================
--- xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/codec/tiff/TIFFDecodeParam.java (original)
+++ xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/codec/tiff/TIFFDecodeParam.java Tue Mar 7 16:03:46 2006
@@ -17,7 +17,7 @@
*/
package org.apache.batik.ext.awt.image.codec.tiff;
-import org.apache.batik.ext.awt.image.codec.ImageDecodeParam;
+import org.apache.batik.ext.awt.image.codec.util.ImageDecodeParam;
/**
* An instance of <code>ImageDecodeParam</code> for decoding images in
Modified: xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/codec/tiff/TIFFDirectory.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/codec/tiff/TIFFDirectory.java?rev=384062&r1=384061&r2=384062&view=diff
==============================================================================
--- xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/codec/tiff/TIFFDirectory.java (original)
+++ xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/codec/tiff/TIFFDirectory.java Tue Mar 7 16:03:46 2006
@@ -24,7 +24,7 @@
import java.util.Map;
import java.util.Vector;
-import org.apache.batik.ext.awt.image.codec.SeekableStream;
+import org.apache.batik.ext.awt.image.codec.util.SeekableStream;
/**
* A class representing an Image File Directory (IFD) from a TIFF 6.0
Modified: xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/codec/tiff/TIFFEncodeParam.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/codec/tiff/TIFFEncodeParam.java?rev=384062&r1=384061&r2=384062&view=diff
==============================================================================
--- xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/codec/tiff/TIFFEncodeParam.java (original)
+++ xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/codec/tiff/TIFFEncodeParam.java Tue Mar 7 16:03:46 2006
@@ -20,7 +20,7 @@
import java.util.Iterator;
import java.util.zip.Deflater;
-import org.apache.batik.ext.awt.image.codec.ImageEncodeParam;
+import org.apache.batik.ext.awt.image.codec.util.ImageEncodeParam;
import com.sun.image.codec.jpeg.JPEGEncodeParam;
Modified: xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/codec/tiff/TIFFImage.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/codec/tiff/TIFFImage.java?rev=384062&r1=384061&r2=384062&view=diff
==============================================================================
--- xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/codec/tiff/TIFFImage.java (original)
+++ xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/codec/tiff/TIFFImage.java Tue Mar 7 16:03:46 2006
@@ -40,7 +40,7 @@
import java.util.zip.DataFormatException;
import java.util.zip.Inflater;
-import org.apache.batik.ext.awt.image.codec.SeekableStream;
+import org.apache.batik.ext.awt.image.codec.util.SeekableStream;
import org.apache.batik.ext.awt.image.rendered.AbstractRed;
import org.apache.batik.ext.awt.image.rendered.CachableRed;
Modified: xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/codec/tiff/TIFFImageDecoder.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/codec/tiff/TIFFImageDecoder.java?rev=384062&r1=384061&r2=384062&view=diff
==============================================================================
--- xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/codec/tiff/TIFFImageDecoder.java (original)
+++ xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/codec/tiff/TIFFImageDecoder.java Tue Mar 7 16:03:46 2006
@@ -20,9 +20,9 @@
import java.awt.image.RenderedImage;
import java.io.IOException;
-import org.apache.batik.ext.awt.image.codec.ImageDecodeParam;
-import org.apache.batik.ext.awt.image.codec.ImageDecoderImpl;
-import org.apache.batik.ext.awt.image.codec.SeekableStream;
+import org.apache.batik.ext.awt.image.codec.util.ImageDecodeParam;
+import org.apache.batik.ext.awt.image.codec.util.ImageDecoderImpl;
+import org.apache.batik.ext.awt.image.codec.util.SeekableStream;
/**
* A baseline TIFF reader. The reader has some functionality in addition to
Modified: xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/codec/tiff/TIFFImageEncoder.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/codec/tiff/TIFFImageEncoder.java?rev=384062&r1=384061&r2=384062&view=diff
==============================================================================
--- xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/codec/tiff/TIFFImageEncoder.java (original)
+++ xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/codec/tiff/TIFFImageEncoder.java Tue Mar 7 16:03:46 2006
@@ -42,9 +42,9 @@
import java.util.TreeSet;
import java.util.zip.Deflater;
-import org.apache.batik.ext.awt.image.codec.ImageEncodeParam;
-import org.apache.batik.ext.awt.image.codec.ImageEncoderImpl;
-import org.apache.batik.ext.awt.image.codec.SeekableOutputStream;
+import org.apache.batik.ext.awt.image.codec.util.ImageEncodeParam;
+import org.apache.batik.ext.awt.image.codec.util.ImageEncoderImpl;
+import org.apache.batik.ext.awt.image.codec.util.SeekableOutputStream;
import com.sun.image.codec.jpeg.JPEGEncodeParam;
import com.sun.image.codec.jpeg.JPEGQTable;
Propchange: xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/codec/tiff/TIFFRegistryEntry.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/codec/tiff/TIFFRegistryEntry.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/codec/tiff/TIFFTranscoderInternalCodecWriteAdapter.java
------------------------------------------------------------------------------
svn:executable = *
Propchange: xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/codec/util/FileCacheSeekableStream.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/codec/util/FileCacheSeekableStream.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/codec/util/ForwardSeekableStream.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/codec/util/ForwardSeekableStream.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/codec/util/ImageDecodeParam.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/codec/util/ImageDecodeParam.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/codec/util/ImageDecoder.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/codec/util/ImageDecoder.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/codec/util/ImageDecoderImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/codec/util/ImageDecoderImpl.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/codec/util/ImageEncodeParam.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/codec/util/ImageEncodeParam.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/codec/util/ImageEncoder.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/codec/util/ImageEncoder.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/codec/util/ImageEncoderImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/codec/util/ImageEncoderImpl.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/codec/util/MemoryCacheSeekableStream.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/codec/util/MemoryCacheSeekableStream.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/codec/util/PropertyUtil.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/codec/util/PropertyUtil.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/codec/util/SeekableOutputStream.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/codec/util/SeekableOutputStream.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/codec/util/SeekableStream.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/codec/util/SeekableStream.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/codec/util/SimpleRenderedImage.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/codec/util/SimpleRenderedImage.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/codec/util/SingleTileRenderedImage.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/codec/util/SingleTileRenderedImage.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified: xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/spi/ImageTagRegistry.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/spi/ImageTagRegistry.java?rev=384062&r1=384061&r2=384062&view=diff
==============================================================================
--- xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/spi/ImageTagRegistry.java (original)
+++ xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/spi/ImageTagRegistry.java Tue Mar 7 16:03:46 2006
@@ -1,6 +1,6 @@
/*
- Copyright 2001-2003 The Apache Software Foundation
+ Copyright 2001-2003,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.
@@ -320,9 +320,9 @@
registry = new ImageTagRegistry();
- registry.register(new PNGRegistryEntry());
- registry.register(new TIFFRegistryEntry());
- registry.register(new JPEGRegistryEntry());
+ //registry.register(new PNGRegistryEntry());
+ //registry.register(new TIFFRegistryEntry());
+ //registry.register(new JPEGRegistryEntry());
registry.register(new JDKRegistryEntry());
Iterator iter = Service.providers(RegistryEntry.class);
Propchange: xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/spi/ImageWriter.java
------------------------------------------------------------------------------
svn:executable = *
Propchange: xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/spi/ImageWriterParams.java
------------------------------------------------------------------------------
svn:executable = *
Propchange: xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/spi/ImageWriterRegistry.java
------------------------------------------------------------------------------
svn:executable = *