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

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

Revision: 4921
          http://gridarta.svn.sourceforge.net/gridarta/?rev=4921&view=rev
Author:   akirschbaum
Date:     2008-08-20 20:07:13 +0000 (Wed, 20 Aug 2008)

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

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

Modified: trunk/crossfire/src/cfeditor/CMainControl.java
===================================================================
--- trunk/crossfire/src/cfeditor/CMainControl.java	2008-08-20 20:01:05 UTC (rev 4920)
+++ trunk/crossfire/src/cfeditor/CMainControl.java	2008-08-20 20:07:13 UTC (rev 4921)
@@ -205,7 +205,7 @@
      */
     public CMainControl() {
         super(new CrossfireObjectsFactory(), new DefaultRendererFactory(), "cfeditor", new GlobalSettingsImpl(), new AnimationObjects(), new FaceObjects(), new DefaultMapControlFactory());
-        pickmapChooserControl = new PickmapChooserControl<GameObject, MapArchObject, Archetype, CMapViewBasic>(newMapDialogFactory, this, gridartaObjectsFactory, mapControlFactory, new File(globalSettings.getMapDir(), IGUIConstants.PICKMAP_DIR), mapManager);
+        pickmapChooserControl = new PickmapChooserControl<GameObject, MapArchObject, Archetype, CMapViewBasic>(newMapDialogFactory, this, gridartaObjectsFactory, mapControlFactory, globalSettings.getPickmapDir(), mapManager);
         newMapDialogFactory.setPickmapChooserControl(pickmapChooserControl);
         final ArchetypeTypeSet<GameObject, MapArchObject, Archetype> archetypeTypeSet = new ArchetypeTypeSet<GameObject, MapArchObject, Archetype>();
         final GameObjectAttributesDialogFactory<GameObject, MapArchObject, Archetype, CMapViewBasic> gameObjectAttributesDialogFactory = new GameObjectAttributesDialogFactory<GameObject, MapArchObject, Archetype, CMapViewBasic>(archetypeTypeSet, archetypeSet, mapManager);

Modified: trunk/crossfire/src/cfeditor/GlobalSettingsImpl.java
===================================================================
--- trunk/crossfire/src/cfeditor/GlobalSettingsImpl.java	2008-08-20 20:01:05 UTC (rev 4920)
+++ trunk/crossfire/src/cfeditor/GlobalSettingsImpl.java	2008-08-20 20:07:13 UTC (rev 4921)
@@ -24,6 +24,7 @@
 import net.sf.gridarta.MainControl;
 import org.apache.log4j.Logger;
 import org.jetbrains.annotations.Nullable;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * Maintains path names to resources.
@@ -62,6 +63,12 @@
     }
 
     /** {@inheritDoc} */
+    @NotNull
+    public File getPickmapDir() {
+        return new File(getMapDir(), IGUIConstants.PICKMAP_DIR);
+    }
+
+    /** {@inheritDoc} */
     public void readGlobalSettings() {
         imageSet = prefs.get(USE_IMAGESET, "base");
         if (imageSet.equalsIgnoreCase("none")) {

Modified: trunk/daimonin/src/daieditor/CMainControl.java
===================================================================
--- trunk/daimonin/src/daieditor/CMainControl.java	2008-08-20 20:01:05 UTC (rev 4920)
+++ trunk/daimonin/src/daieditor/CMainControl.java	2008-08-20 20:07:13 UTC (rev 4921)
@@ -259,7 +259,7 @@
      */
     public CMainControl() {
         super(new DaimoninObjectsFactory(), new DefaultRendererFactory(), "daieditor", new GlobalSettingsImpl(), new AnimationObjects(), new FaceObjects(), new DefaultMapControlFactory());
-        pickmapChooserControl = new PickmapChooserControl<GameObject, MapArchObject, Archetype, CMapViewBasic>(newMapDialogFactory, this, gridartaObjectsFactory, mapControlFactory, new File(globalSettings.getArchDefaultFolder(), IGUIConstants.PICKMAP_DIR), mapManager);
+        pickmapChooserControl = new PickmapChooserControl<GameObject, MapArchObject, Archetype, CMapViewBasic>(newMapDialogFactory, this, gridartaObjectsFactory, mapControlFactory, globalSettings.getPickmapDir(), mapManager);
         newMapDialogFactory.setPickmapChooserControl(pickmapChooserControl);
         final ArchetypeTypeSet<GameObject, MapArchObject, Archetype> archetypeTypeSet = new ArchetypeTypeSet<GameObject, MapArchObject, Archetype>();
         final GameObjectAttributesDialogFactory<GameObject, MapArchObject, Archetype, CMapViewBasic> gameObjectAttributesDialogFactory = new GameObjectAttributesDialogFactory<GameObject, MapArchObject, Archetype, CMapViewBasic>(archetypeTypeSet, archetypeSet, mapManager);

Modified: trunk/daimonin/src/daieditor/GlobalSettingsImpl.java
===================================================================
--- trunk/daimonin/src/daieditor/GlobalSettingsImpl.java	2008-08-20 20:01:05 UTC (rev 4920)
+++ trunk/daimonin/src/daieditor/GlobalSettingsImpl.java	2008-08-20 20:07:13 UTC (rev 4921)
@@ -23,6 +23,7 @@
 import java.util.prefs.Preferences;
 import net.sf.gridarta.MainControl;
 import org.apache.log4j.Logger;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * Maintains path names to resources.
@@ -58,6 +59,12 @@
     }
 
     /** {@inheritDoc} */
+    @NotNull
+    public File getPickmapDir() {
+        return new File(getArchDefaultFolder(), IGUIConstants.PICKMAP_DIR);
+    }
+
+    /** {@inheritDoc} */
     public void readGlobalSettings() {
         initDirs();
 

Modified: trunk/src/app/net/sf/gridarta/GlobalSettings.java
===================================================================
--- trunk/src/app/net/sf/gridarta/GlobalSettings.java	2008-08-20 20:01:05 UTC (rev 4920)
+++ trunk/src/app/net/sf/gridarta/GlobalSettings.java	2008-08-20 20:07:13 UTC (rev 4921)
@@ -78,4 +78,11 @@
     /** {@inheritDoc} */
     void setCurrentDir(File currentDir);
 
+    /**
+     * Returns the pickmap directory.
+     * @return the pickmap directory
+     */
+    @NotNull
+    File getPickmapDir();
+
 } // interface GlobalSettings

Modified: trunk/src/test/net/sf/gridarta/map/DefaultMapModelTest.java
===================================================================
--- trunk/src/test/net/sf/gridarta/map/DefaultMapModelTest.java	2008-08-20 20:01:05 UTC (rev 4920)
+++ trunk/src/test/net/sf/gridarta/map/DefaultMapModelTest.java	2008-08-20 20:07:13 UTC (rev 4921)
@@ -961,6 +961,12 @@
             throw new AssertionError();
         }
 
+        /** {@inheritDoc} */
+        @NotNull
+        public File getPickmapDir() {
+            throw new AssertionError();
+        }
+
     }
 
     /**


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