[vassalengine-svn-trunk] [vassalengine-svn] SF.net SVN: vassalengine:[7857] VASSAL-src/trunk/src/VASSAL/tools

[<uck...@us...>]

Revision: 7857
          http://vassalengine.svn.sourceforge.net/vassalengine/?rev=7857&view=rev
Author:   uckelman
Date:     2011-09-30 22:02:34 +0000 (Fri, 30 Sep 2011)
Log Message:
-----------
Deprecated DataArchive.getImageURL(). Use getURL() instead. Fixes improper prefixing of SVG image paths with "image/".

Modified Paths:
--------------
    VASSAL-src/trunk/src/VASSAL/tools/DataArchive.java
    VASSAL-src/trunk/src/VASSAL/tools/imageop/RotateScaleOpSVGImpl.java
    VASSAL-src/trunk/src/VASSAL/tools/imageop/SourceOpSVGImpl.java
    VASSAL-src/trunk/src/VASSAL/tools/imageop/SourceTileOpSVGImpl.java

Modified: VASSAL-src/trunk/src/VASSAL/tools/DataArchive.java
===================================================================
--- VASSAL-src/trunk/src/VASSAL/tools/DataArchive.java	2011-09-30 20:09:19 UTC (rev 7856)
+++ VASSAL-src/trunk/src/VASSAL/tools/DataArchive.java	2011-09-30 22:02:34 UTC (rev 7857)
@@ -275,11 +275,12 @@
    * @return a URL corresponding to the image file
    * @throws FileNotFoundException if the file doesn't exist
    * @throws IOException if some other problem occurs
+   * @deprecated Use {@link #getURL(String)} instead.
    */
+  @Deprecated
   public URL getImageURL(String fileName) throws IOException,
                                                  FileNotFoundException {
-    return getURL(
-      fileName.startsWith("/") ? fileName : getImagePrefix() + fileName);
+    return getURL(fileName);
   }
 
   public boolean contains(String fileName) throws IOException {
@@ -498,7 +499,7 @@
 
     if (name.startsWith("/")) {
       if (name.toLowerCase().endsWith(".svg")) {
-        return new SVGRenderer(getImageURL(name),
+        return new SVGRenderer(getURL(name),
                                getImageInputStream(name)).render();
       }
       else {
@@ -509,7 +510,7 @@
       return ImageUtils.toBufferedImage(src.getImage());
     }
     else if (name.toLowerCase().endsWith(".svg")) {
-      return new SVGRenderer(getImageURL(name),
+      return new SVGRenderer(getURL(name),
                              getImageInputStream(name)).render();
     }
     else {

Modified: VASSAL-src/trunk/src/VASSAL/tools/imageop/RotateScaleOpSVGImpl.java
===================================================================
--- VASSAL-src/trunk/src/VASSAL/tools/imageop/RotateScaleOpSVGImpl.java	2011-09-30 20:09:19 UTC (rev 7856)
+++ VASSAL-src/trunk/src/VASSAL/tools/imageop/RotateScaleOpSVGImpl.java	2011-09-30 22:02:34 UTC (rev 7857)
@@ -110,7 +110,7 @@
 
     try {
       final SVGRenderer renderer = new SVGRenderer(
-        archive.getImageURL(name),
+        archive.getURL(name),
         new BufferedInputStream(archive.getInputStream(name))
       );
 

Modified: VASSAL-src/trunk/src/VASSAL/tools/imageop/SourceOpSVGImpl.java
===================================================================
--- VASSAL-src/trunk/src/VASSAL/tools/imageop/SourceOpSVGImpl.java	2011-09-30 20:09:19 UTC (rev 7856)
+++ VASSAL-src/trunk/src/VASSAL/tools/imageop/SourceOpSVGImpl.java	2011-09-30 22:02:34 UTC (rev 7857)
@@ -86,7 +86,7 @@
   public BufferedImage eval() throws ImageIOException {
     try {
       final SVGRenderer renderer = new SVGRenderer(
-        archive.getImageURL(name),
+        archive.getURL(name),
         new BufferedInputStream(archive.getInputStream(name))
       );
 

Modified: VASSAL-src/trunk/src/VASSAL/tools/imageop/SourceTileOpSVGImpl.java
===================================================================
--- VASSAL-src/trunk/src/VASSAL/tools/imageop/SourceTileOpSVGImpl.java	2011-09-30 20:09:19 UTC (rev 7856)
+++ VASSAL-src/trunk/src/VASSAL/tools/imageop/SourceTileOpSVGImpl.java	2011-09-30 22:02:34 UTC (rev 7857)
@@ -90,7 +90,7 @@
 
     try {
       final SVGRenderer renderer = new SVGRenderer(
-        archive.getImageURL(name),
+        archive.getURL(name),
         new BufferedInputStream(archive.getInputStream(name))
       );
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


------------------------------------------------------------------------------
All of the data generated in your IT infrastructure is seriously valuable.
Why? It contains a definitive record of application performance, security
threats, fraudulent activity, and more. Splunk takes this data and makes
sense of it. IT sense. And common sense.
http://p.sf.net/sfu/splunk-d2dcopy2
_______________________________________________
vassalengine-svn mailing list
vas...@li...
https://lists.sourceforge.net/lists/listinfo/vassalengine-svn