[tiled] r778 - in trunk: . src/tiled/io src/tiled/mapeditor/dialogs

[tiled-svn at biggeruniverse.com]

Author: bjorn
Date: 2008-07-22 12:34:37 -0500 (Tue, 22 Jul 2008)
New Revision: 778

Modified:
   trunk/CHANGES
   trunk/src/tiled/io/PluginLogger.java
   trunk/src/tiled/mapeditor/dialogs/TilesetManager.java
Log:
Fixed automatically adding extension to tileset Save As... dialog

Modified: trunk/CHANGES
===================================================================
--- trunk/CHANGES	2008-07-22 08:04:50 UTC (rev 777)
+++ trunk/CHANGES	2008-07-22 17:34:37 UTC (rev 778)
@@ -1,5 +1,7 @@
-0.7.0 - July 19, 2008
+* Fixed automatically adding extension to tileset Save As... dialog
 
+0.7.0 - July 19th, 2008
+
 * Added support for arbitrary objects and zones placement (by ElvenProgrammer)
 * Added ability to create stamp brushes from the tile palette
 * Added import/export of configuration

Modified: trunk/src/tiled/io/PluginLogger.java
===================================================================
--- trunk/src/tiled/io/PluginLogger.java	2008-07-22 08:04:50 UTC (rev 777)
+++ trunk/src/tiled/io/PluginLogger.java	2008-07-22 17:34:37 UTC (rev 778)
@@ -19,7 +19,7 @@
  */
 public class PluginLogger
 {
-    private LinkedList messages = new LinkedList();
+    private final LinkedList messages = new LinkedList();
 
     public void error(Object message) {
     }

Modified: trunk/src/tiled/mapeditor/dialogs/TilesetManager.java
===================================================================
--- trunk/src/tiled/mapeditor/dialogs/TilesetManager.java	2008-07-22 08:04:50 UTC (rev 777)
+++ trunk/src/tiled/mapeditor/dialogs/TilesetManager.java	2008-07-22 17:34:37 UTC (rev 778)
@@ -19,7 +19,6 @@
 import java.awt.Insets;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
-import java.io.File;
 import java.util.Iterator;
 import java.util.Vector;
 import javax.swing.*;
@@ -31,6 +30,7 @@
 import tiled.io.MapWriter;
 import tiled.mapeditor.Resources;
 import tiled.mapeditor.plugin.PluginClassLoader;
+import tiled.mapeditor.util.ConfirmingFileChooser;
 import tiled.mapeditor.util.TiledFileFilter;
 import tiled.mapeditor.util.TilesetTableModel;
 
@@ -156,7 +156,7 @@
                         JOptionPane.ERROR_MESSAGE);
             }
         } else if (command.equals(SAVE_AS_BUTTON)) {
-            JFileChooser ch = new JFileChooser(map.getFilename());
+            JFileChooser ch = new ConfirmingFileChooser(map.getFilename());
 
             MapWriter[] writers = PluginClassLoader.getInstance().getWriters();
             for (int i = 0; i < writers.length; i++) {
@@ -172,19 +172,13 @@
             int ret = ch.showSaveDialog(this);
             if (ret == JFileChooser.APPROVE_OPTION) {
                 String filename = ch.getSelectedFile().getAbsolutePath();
-                File exist = new File(filename);
-
-                if (exist.exists() && JOptionPane.showConfirmDialog(this,
-                        Resources.getString("general.file.exists.message")) ==
-                        JOptionPane.OK_OPTION || !exist.exists()) {
-                    try {
-                        MapHelper.saveTileset(set, filename);
-                        set.setSource(filename);
-                        embedButton.setEnabled(true);
-                        saveButton.setEnabled(true);
-                    } catch (Exception e) {
-                        e.printStackTrace();
-                    }
+                try {
+                    MapHelper.saveTileset(set, filename);
+                    set.setSource(filename);
+                    embedButton.setEnabled(true);
+                    saveButton.setEnabled(true);
+                } catch (Exception e) {
+                    e.printStackTrace();
                 }
             }
         } else if (command.equals(SAVE_BUTTON)) {
@@ -205,9 +199,9 @@
         tilesetTable.repaint();
     }
 
-    private int checkSetUsage(TileSet s) {
+    private int checkSetUsage(TileSet tileset) {
         int used = 0;
-        Iterator tileIterator = s.iterator();
+        Iterator tileIterator = tileset.iterator();
 
         while (tileIterator.hasNext()) {
             Tile tile = (Tile) tileIterator.next();