deweese 02/04/27 07:26:42
Modified: sources/org/apache/batik/extension/svg SolidColorBridge.java
Log:
Switched from java.net.URL to batik.util.ParsedURL.
Revision Changes Path
1.5 +9 -24
xml-batik/sources/org/apache/batik/extension/svg/SolidColorBridge.java
Index: SolidColorBridge.java
===================================================================
RCS file:
/home/cvs/xml-batik/sources/org/apache/batik/extension/svg/SolidColorBridge.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- SolidColorBridge.java 18 Mar 2002 10:28:27 -0000 1.4
+++ SolidColorBridge.java 27 Apr 2002 14:26:42 -0000 1.5
@@ -12,8 +12,6 @@
import java.awt.Paint;
import java.util.Map;
import java.util.HashMap;
-import java.net.URL;
-import java.net.MalformedURLException;
import org.apache.batik.bridge.AbstractSVGBridge;
import org.apache.batik.bridge.BridgeContext;
@@ -34,6 +32,7 @@
import org.apache.batik.gvt.GraphicsNode;
import org.apache.batik.util.CSSConstants;
+import org.apache.batik.util.ParsedURL;
import org.w3c.dom.css.CSSPrimitiveValue;
import org.w3c.dom.css.CSSValue;
@@ -114,22 +113,15 @@
}
SVGOMDocument doc = (SVGOMDocument)paintElement.getOwnerDocument();
- URL url;
- try {
- url = new URL(doc.getURLObject(), uri);
- } catch (MalformedURLException ex) {
- throw new BridgeException(paintElement,
- ERR_URI_MALFORMED,
- new Object[] {uri});
-
- }
+ ParsedURL purl = new ParsedURL(doc.getURL(), uri);
+
// check if there is circular dependencies
- if (refs.containsKey(url)) {
+ if (refs.containsKey(purl)) {
throw new BridgeException(paintElement,
ERR_XLINK_HREF_CIRCULAR_DEPENDENCIES,
new Object[] {uri});
}
- refs.put(url, url);
+ refs.put(purl, purl);
paintElement = ctx.getReferencedElement(paintElement, uri);
}
}
@@ -169,23 +161,16 @@
}
SVGOMDocument doc = (SVGOMDocument)paintElement.getOwnerDocument();
- URL url;
- try {
- url = new URL(doc.getURLObject(), uri);
- } catch (MalformedURLException ex) {
- throw new BridgeException(paintElement,
- ERR_URI_MALFORMED,
- new Object[] {uri});
-
- }
+ ParsedURL purl = new ParsedURL(doc.getURL(), uri);
+
// check if there is circular dependencies
- if (refs.containsKey(url)) {
+ if (refs.containsKey(purl)) {
throw new BridgeException
(paintElement,
ERR_XLINK_HREF_CIRCULAR_DEPENDENCIES,
new Object[] {uri});
}
- refs.put(url, url);
+ refs.put(purl, purl);
paintElement = ctx.getReferencedElement(paintElement, uri);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
