[vassalengine-svn] SF.net SVN: vassalengine:[7782] VASSAL-src/trunk/src/VASSAL/build/module/ map/boardPicker/Board.java

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

Revision: 7782
          http://vassalengine.svn.sourceforge.net/vassalengine/?rev=7782&view=rev
Author:   uckelman
Date:     2011-08-27 14:40:14 +0000 (Sat, 27 Aug 2011)
Log Message:
-----------
Fixed Bug 2584: Cannot load images into a module.
Board now checks for existance of cached tiles for its image, and uses Op.load instead of Op.loadLarge if there are no cached tiles.

Modified Paths:
--------------
    VASSAL-src/trunk/src/VASSAL/build/module/map/boardPicker/Board.java

Modified: VASSAL-src/trunk/src/VASSAL/build/module/map/boardPicker/Board.java
===================================================================
--- VASSAL-src/trunk/src/VASSAL/build/module/map/boardPicker/Board.java	2011-08-27 14:39:45 UTC (rev 7781)
+++ VASSAL-src/trunk/src/VASSAL/build/module/map/boardPicker/Board.java	2011-08-27 14:40:14 UTC (rev 7782)
@@ -62,6 +62,8 @@
 import VASSAL.configure.VisibilityCondition;
 import VASSAL.i18n.Resources;
 import VASSAL.tools.ErrorDialog;
+import VASSAL.tools.image.ImageIOException;
+import VASSAL.tools.image.ImageTileSource;
 import VASSAL.tools.imageop.ImageOp;
 import VASSAL.tools.imageop.Op;
 import VASSAL.tools.imageop.Repainter;
@@ -217,8 +219,29 @@
         val = ((File) val).getName();
       }
       imageFile = (String) val;
-      boardImageOp = imageFile == null || imageFile.trim().length() == 0
-                   ? null : Op.loadLarge("images/" + imageFile);
+
+      if (imageFile == null || imageFile.trim().length() == 0) {
+        boardImageOp = null;
+      }
+      else {
+        final ImageTileSource ts =
+          GameModule.getGameModule().getImageTileSource();
+
+        boolean tiled = false;
+        try {
+          tiled = ts.tileExists(imageFile, 0, 0, 1.0);
+        }
+        catch (ImageIOException e) {
+          // ignore, not tiled
+        }
+
+        if (tiled) {
+          boardImageOp = Op.loadLarge("images/" + imageFile);
+        }
+        else {
+          boardImageOp = Op.load(imageFile);
+        }
+      }
     }
     else if (WIDTH.equals(key)) {
       if (val instanceof String) {

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