hillion 01/10/18 23:45:51
Modified: sources/org/apache/batik/css/value AbstractValueFactory.java
ValueFactory.java
sources/org/apache/batik/dom/svg
ExtensibleSVGDOMImplementation.java
SVGDOMImplementation.java
Log:
A CSS parser is now setted on a custom ValueFactory registered with
ExtensibleSVGDOMImplementation.registerCustomCSSValueFactory().
Revision Changes Path
1.6 +8 -1
xml-batik/sources/org/apache/batik/css/value/AbstractValueFactory.java
Index: AbstractValueFactory.java
===================================================================
RCS file:
/home/cvs/xml-batik/sources/org/apache/batik/css/value/AbstractValueFactory.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- AbstractValueFactory.java 2001/04/10 17:27:18 1.5
+++ AbstractValueFactory.java 2001/10/19 06:45:50 1.6
@@ -25,7 +25,7 @@
* This class provides a base implementation for every value factories.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Stephane Hillion</a>
- * @version $Id: AbstractValueFactory.java,v 1.5 2001/04/10 17:27:18 hillion Exp $
+ * @version $Id: AbstractValueFactory.java,v 1.6 2001/10/19 06:45:50 hillion Exp $
*/
public abstract class AbstractValueFactory
implements ValueFactory,
@@ -49,6 +49,13 @@
*/
public Parser getParser() {
return parser;
+ }
+
+ /**
+ * Sets the parser used by this factory.
+ */
+ public void setParser(Parser p) {
+ parser = p;
}
/**
1.2 +9 -1 xml-batik/sources/org/apache/batik/css/value/ValueFactory.java
Index: ValueFactory.java
===================================================================
RCS file: /home/cvs/xml-batik/sources/org/apache/batik/css/value/ValueFactory.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ValueFactory.java 2000/10/10 18:38:41 1.1
+++ ValueFactory.java 2001/10/19 06:45:50 1.2
@@ -11,16 +11,24 @@
import org.apache.batik.css.CSSOMStyleDeclaration;
import org.w3c.dom.DOMException;
import org.w3c.dom.css.CSSPrimitiveValue;
+
import org.w3c.css.sac.LexicalUnit;
+import org.w3c.css.sac.Parser;
/**
* This interface represents objects that create the value associated
* with a managed CSS property.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Stephane Hillion</a>
- * @version $Id: ValueFactory.java,v 1.1 2000/10/10 18:38:41 hillion Exp $
+ * @version $Id: ValueFactory.java,v 1.2 2001/10/19 06:45:50 hillion Exp $
*/
public interface ValueFactory {
+
+ /**
+ * Sets the parser used by this factory.
+ */
+ void setParser(Parser p);
+
/**
* Creates a value from its text representation
* @param text The text that represents the CSS value to create.
1.4 +2 -1
xml-batik/sources/org/apache/batik/dom/svg/ExtensibleSVGDOMImplementation.java
Index: ExtensibleSVGDOMImplementation.java
===================================================================
RCS file:
/home/cvs/xml-batik/sources/org/apache/batik/dom/svg/ExtensibleSVGDOMImplementation.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ExtensibleSVGDOMImplementation.java 2001/10/18 17:29:06 1.3
+++ ExtensibleSVGDOMImplementation.java 2001/10/19 06:45:50 1.4
@@ -37,7 +37,7 @@
* {@link org.apache.batik.util.Service}).
*
* @author <a href="mailto:[EMAIL PROTECTED]">Stephane Hillion</a>
- * @version $Id: ExtensibleSVGDOMImplementation.java,v 1.3 2001/10/18 17:29:06
hillion Exp $
+ * @version $Id: ExtensibleSVGDOMImplementation.java,v 1.4 2001/10/19 06:45:50
hillion Exp $
*/
public class ExtensibleSVGDOMImplementation extends SVGDOMImplementation {
@@ -93,6 +93,7 @@
*/
public void registerCustomCSSValueFactory(ValueFactory vf) {
String name = vf.getPropertyName();
+ vf.setParser(parser);
presentationAttributeSet.add(name);
valueFactoryMap.put(name, vf);
}
1.18 +9 -2
xml-batik/sources/org/apache/batik/dom/svg/SVGDOMImplementation.java
Index: SVGDOMImplementation.java
===================================================================
RCS file:
/home/cvs/xml-batik/sources/org/apache/batik/dom/svg/SVGDOMImplementation.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- SVGDOMImplementation.java 2001/10/18 17:29:06 1.17
+++ SVGDOMImplementation.java 2001/10/19 06:45:50 1.18
@@ -39,6 +39,8 @@
import org.apache.batik.util.SVGConstants;
+import org.w3c.css.sac.Parser;
+
import org.w3c.dom.Document;
import org.w3c.dom.DocumentType;
import org.w3c.dom.DOMException;
@@ -57,7 +59,7 @@
* It provides support the SVG 1.0 documents.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Stephane Hillion</a>
- * @version $Id: SVGDOMImplementation.java,v 1.17 2001/10/18 17:29:06 hillion Exp $
+ * @version $Id: SVGDOMImplementation.java,v 1.18 2001/10/19 06:45:50 hillion Exp $
*/
public class SVGDOMImplementation
extends AbstractDOMImplementation
@@ -86,10 +88,15 @@
"org.apache.batik.dom.svg.resources.Messages";
/**
+ * The parser used for the CSS values.
+ */
+ protected Parser parser = CSSDocumentHandler.createParser();
+
+ /**
* The CSS value factory map for SVG.
*/
protected SVGValueFactoryMap valueFactoryMap =
- new SVGValueFactoryMap(CSSDocumentHandler.createParser());
+ new SVGValueFactoryMap(parser);
/**
* The localizable support for the error messages.
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]