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

[svn at biggeruniverse.com]

Author: bjorn
Date: 2006-10-02 14:22:56 -0500 (Mon, 02 Oct 2006)
New Revision: 699

Modified:
   trunk/CHANGES
   trunk/src/tiled/mapeditor/MapEditor.java
   trunk/src/tiled/mapeditor/actions/OpenMapAction.java
Log:
Worked around an issue with setting a null cursor on GNU classpath.


Modified: trunk/CHANGES
===================================================================
--- trunk/CHANGES	2006-10-02 18:37:32 UTC (rev 698)
+++ trunk/CHANGES	2006-10-02 19:22:56 UTC (rev 699)
@@ -7,6 +7,7 @@
 * Properties table now displays the properties in alphabetical order
 * Fixed properties dialog to also save values that were still being edited
 * Worked around an issue with the open file dialog on GNU classpath
+* Worked around an issue with setting a null cursor on GNU classpath
 
 0.6.1 - July 15th, 2006
 

Modified: trunk/src/tiled/mapeditor/MapEditor.java
===================================================================
--- trunk/src/tiled/mapeditor/MapEditor.java	2006-10-02 18:37:32 UTC (rev 698)
+++ trunk/src/tiled/mapeditor/MapEditor.java	2006-10-02 19:22:56 UTC (rev 699)
@@ -75,11 +75,7 @@
     private static final int APP_HEIGHT = 600;
 
     private Cursor curDefault;
-    private Cursor curPaint;
-    private Cursor curErase;
-    private Cursor curPour;
     private Cursor curEyed;
-    private Cursor curMarquee;
 
     /** Current release version. */
     public static final String version = "0.7.0 WIP";
@@ -2085,23 +2081,15 @@
         if (mapView != null) {
             switch (currentPointerState) {
                 case PS_PAINT:
-                    mapView.setCursor(curPaint);
-                    break;
                 case PS_ERASE:
-                    mapView.setCursor(curErase);
-                    break;
                 case PS_POINT:
+                case PS_POUR:
+                case PS_MARQUEE:
                     mapView.setCursor(curDefault);
                     break;
-                case PS_POUR:
-                    mapView.setCursor(curPour);
-                    break;
                 case PS_EYED:
                     mapView.setCursor(curEyed);
                     break;
-                case PS_MARQUEE:
-                    mapView.setCursor(curMarquee);
-                    break;
             }
         }
     }

Modified: trunk/src/tiled/mapeditor/actions/OpenMapAction.java
===================================================================
--- trunk/src/tiled/mapeditor/actions/OpenMapAction.java	2006-10-02 18:37:32 UTC (rev 698)
+++ trunk/src/tiled/mapeditor/actions/OpenMapAction.java	2006-10-02 19:22:56 UTC (rev 699)
@@ -44,12 +44,12 @@
         String startLocation = TiledConfiguration.node("recent").get("file0",
                 null);
 
-        JFileChooser ch = new JFileChooser(startLocation);
+        JFileChooser chooser = new JFileChooser(startLocation);
 
         try {
             MapReader[] readers = editor.getPluginLoader().getReaders();
             for(int i = 0; i < readers.length; i++) {
-                ch.addChoosableFileFilter(new TiledFileFilter(
+                chooser.addChoosableFileFilter(new TiledFileFilter(
                             readers[i].getFilter(), readers[i].getName()));
             }
         } catch (Exception e) {
@@ -60,12 +60,12 @@
             e.printStackTrace();
         }
 
-        ch.addChoosableFileFilter(
+        chooser.addChoosableFileFilter(
                 new TiledFileFilter(TiledFileFilter.FILTER_TMX));
 
-        int ret = ch.showOpenDialog(editor.getAppFrame());
+        int ret = chooser.showOpenDialog(editor.getAppFrame());
         if (ret == JFileChooser.APPROVE_OPTION) {
-            editor.loadMap(ch.getSelectedFile().getAbsolutePath());
+            editor.loadMap(chooser.getSelectedFile().getAbsolutePath());
         }
     }
 }