[tiled] r757 - in trunk/src/tiled: core io/xml mapeditor/dialogs

[tiled-svn at biggeruniverse.com]

Author: bjorn
Date: 2008-06-16 12:11:41 -0500 (Mon, 16 Jun 2008)
New Revision: 757

Modified:
   trunk/src/tiled/core/Tile.java
   trunk/src/tiled/io/xml/XMLMapWriter.java
   trunk/src/tiled/mapeditor/dialogs/ConfigurationDialog.java
Log:
Made sure not to enable the useless useful comments in the .tmx format by default.
Fixed initializing of the useful comments checkbox in the configuration dialog.
Don't start a tileproperties element when there are no tile instance properties to be saved.

Modified: trunk/src/tiled/core/Tile.java
===================================================================
--- trunk/src/tiled/core/Tile.java	2008-06-15 22:01:12 UTC (rev 756)
+++ trunk/src/tiled/core/Tile.java	2008-06-16 17:11:41 UTC (rev 757)
@@ -100,15 +100,15 @@
      * @param set
      */
     public void setTileSet(TileSet set) {
-    	if(tileset != null && tileset != set) {
-    		setImage(set.addImage(getImage()));
-    	} else {
-    		if (internalImage != null) {
-	            setImage(set.addImage(internalImage));
-	            internalImage = null;
-	        }
-    	}
-    	tileset = set;
+        if (tileset != null && tileset != set) {
+            setImage(set.addImage(getImage()));
+        } else {
+            if (internalImage != null) {
+                setImage(set.addImage(internalImage));
+                internalImage = null;
+            }
+        }
+        tileset = set;
     }
 
     public void setProperties(Properties p) {

Modified: trunk/src/tiled/io/xml/XMLMapWriter.java
===================================================================
--- trunk/src/tiled/io/xml/XMLMapWriter.java	2008-06-15 22:01:12 UTC (rev 756)
+++ trunk/src/tiled/io/xml/XMLMapWriter.java	2008-06-16 17:11:41 UTC (rev 757)
@@ -1,5 +1,5 @@
 /*
- *  Tiled Map Editor, (c) 2004-2006
+ *  Tiled Map Editor, (c) 2004-2008
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -133,7 +133,7 @@
             firstgid += tileset.getMaxTileId() + 1;
         }
 
-        if (prefs.getBoolean("encodeLayerData", true) && prefs.getBoolean("usefulComments", true))
+        if (prefs.getBoolean("encodeLayerData", true) && prefs.getBoolean("usefulComments", false))
         	w.writeComment("Layer data is " + (prefs.getBoolean("layerCompression", true) ? "compressed (GZip)" : "") + " binary data, encoded in Base64");
         Iterator ml = map.getLayers();
         while (ml.hasNext()) {
@@ -426,13 +426,17 @@
             }
             w.endElement();
 
-            w.startElement("tileproperties");
+            boolean tilePropertiesElementStarted = false;
 
             for (int y = 0; y < l.getHeight(); y++) {
                 for (int x = 0; x < l.getWidth(); x++) {
                     Properties tip = ((TileLayer) l).getTileInstancePropertiesAt(x, y);
 
                     if (tip != null && !tip.isEmpty()) {
+                        if (!tilePropertiesElementStarted) {
+                            w.startElement("tileproperties");
+                            tilePropertiesElementStarted = true;
+                        }
                         w.startElement("tile");
 
                         w.writeAttribute("x", x);
@@ -445,7 +449,8 @@
                 }
             }
 
-            w.endElement();
+            if (tilePropertiesElementStarted)
+                w.endElement();
         }
         w.endElement();
     }
@@ -636,7 +641,7 @@
         return
             "The core Tiled TMX format writer\n" +
             "\n" +
-            "Tiled Map Editor, (c) 2004-2006\n" +
+            "Tiled Map Editor, (c) 2004-2008\n" +
             "Adam Turk\n" +
             "Bjorn Lindeijer";
     }

Modified: trunk/src/tiled/mapeditor/dialogs/ConfigurationDialog.java
===================================================================
--- trunk/src/tiled/mapeditor/dialogs/ConfigurationDialog.java	2008-06-15 22:01:12 UTC (rev 756)
+++ trunk/src/tiled/mapeditor/dialogs/ConfigurationDialog.java	2008-06-16 17:11:41 UTC (rev 757)
@@ -368,6 +368,7 @@
             }
         }
 
+        cbUsefulComments.setSelected(savingPrefs.getBoolean("usefulComments", false));
         cbBinaryEncode.setSelected(savingPrefs.getBoolean("encodeLayerData", true));
         cbCompressLayerData.setSelected(savingPrefs.getBoolean("layerCompression", true));
         cbGridAA.setSelected(displayPrefs.getBoolean("gridAntialias", true));