Thread: [Gridarta-commit] SF.net SVN: gridarta:[7601] trunk (Page 47)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 7601
          http://gridarta.svn.sourceforge.net/gridarta/?rev=7601&view=rev
Author:   akirschbaum
Date:     2010-04-23 20:27:57 +0000 (Fri, 23 Apr 2010)

Log Message:
-----------
Move code from DefaultMapPropertiesDialogFactory to MapPropertiesDialog.

Modified Paths:
--------------
    trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/gui/mappropertiesdialog/DefaultMapPropertiesDialogFactory.java
    trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/gui/mappropertiesdialog/MapPropertiesDialog.java
    trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/gui/mappropertiesdialog/DefaultMapPropertiesDialogFactory.java
    trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/gui/mappropertiesdialog/MapPropertiesDialog.java

Modified: trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/gui/mappropertiesdialog/DefaultMapPropertiesDialogFactory.java
===================================================================

--- trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/gui/mappropertiesdialog/DefaultMapPropertiesDialogFactory.java	2010-04-23 20:27:02 UTC (rev 7600)
+++ trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/gui/mappropertiesdialog/DefaultMapPropertiesDialogFactory.java	2010-04-23 20:27:57 UTC (rev 7601)
@@ -20,9 +20,7 @@
 package net.sf.gridarta.var.atrinik.gui.mappropertiesdialog;
 
 import java.awt.Component;
-import javax.swing.JDialog;
 import javax.swing.JFrame;
-import javax.swing.JOptionPane;
 import javax.swing.filechooser.FileFilter;
 import net.sf.gridarta.gui.map.mapview.MapViewsManager;
 import net.sf.gridarta.gui.mappropertiesdialog.MapPropertiesDialogFactory;
@@ -91,15 +89,7 @@
     @Override
     public void showDialog(@NotNull final Component parent, @NotNull final JFrame helpParent, @NotNull final MapModel<GameObject, MapArchObject, Archetype> mapModel, @NotNull final FileFilter mapFileFilter) {
         final MapPropertiesDialog pane = new MapPropertiesDialog(helpParent, mapManager, globalSettings, mapModel, mapFileFilter, mapPathNormalizer, mapViewsManager);
-        final JDialog dialog = pane.createDialog(parent, ACTION_BUILDER.format("mapTitle", mapModel.getMapArchObject().getMapName(), mapModel.getMapArchObject().getMapName()));
-        pane.dialog = dialog;
-        dialog.getRootPane().setDefaultButton(pane.okButton);
-        dialog.setResizable(true);
-        dialog.setModal(false);
-        dialog.setVisible(true);
-        if (!pane.mapTilePaneEnabled) {
-            ACTION_BUILDER.showOnetimeMessageDialog(dialog, JOptionPane.WARNING_MESSAGE, "mapTilesNoMapFileNoMapTilePane");
-        }
+        pane.showDialog(parent);
     }
 
 } // class DefaultMapPropertiesDialogFactory

Modified: trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/gui/mappropertiesdialog/MapPropertiesDialog.java
===================================================================
--- trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/gui/mappropertiesdialog/MapPropertiesDialog.java	2010-04-23 20:27:02 UTC (rev 7600)
+++ trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/gui/mappropertiesdialog/MapPropertiesDialog.java	2010-04-23 20:27:57 UTC (rev 7601)
@@ -34,6 +34,7 @@
 import javax.swing.JButton;
 import javax.swing.JCheckBox;
 import javax.swing.JComponent;
+import javax.swing.JDialog;
 import javax.swing.JFormattedTextField;
 import javax.swing.JFrame;
 import javax.swing.JLabel;
@@ -87,7 +88,7 @@
 
     private final MapModel<GameObject, MapArchObject, Archetype> mapModel;
 
-    public Window dialog = null;
+    private Window dialog = null;
 
     // input components, see MapArchObject for expl. of purpose
     private final JTextArea mapDescription = new JTextArea(4, 4); // the msg text/arch text
@@ -141,7 +142,7 @@
     private final AbstractButton checkboxPlugins = new JCheckBox();
 
     /** JButton for ok. */
-    public final JButton okButton = new JButton(ACTION_BUILDER.createAction(false, "mapOkay", this));
+    private final JButton okButton = new JButton(ACTION_BUILDER.createAction(false, "mapOkay", this));
 
     /** JButton for cancel. */
     private final JButton cancelButton = new JButton(ACTION_BUILDER.createAction(false, "mapCancel", this));
@@ -150,7 +151,7 @@
     private final AbstractMapTilePane<GameObject, MapArchObject, Archetype> mapTilePane;
 
     /** Whether the map tile pane was enabled. */
-    public final boolean mapTilePaneEnabled;
+    private final boolean mapTilePaneEnabled;
 
     /**
      * Creates a map-options dialog.
@@ -569,4 +570,21 @@
         mapTilePane.restoreMapProperties();
     }
 
+    /**
+     * Creates and displays the map properties dialog.
+     * @param parentComponent the parent component of the dialog
+     */
+    public void showDialog(final Component parentComponent) {
+        final String title = ACTION_BUILDER.format("mapTitle", mapModel.getMapArchObject().getMapName(), mapModel.getMapArchObject().getMapName());
+        final JDialog window = createDialog(parentComponent, title);
+        dialog = window;
+        window.getRootPane().setDefaultButton(okButton);
+        window.setResizable(true);
+        window.setModal(false);
+        window.setVisible(true);
+        if (!mapTilePaneEnabled) {
+            ACTION_BUILDER.showOnetimeMessageDialog(window, WARNING_MESSAGE, "mapTilesNoMapFileNoMapTilePane");
+        }
+    }
+
 } // class MapPropertiesDialog

