[tiled] r717 - in trunk/src/tiled: io/xml mapeditor mapeditor/plugin

[tiled-svn at biggeruniverse.com]

Author: bjorn
Date: 2007-01-08 17:13:07 -0600 (Mon, 08 Jan 2007)
New Revision: 717

Modified:
   trunk/src/tiled/io/xml/XMLMapTransformer.java
   trunk/src/tiled/mapeditor/MapEditor.java
   trunk/src/tiled/mapeditor/plugin/PluginClassLoader.java
Log:
Fixed endless loop causing an out of memory error when trying to poor on an invisible layer and avoid using the now deprecated toURL() method on File objects.

Modified: trunk/src/tiled/io/xml/XMLMapTransformer.java
===================================================================
--- trunk/src/tiled/io/xml/XMLMapTransformer.java	2007-01-07 18:56:38 UTC (rev 716)
+++ trunk/src/tiled/io/xml/XMLMapTransformer.java	2007-01-08 23:13:07 UTC (rev 717)
@@ -57,7 +57,7 @@
         if (filename.indexOf("://") > 0 || filename.startsWith("file:")) {
             url = filename;
         } else {
-            url = new File(filename).toURL().toString();
+            url = new File(filename).toURI().toString();
         }
         return url;
     }

Modified: trunk/src/tiled/mapeditor/MapEditor.java
===================================================================
--- trunk/src/tiled/mapeditor/MapEditor.java	2007-01-07 18:56:38 UTC (rev 716)
+++ trunk/src/tiled/mapeditor/MapEditor.java	2007-01-08 23:13:07 UTC (rev 717)
@@ -1719,7 +1719,7 @@
 
     private void pour(TileLayer layer, int x, int y,
             Tile newTile, Tile oldTile) {
-        if (newTile == oldTile || layer.getLocked()) return;
+        if (newTile == oldTile || !layer.canEdit()) return;
 
         Rectangle area;
         TileLayer before = (TileLayer) createLayerCopy(layer);

Modified: trunk/src/tiled/mapeditor/plugin/PluginClassLoader.java
===================================================================
--- trunk/src/tiled/mapeditor/plugin/PluginClassLoader.java	2007-01-07 18:56:38 UTC (rev 716)
+++ trunk/src/tiled/mapeditor/plugin/PluginClassLoader.java	2007-01-08 23:13:07 UTC (rev 717)
@@ -125,7 +125,7 @@
                 }
 
                 monitor.setNote("Loading " + aName + "...");
-                addURL(new File(aPath).toURL());
+                addURL(new File(aPath).toURI().toURL());
 
                 if (readerClassName != null) {
                     JarEntry reader = jf.getJarEntry(