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

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

Revision: 4974
          http://gridarta.svn.sourceforge.net/gridarta/?rev=4974&view=rev
Author:   akirschbaum
Date:     2008-08-21 22:24:57 +0000 (Thu, 21 Aug 2008)

Log Message:
-----------
Unify code.

Modified Paths:
--------------
    trunk/crossfire/src/cfeditor/GlobalSettingsImpl.java
    trunk/daimonin/src/daieditor/GlobalSettingsImpl.java
    trunk/daimonin/src/daieditor/MapActions.java
    trunk/daimonin/src/daieditor/gui/map/MapPropertiesDialog.java
    trunk/src/app/net/sf/gridarta/GlobalSettings.java
    trunk/src/test/net/sf/gridarta/map/DefaultMapModelTest.java

Modified: trunk/crossfire/src/cfeditor/GlobalSettingsImpl.java
===================================================================
--- trunk/crossfire/src/cfeditor/GlobalSettingsImpl.java	2008-08-21 22:17:00 UTC (rev 4973)
+++ trunk/crossfire/src/cfeditor/GlobalSettingsImpl.java	2008-08-21 22:24:57 UTC (rev 4974)
@@ -69,6 +69,12 @@
     }
 
     /** {@inheritDoc} */
+    @NotNull
+    public String getMediaDefaultFolder() {
+        throw new AssertionError("not implemented");
+    }
+
+    /** {@inheritDoc} */
     public void readGlobalSettings() {
         imageSet = prefs.get(USE_IMAGESET, "base");
         if (imageSet.equalsIgnoreCase("none")) {

Modified: trunk/daimonin/src/daieditor/GlobalSettingsImpl.java
===================================================================
--- trunk/daimonin/src/daieditor/GlobalSettingsImpl.java	2008-08-21 22:17:00 UTC (rev 4973)
+++ trunk/daimonin/src/daieditor/GlobalSettingsImpl.java	2008-08-21 22:24:57 UTC (rev 4974)
@@ -44,6 +44,8 @@
     /** Time for an automated docu popup. */
     private boolean autoPopupDocu = false;
 
+    /** {@inheritDoc} */
+    @NotNull
     public String getMediaDefaultFolder() {
         return mediaDir;
     }

Modified: trunk/daimonin/src/daieditor/MapActions.java
===================================================================
--- trunk/daimonin/src/daieditor/MapActions.java	2008-08-21 22:17:00 UTC (rev 4973)
+++ trunk/daimonin/src/daieditor/MapActions.java	2008-08-21 22:24:57 UTC (rev 4974)
@@ -37,6 +37,7 @@
 import javax.swing.filechooser.FileFilter;
 import net.sf.gridarta.CommonConstants;
 import net.sf.gridarta.CurrentMapListener;
+import net.sf.gridarta.GlobalSettings;
 import net.sf.gridarta.GridartaObjectsFactory;
 import net.sf.gridarta.MainControl;
 import net.sf.gridarta.MapManager;
@@ -119,7 +120,7 @@
 
     /** The global settings instance. */
     @NotNull
-    private final GlobalSettingsImpl globalSettings;
+    private final GlobalSettings globalSettings;
 
     /** The map manager. */
     private final MapManager<GameObject, MapArchObject, Archetype, CMapViewBasic> mapManager;

Modified: trunk/daimonin/src/daieditor/gui/map/MapPropertiesDialog.java
===================================================================
--- trunk/daimonin/src/daieditor/gui/map/MapPropertiesDialog.java	2008-08-21 22:17:00 UTC (rev 4973)
+++ trunk/daimonin/src/daieditor/gui/map/MapPropertiesDialog.java	2008-08-21 22:24:57 UTC (rev 4974)
@@ -19,7 +19,6 @@
 
 package daieditor.gui.map;
 
-import daieditor.GlobalSettingsImpl;
 import daieditor.gameobject.Archetype;
 import daieditor.gameobject.GameObject;
 import daieditor.map.MapArchObject;
@@ -51,6 +50,7 @@
 import javax.swing.border.Border;
 import javax.swing.border.EmptyBorder;
 import javax.swing.filechooser.FileFilter;
+import net.sf.gridarta.GlobalSettings;
 import net.sf.gridarta.GridartaObjectsFactory;
 import net.sf.gridarta.MapManager;
 import net.sf.gridarta.Size2D;
@@ -86,7 +86,7 @@
      * The global settings instance.
      */
     @NotNull
-    private final GlobalSettingsImpl globalSettings;
+    private final GlobalSettings globalSettings;
 
     private final MapControl<GameObject, MapArchObject, Archetype, CMapViewBasic> mapControl;
 
@@ -166,7 +166,7 @@
      * @param mapControl The level whose properties are shown/edited.
      * @param mapFileFilter the Swing file filter to use
      */
-    private MapPropertiesDialog(@NotNull final JFrame helpParent, @NotNull final MapManager<?, MapArchObject, ?, ?> mapManager, @NotNull final GridartaObjectsFactory<GameObject, MapArchObject, Archetype, CMapViewBasic> gridartaObjectsFactory, @NotNull final GlobalSettingsImpl globalSettings, final MapControl<GameObject, MapArchObject, Archetype, CMapViewBasic> mapControl, final FileFilter mapFileFilter) {
+    private MapPropertiesDialog(@NotNull final JFrame helpParent, @NotNull final MapManager<?, MapArchObject, ?, ?> mapManager, @NotNull final GridartaObjectsFactory<GameObject, MapArchObject, Archetype, CMapViewBasic> gridartaObjectsFactory, @NotNull final GlobalSettings globalSettings, final MapControl<GameObject, MapArchObject, Archetype, CMapViewBasic> mapControl, final FileFilter mapFileFilter) {
         okButton.setDefaultCapable(true);
         setOptions(new Object[] {helpButton, okButton, restoreButton, cancelButton});
 
@@ -571,7 +571,7 @@
      * @param level map to show dialog about
      * @param mapFileFilter the Swing file filter to use
      */
-    public static void showDialog(final Component parent, final JFrame helpParent, @NotNull final MapManager<?, MapArchObject, ?, ?> mapManager, @NotNull final GridartaObjectsFactory<GameObject, MapArchObject, Archetype, CMapViewBasic> gridartaObjectsFactory, @NotNull final GlobalSettingsImpl globalSettings, final MapControl<GameObject, MapArchObject, Archetype, CMapViewBasic> level, final FileFilter mapFileFilter) {
+    public static void showDialog(final Component parent, final JFrame helpParent, @NotNull final MapManager<?, MapArchObject, ?, ?> mapManager, @NotNull final GridartaObjectsFactory<GameObject, MapArchObject, Archetype, CMapViewBasic> gridartaObjectsFactory, @NotNull final GlobalSettings globalSettings, final MapControl<GameObject, MapArchObject, Archetype, CMapViewBasic> level, final FileFilter mapFileFilter) {
         final MapPropertiesDialog pane = new MapPropertiesDialog(helpParent, mapManager, gridartaObjectsFactory, globalSettings, level, mapFileFilter);
         final JDialog dialog = pane.createDialog(parent, ACTION_FACTORY.format("mapTitle", level.getMapModel().getMapArchObject().getMapDisplayName(), level.getMapFileName()));
         pane.dialog = dialog;

Modified: trunk/src/app/net/sf/gridarta/GlobalSettings.java
===================================================================
--- trunk/src/app/net/sf/gridarta/GlobalSettings.java	2008-08-21 22:17:00 UTC (rev 4973)
+++ trunk/src/app/net/sf/gridarta/GlobalSettings.java	2008-08-21 22:24:57 UTC (rev 4974)
@@ -85,4 +85,7 @@
     @NotNull
     File getPickmapDir();
 
+    @NotNull
+    String getMediaDefaultFolder();
+
 } // interface GlobalSettings

Modified: trunk/src/test/net/sf/gridarta/map/DefaultMapModelTest.java
===================================================================
--- trunk/src/test/net/sf/gridarta/map/DefaultMapModelTest.java	2008-08-21 22:17:00 UTC (rev 4973)
+++ trunk/src/test/net/sf/gridarta/map/DefaultMapModelTest.java	2008-08-21 22:24:57 UTC (rev 4974)
@@ -994,6 +994,12 @@
             throw new AssertionError();
         }
 
+        /** {@inheritDoc} */
+        @NotNull
+        public String getMediaDefaultFolder() {
+            throw new AssertionError();
+        }
+
     }
 
     /**


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