[Gridarta-commit] SF.net SVN: gridarta: [1017] trunk

[<aki...@us...>]

Revision: 1017
          http://svn.sourceforge.net/gridarta/?rev=1017&view=rev
Author:   akirschbaum
Date:     2006-12-10 07:59:12 -0800 (Sun, 10 Dec 2006)

Log Message:
-----------
Rename variable name.

Modified Paths:
--------------
    trunk/crossfire/src/cfeditor/CMainControl.java
    trunk/daimonin/src/daieditor/CMainControl.java

Modified: trunk/crossfire/src/cfeditor/CMainControl.java
===================================================================
--- trunk/crossfire/src/cfeditor/CMainControl.java	2006-12-10 15:46:05 UTC (rev 1016)
+++ trunk/crossfire/src/cfeditor/CMainControl.java	2006-12-10 15:59:12 UTC (rev 1017)
@@ -1013,9 +1013,9 @@
      * an output file name/path for the png image.
      */
     public void createImg() {
-        final MapControl mc = currentMap; // control of current map
+        final MapControl mapControl = currentMap; // control of current map
 
-        if (mc == null) {
+        if (mapControl == null) {
             // there is no map open (should not happen due to disabled menus)
             ACTION_FACTORY.showMessageDialog(mainView, "createImgNoMap");
         } else {
@@ -1025,7 +1025,7 @@
                     strImageDir = mapDir.getAbsolutePath();
                 }
 
-                filename = strImageDir + File.separator + mc.getMapFileName() + ".png";
+                filename = strImageDir + File.separator + mapControl.getMapFileName() + ".png";
                 final JFileChooser fileChooser = new JFileChooser(strImageDir);
                 fileChooser.setDialogTitle("Save Image As");
                 fileChooser.setFileSelectionMode(JFileChooser.FILES_ONLY);
@@ -1050,7 +1050,7 @@
                     if (!filename.endsWith(".png")) {
                         filename += ".png";
                     }
-                    mc.getMapViewFrame().printFullImage(filename);
+                    mapControl.getMapViewFrame().printFullImage(filename);
                 }
             } catch (final IOException e) {
                 ACTION_FACTORY.showMessageDialog(mainView, "createImgIOException", filename, e.getMessage());

Modified: trunk/daimonin/src/daieditor/CMainControl.java
===================================================================
--- trunk/daimonin/src/daieditor/CMainControl.java	2006-12-10 15:46:05 UTC (rev 1016)
+++ trunk/daimonin/src/daieditor/CMainControl.java	2006-12-10 15:59:12 UTC (rev 1017)
@@ -1379,9 +1379,9 @@
      * an output file name/path for the png image.
      */
     public void createImg() {
-        final MapControl mc = currentMap; // control of current map
+        final MapControl mapControl = currentMap; // control of current map
 
-        if (mc == null) {
+        if (mapControl == null) {
             // there is no map open (should not happen due to disabled menus)
             ACTION_FACTORY.showMessageDialog(mainView, "createImgNoMap");
         } else {
@@ -1391,7 +1391,7 @@
                     strImageDir = mapDir.getAbsolutePath();
                 }
 
-                filename = strImageDir + File.separator + mc.getMapFileName() + ".png";
+                filename = strImageDir + File.separator + mapControl.getMapFileName() + ".png";
                 final JFileChooser fileChooser = new JFileChooser(strImageDir);
                 fileChooser.setDialogTitle("Save Image As");
                 fileChooser.setFileSelectionMode(JFileChooser.FILES_ONLY);
@@ -1409,7 +1409,7 @@
                         filename += ".png";
                     }
                     if (!new File(filename).exists() || ACTION_FACTORY.showConfirmDialog(mainView, JOptionPane.YES_NO_OPTION, JOptionPane.WARNING_MESSAGE, "overwriteOtherFile", filename) == JOptionPane.YES_OPTION) {
-                        mc.getMapViewFrame().printFullImage(filename);
+                        mapControl.getMapViewFrame().printFullImage(filename);
                     }
                 }
             } catch (final IOException e) {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.