Modified: trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/gui/mappropertiesdialog/DefaultMapPropertiesDialogFactory.java
===================================================================
--- trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/gui/mappropertiesdialog/DefaultMapPropertiesDialogFactory.java	2010-04-23 20:27:02 UTC (rev 7600)
+++ trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/gui/mappropertiesdialog/DefaultMapPropertiesDialogFactory.java	2010-04-23 20:27:57 UTC (rev 7601)
@@ -20,9 +20,7 @@
 package net.sf.gridarta.var.crossfire.gui.mappropertiesdialog;
 
 import java.awt.Component;
-import javax.swing.JDialog;
 import javax.swing.JFrame;
-import javax.swing.JOptionPane;
 import javax.swing.filechooser.FileFilter;
 import net.sf.gridarta.gui.map.mapview.MapViewsManager;
 import net.sf.gridarta.gui.mappropertiesdialog.MapPropertiesDialogFactory;
@@ -91,15 +89,7 @@
     @Override
     public void showDialog(@NotNull final Component parent, @NotNull final JFrame helpParent, @NotNull final MapModel<GameObject, MapArchObject, Archetype> mapModel, @NotNull final FileFilter mapFileFilter) {
         final MapPropertiesDialog pane = new MapPropertiesDialog(helpParent, mapManager, globalSettings, mapModel, mapFileFilter, mapPathNormalizer, mapViewsManager);
-        final JDialog dialog = pane.createDialog(parent, ACTION_BUILDER.format("mapTitle", mapModel.getMapArchObject().getMapName(), mapModel.getMapArchObject().getMapName()));
-        pane.dialog = dialog;
-        dialog.getRootPane().setDefaultButton(pane.okButton);
-        dialog.setResizable(true);
-        dialog.setModal(false);
-        dialog.setVisible(true);
-        if (!pane.mapTilePaneEnabled) {
-            ACTION_BUILDER.showOnetimeMessageDialog(dialog, JOptionPane.WARNING_MESSAGE, "mapTilesNoMapFileNoMapTilePane");
-        }
+        pane.showDialog(parent);
     }
 
 } // class DefaultMapPropertiesDialogFactory

Modified: trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/gui/mappropertiesdialog/MapPropertiesDialog.java
===================================================================
--- trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/gui/mappropertiesdialog/MapPropertiesDialog.java	2010-04-23 20:27:02 UTC (rev 7600)
+++ trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/gui/mappropertiesdialog/MapPropertiesDialog.java	2010-04-23 20:27:57 UTC (rev 7601)
@@ -29,6 +29,7 @@
 import javax.swing.AbstractButton;
 import javax.swing.JButton;
 import javax.swing.JCheckBox;
+import javax.swing.JDialog;
 import javax.swing.JFormattedTextField;
 import javax.swing.JFrame;
 import javax.swing.JLabel;
@@ -79,7 +80,7 @@
 
     private final MapModel<GameObject, MapArchObject, Archetype> mapModel;
 
-    public Window dialog = null;
+    private Window dialog = null;
 
     /**
      * The {@link GridBagConstraints} for label fields before text input
@@ -161,7 +162,7 @@
     private final JTextField fieldSkySetting = new JFormattedTextField(); // sky setting
 
     /** JButton for ok. */
-    public final JButton okButton = new JButton(ACTION_BUILDER.createAction(false, "mapOkay", this));
+    private final JButton okButton = new JButton(ACTION_BUILDER.createAction(false, "mapOkay", this));
 
     /** JButton for cancel. */
     private final JButton cancelButton = new JButton(ACTION_BUILDER.createAction(false, "mapCancel", this));
@@ -170,7 +171,7 @@
     private final AbstractMapTilePane<GameObject, MapArchObject, Archetype> mapTilePane;
 
     /** Whether the map tile pane was enabled. */
-    public final boolean mapTilePaneEnabled;
+    private final boolean mapTilePaneEnabled;
 
     /**
      * Creates a map-options dialog.
@@ -639,4 +640,21 @@
         mapTilePane.restoreMapProperties();
     }
 
+    /**
+     * Creates and displays the map properties dialog.
+     * @param parentComponent the parent component of the dialog
+     */
+    public void showDialog(final Component parentComponent) {
+        final String title = ACTION_BUILDER.format("mapTitle", mapModel.getMapArchObject().getMapName(), mapModel.getMapArchObject().getMapName());
+        final JDialog window = createDialog(parentComponent, title);
+        dialog = window;
+        window.getRootPane().setDefaultButton(okButton);
+        window.setResizable(true);
+        window.setModal(false);
+        window.setVisible(true);
+        if (!mapTilePaneEnabled) {
+            ACTION_BUILDER.showOnetimeMessageDialog(window, WARNING_MESSAGE, "mapTilesNoMapFileNoMapTilePane");
+        }
+    }
+
 } // class MapPropertiesDialog


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




Thread: [Gridarta-commit] SF.net SVN: gridarta:[7601] trunk (Page 47)

gridarta-commit