hillion 01/10/18 07:07:41
Modified: sources/org/apache/batik/css AbstractStyleSheet.java
AbstractViewCSS.java
sources/org/apache/batik/dom/svg SVGOMStyleElement.java
Log:
xml:base support on <style/>
Revision Changes Path
1.2 +8 -1 xml-batik/sources/org/apache/batik/css/AbstractStyleSheet.java
Index: AbstractStyleSheet.java
===================================================================
RCS file: /home/cvs/xml-batik/sources/org/apache/batik/css/AbstractStyleSheet.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AbstractStyleSheet.java 2000/10/10 18:37:08 1.1
+++ AbstractStyleSheet.java 2001/10/18 14:07:41 1.2
@@ -17,7 +17,7 @@
* interface.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Stephane Hillion</a>
- * @version $Id: AbstractStyleSheet.java,v 1.1 2000/10/10 18:37:08 hillion Exp $
+ * @version $Id: AbstractStyleSheet.java,v 1.2 2001/10/18 14:07:41 hillion Exp $
*/
public abstract class AbstractStyleSheet implements StyleSheet {
/**
@@ -92,6 +92,13 @@
*/
public Node getOwnerNode() {
return ownerNode;
+ }
+
+ /**
+ * Sets the owner node.
+ */
+ public void setOwnerNode(Node n) {
+ ownerNode = n;
}
/**
1.21 +2 -10 xml-batik/sources/org/apache/batik/css/AbstractViewCSS.java
Index: AbstractViewCSS.java
===================================================================
RCS file: /home/cvs/xml-batik/sources/org/apache/batik/css/AbstractViewCSS.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- AbstractViewCSS.java 2001/10/18 12:30:22 1.20
+++ AbstractViewCSS.java 2001/10/18 14:07:41 1.21
@@ -51,7 +51,7 @@
* {@link org.w3c.dom.css.ViewCSS} interface.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Stephane Hillion</a>
- * @version $Id: AbstractViewCSS.java,v 1.20 2001/10/18 12:30:22 hillion Exp $
+ * @version $Id: AbstractViewCSS.java,v 1.21 2001/10/18 14:07:41 hillion Exp $
*/
public abstract class AbstractViewCSS implements ViewCSS {
@@ -388,15 +388,7 @@
if (!ss.getDisabled() && mediaMatch(ss.getMedia())) {
Node on = ss.getOwnerNode();
URL baseURI = null;
- if (on == null) {
- if (e instanceof ElementWithBaseURI) {
- try {
- baseURI =
- new URL(((ElementWithBaseURI)e).getBaseURI());
- } catch (MalformedURLException ex) {
- }
- }
- } else if (on instanceof ExtendedLinkStyle) {
+ if (on instanceof ExtendedLinkStyle) {
try {
baseURI =
new URL(((ExtendedLinkStyle)on).getStyleSheetURI());
1.9 +11 -3
xml-batik/sources/org/apache/batik/dom/svg/SVGOMStyleElement.java
Index: SVGOMStyleElement.java
===================================================================
RCS file:
/home/cvs/xml-batik/sources/org/apache/batik/dom/svg/SVGOMStyleElement.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- SVGOMStyleElement.java 2001/09/28 12:48:29 1.8
+++ SVGOMStyleElement.java 2001/10/18 14:07:41 1.9
@@ -10,13 +10,13 @@
import org.apache.batik.css.CSSDocumentHandler;
import org.apache.batik.css.CSSOMStyleSheet;
+import org.apache.batik.css.ExtendedLinkStyle;
import org.apache.batik.dom.AbstractDocument;
import org.apache.batik.dom.util.XMLSupport;
import org.w3c.dom.DOMException;
import org.w3c.dom.Node;
import org.w3c.dom.css.DOMImplementationCSS;
-import org.w3c.dom.stylesheets.LinkStyle;
import org.w3c.dom.stylesheets.StyleSheet;
import org.w3c.dom.svg.SVGStyleElement;
@@ -24,12 +24,12 @@
* This class implements {@link SVGStyleElement}.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Stephane Hillion</a>
- * @version $Id: SVGOMStyleElement.java,v 1.8 2001/09/28 12:48:29 vhardy Exp $
+ * @version $Id: SVGOMStyleElement.java,v 1.9 2001/10/18 14:07:41 hillion Exp $
*/
public class SVGOMStyleElement
extends SVGOMElement
implements SVGStyleElement,
- LinkStyle {
+ ExtendedLinkStyle {
/**
* The attribute initializer.
@@ -95,8 +95,16 @@
}
CSSDocumentHandler.parseRules(ss, sb.toString());
sheet = ss;
+ ss.setOwnerNode(this);
}
return sheet;
+ }
+
+ /**
+ * Returns the URI of the referenced stylesheet.
+ */
+ public String getStyleSheetURI() {
+ return XMLBaseSupport.getCascadedXMLBase(this);
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
