[tiled] r677 - in trunk: . src/tiled/mapeditor src/tiled/mapeditor/actions

[svn@biggeruniverse.com]

Author: bjorn
Date: 2006-06-23 11:10:39 -0500 (Fri, 23 Jun 2006)
New Revision: 677

Modified:
   trunk/CHANGES
   trunk/src/tiled/mapeditor/MapEditor.java
   trunk/src/tiled/mapeditor/actions/SaveAsAction.java
Log:
Fixed marquee selection problem noticed by Christian and fixed a problem with selecting the default map format.

Modified: trunk/CHANGES
===================================================================
--- trunk/CHANGES	2006-06-23 12:58:41 UTC (rev 676)
+++ trunk/CHANGES	2006-06-23 16:10:39 UTC (rev 677)
@@ -1,3 +1,9 @@
+trunk
+
+* Fixed selection of TMX as default map format also when plugins are loaded
+* Fixed active marquee not being reset on loading a map
+* Fixed layer duplicates to not share layer properties with the original
+
 0.6.0 - June 23rd, 2006
 
 * Added internationalization, with translations to Dutch, German, Italian,

Modified: trunk/src/tiled/mapeditor/MapEditor.java
===================================================================
--- trunk/src/tiled/mapeditor/MapEditor.java	2006-06-23 12:58:41 UTC (rev 676)
+++ trunk/src/tiled/mapeditor/MapEditor.java	2006-06-23 16:10:39 UTC (rev 677)
@@ -27,8 +27,6 @@
 
 import javax.imageio.ImageIO;
 import javax.swing.*;
-import javax.swing.border.CompoundBorder;
-import javax.swing.border.LineBorder;
 import javax.swing.event.*;
 import javax.swing.undo.UndoableEditSupport;
 
@@ -717,6 +715,7 @@
      * Returns the current map.
      *
      * @return the currently selected map
+     * @see #setCurrentMap(Map)
      */
     public Map getCurrentMap() {
         return currentMap;
@@ -1846,6 +1845,12 @@
         sb.makeQuadBrush(new Rectangle(0, 0, 1, 1));
         setBrush(sb);
 
+        // Cancel any active selection
+        if (marqueeSelection != null) {
+            currentMap.removeLayerSpecial(marqueeSelection);
+        }
+        marqueeSelection = null;
+
         if (!mapLoaded) {
             mapEventAdapter.fireEvent(MapEventAdapter.ME_MAPINACTIVE);
             mapView = null;
@@ -1893,7 +1898,8 @@
             zoomLabel.setText(
                     String.valueOf((int) (mapView.getZoom() * 100)) + "%");
 
-            //get the first non-null tile from the first tileset containing non-null tiles
+            // Get the first non-null tile from the first tileset containing
+            // non-null tiles.
             Vector tilesets = currentMap.getTilesets();
             Tile firstTile = null;
             if (!tilesets.isEmpty()) {

Modified: trunk/src/tiled/mapeditor/actions/SaveAsAction.java
===================================================================
--- trunk/src/tiled/mapeditor/actions/SaveAsAction.java	2006-06-23 12:58:41 UTC (rev 676)
+++ trunk/src/tiled/mapeditor/actions/SaveAsAction.java	2006-06-23 16:10:39 UTC (rev 677)
@@ -74,7 +74,6 @@
         JFileChooser chooser = new ConfirmingFileChooser(startLocation);
         chooser.addChoosableFileFilter(byExtensionFilter);
         chooser.addChoosableFileFilter(tmxFilter);
-        chooser.setFileFilter(byExtensionFilter);
 
         MapWriter[] writers = editor.getPluginLoader().getWriters();
         for (int i = 0; i < writers.length; i++) {
@@ -85,6 +84,8 @@
             }
         }
 
+        chooser.setFileFilter(byExtensionFilter);
+
         int result = chooser.showSaveDialog(editor.getAppFrame());
         if (result == JFileChooser.APPROVE_OPTION)
         {