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 de...@apache.org on 2009/12/09 12:45:22 UTC
svn commit: r888773 - in /xmlgraphics/batik/trunk/sources/org/apache/batik:
apps/svgbrowser/JSVGViewerFrame.java bridge/SVGImageElementBridge.java
dom/svg/SAXSVGDocumentFactory.java util/MimeTypeConstants.java
Author: deweese
Date: Wed Dec 9 11:45:21 2009
New Revision: 888773
URL: http://svn.apache.org/viewvc?rev=888773&view=rev
Log:
Fixed Bug 48337
Modified:
xmlgraphics/batik/trunk/sources/org/apache/batik/apps/svgbrowser/JSVGViewerFrame.java
xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/SVGImageElementBridge.java
xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SAXSVGDocumentFactory.java
xmlgraphics/batik/trunk/sources/org/apache/batik/util/MimeTypeConstants.java
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/apps/svgbrowser/JSVGViewerFrame.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/apps/svgbrowser/JSVGViewerFrame.java?rev=888773&r1=888772&r2=888773&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/apps/svgbrowser/JSVGViewerFrame.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/apps/svgbrowser/JSVGViewerFrame.java Wed Dec 9 11:45:21 2009
@@ -1908,7 +1908,7 @@
InputStream is
= u.openStream(getInputHandler(purl).
getHandledMimeTypes());
- // u.openStream(MimeTypeConstants.MIME_TYPES_SVG);
+ // u.openStream(MimeTypeConstants.MIME_TYPES_SVG_LIST.iterator());
Reader in = XMLUtilities.createXMLDocumentReader(is);
int len;
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/SVGImageElementBridge.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/SVGImageElementBridge.java?rev=888773&r1=888772&r2=888773&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/SVGImageElementBridge.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/SVGImageElementBridge.java Wed Dec 9 11:45:21 2009
@@ -408,7 +408,7 @@
throws IOException {
List mimeTypes = new ArrayList
(ImageTagRegistry.getRegistry().getRegisteredMimeTypes());
- mimeTypes.add(MimeTypeConstants.MIME_TYPES_SVG);
+ mimeTypes.addAll(MimeTypeConstants.MIME_TYPES_SVG_LIST);
InputStream reference = purl.openStream(mimeTypes.iterator());
return new ProtectedStream(reference);
}
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=888773&r1=888772&r2=888773&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 Wed Dec 9 11:45:21 2009
@@ -155,7 +155,8 @@
public Document createDocument(String uri) throws IOException {
ParsedURL purl = new ParsedURL(uri);
- InputStream is = purl.openStream(MimeTypeConstants.MIME_TYPES_SVG);
+ InputStream is = purl.openStream
+ (MimeTypeConstants.MIME_TYPES_SVG_LIST.iterator());
uri = purl.getPostConnectionURL();
InputSource isrc = new InputSource(is);
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/util/MimeTypeConstants.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/util/MimeTypeConstants.java?rev=888773&r1=888772&r2=888773&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/util/MimeTypeConstants.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/util/MimeTypeConstants.java Wed Dec 9 11:45:21 2009
@@ -18,6 +18,9 @@
*/
package org.apache.batik.util;
+import java.util.Arrays;
+import java.util.List;
+
/**
* This interface defines constants for Various Mime Types
*
@@ -28,8 +31,8 @@
//
// Mime Type Constants
//
- String [] MIME_TYPES_SVG = {
- "image/svg+xml",
- "application/xml",
- "text/xml" };
+ String [] MIME_TYPES_SVG = {"image/svg+xml",
+ "application/xml",
+ "text/xml" };
+ List MIME_TYPES_SVG_LIST = Arrays.asList(MIME_TYPES_SVG);
}