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 2007/09/24 13:53:48 UTC
svn commit: r578768 - in /xmlgraphics/batik/trunk/sources/org/apache/batik:
dom/svg/ dom/svg12/ transcoder/
Author: cam
Date: Mon Sep 24 04:53:45 2007
New Revision: 578768
URL: http://svn.apache.org/viewvc?rev=578768&view=rev
Log:
Restore SVGOMDocument.{get,set}URLObject() to working with java.net.URL
objects, and added separate {get,set}ParsedURL() methods for the
ParsedURL versions.
Modified:
xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SAXSVGDocumentFactory.java
xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGDOMImplementation.java
xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMDocument.java
xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGStyleSheetProcessingInstruction.java
xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg12/SVG12DOMImplementation.java
xmlgraphics/batik/trunk/sources/org/apache/batik/transcoder/SVGAbstractTranscoder.java
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SAXSVGDocumentFactory.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SAXSVGDocumentFactory.java?rev=578768&r1=578767&r2=578768&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SAXSVGDocumentFactory.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SAXSVGDocumentFactory.java Mon Sep 24 04:53:45 2007
@@ -200,7 +200,7 @@
SVGOMDocument doc = (SVGOMDocument) super.createDocument
(SVGDOMImplementation.SVG_NAMESPACE_URI, "svg", uri, isrc);
- doc.setURLObject(purl);
+ doc.setParsedURL(purl);
doc.setDocumentInputEncoding(charset);
doc.setXmlStandalone(isStandalone);
doc.setXmlVersion(xmlVersion);
@@ -224,7 +224,7 @@
doc = super.createDocument
(SVGDOMImplementation.SVG_NAMESPACE_URI, "svg", uri, is);
if (uri != null) {
- ((SVGOMDocument)doc).setURLObject(new ParsedURL(uri));
+ ((SVGOMDocument)doc).setParsedURL(new ParsedURL(uri));
}
AbstractDocument d = (AbstractDocument) doc;
@@ -253,7 +253,7 @@
doc = super.createDocument
(SVGDOMImplementation.SVG_NAMESPACE_URI, "svg", uri, is);
if (uri != null) {
- ((SVGOMDocument)doc).setURLObject(new ParsedURL(uri));
+ ((SVGOMDocument)doc).setParsedURL(new ParsedURL(uri));
}
AbstractDocument d = (AbstractDocument) doc;
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGDOMImplementation.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGDOMImplementation.java?rev=578768&r1=578767&r2=578768&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGDOMImplementation.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGDOMImplementation.java Mon Sep 24 04:53:45 2007
@@ -107,7 +107,7 @@
ValueManager [] vms,
ShorthandManager [] sms) {
- ParsedURL durl = ((SVGOMDocument)doc).getURLObject();
+ ParsedURL durl = ((SVGOMDocument)doc).getParsedURL();
CSSEngine result = new SVGCSSEngine(doc, durl, ep, vms, sms, ctx);
URL url = getClass().getResource("resources/UserAgentStyleSheet.css");
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMDocument.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMDocument.java?rev=578768&r1=578767&r2=578768&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMDocument.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMDocument.java Mon Sep 24 04:53:45 2007
@@ -20,6 +20,8 @@
import java.io.IOException;
import java.io.ObjectInputStream;
+import java.net.MalformedURLException;
+import java.net.URL;
import java.util.HashMap;
import java.util.Iterator;
import java.util.LinkedList;
@@ -234,16 +236,36 @@
}
/**
+ * Returns the URI of the document. If the document URI cannot be
+ * represented as a {@link URL} (for example if it uses a <code>data:</code>
+ * URI scheme), then <code>null</code> will be returned.
+ */
+ public URL getURLObject() {
+ try {
+ return new URL(documentURI);
+ } catch (MalformedURLException e) {
+ return null;
+ }
+ }
+
+ /**
* Returns the URI of the document.
*/
- public ParsedURL getURLObject() {
+ public ParsedURL getParsedURL() {
return url;
}
/**
* Sets the URI of the document.
*/
- public void setURLObject(ParsedURL url) {
+ public void setURLObject(URL url) {
+ setParsedURL(new ParsedURL(url));
+ }
+
+ /**
+ * Sets the URI of the document.
+ */
+ public void setParsedURL(ParsedURL url) {
this.url = url;
documentURI = url == null ? null : url.toString();
}
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGStyleSheetProcessingInstruction.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGStyleSheetProcessingInstruction.java?rev=578768&r1=578767&r2=578768&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGStyleSheetProcessingInstruction.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGStyleSheetProcessingInstruction.java Mon Sep 24 04:53:45 2007
@@ -68,7 +68,7 @@
*/
public String getStyleSheetURI() {
SVGOMDocument svgDoc = (SVGOMDocument) getOwnerDocument();
- ParsedURL url = svgDoc.getURLObject();
+ ParsedURL url = svgDoc.getParsedURL();
String href = (String)getPseudoAttributes().get("href");
if (url != null) {
return new ParsedURL(url, href).toString();
@@ -90,7 +90,7 @@
String href = (String)attrs.get("href");
String alternate = (String)attrs.get("alternate");
SVGOMDocument doc = (SVGOMDocument)getOwnerDocument();
- ParsedURL durl = doc.getURLObject();
+ ParsedURL durl = doc.getParsedURL();
ParsedURL burl = new ParsedURL(durl, href);
CSSEngine e = doc.getCSSEngine();
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg12/SVG12DOMImplementation.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg12/SVG12DOMImplementation.java?rev=578768&r1=578767&r2=578768&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg12/SVG12DOMImplementation.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg12/SVG12DOMImplementation.java Mon Sep 24 04:53:45 2007
@@ -74,7 +74,7 @@
ExtendedParser ep,
ValueManager [] vms,
ShorthandManager [] sms) {
- ParsedURL durl = ((SVGOMDocument)doc).getURLObject();
+ ParsedURL durl = ((SVGOMDocument)doc).getParsedURL();
CSSEngine result = new SVG12CSSEngine(doc, durl, ep, vms, sms, ctx);
URL url = getClass().getResource("resources/UserAgentStyleSheet.css");
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/transcoder/SVGAbstractTranscoder.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/transcoder/SVGAbstractTranscoder.java?rev=578768&r1=578767&r2=578768&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/transcoder/SVGAbstractTranscoder.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/transcoder/SVGAbstractTranscoder.java Mon Sep 24 04:53:45 2007
@@ -182,7 +182,7 @@
document = DOMUtilities.deepCloneDocument(document, impl);
if (uri != null) {
ParsedURL url = new ParsedURL(uri);
- ((SVGOMDocument)document).setURLObject(url);
+ ((SVGOMDocument)document).setParsedURL(url);
}
}