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

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

Revision: 4873
          http://gridarta.svn.sourceforge.net/gridarta/?rev=4873&view=rev
Author:   akirschbaum
Date:     2008-08-15 22:58:22 +0000 (Fri, 15 Aug 2008)

Log Message:
-----------
Move code to common code base.

Modified Paths:
--------------
    trunk/crossfire/src/cfeditor/CMainControl.java
    trunk/daimonin/src/daieditor/CMainControl.java
    trunk/src/app/net/sf/gridarta/AbstractMainControl.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-15 22:49:17 UTC (rev 4872)
+++ trunk/crossfire/src/cfeditor/CMainControl.java	2008-08-15 22:58:22 UTC (rev 4873)
@@ -55,6 +55,9 @@
 import net.sf.gridarta.CommonConstants;
 import net.sf.gridarta.MainControl;
 import net.sf.gridarta.XmlHelper;
+import net.sf.gridarta.GlobalSettings;
+import net.sf.gridarta.EditTypes;
+import net.sf.gridarta.GridartaObjectsFactory;
 import net.sf.gridarta.archtype.ArchetypeAttributeParser;
 import net.sf.gridarta.archtype.ArchetypeTypeParser;
 import net.sf.gridarta.archtype.ArchetypeTypeSet;
@@ -63,6 +66,7 @@
 import net.sf.gridarta.gameobject.match.GameObjectMatchers;
 import net.sf.gridarta.gameobject.match.GameObjectMatchersInstance;
 import net.sf.gridarta.gameobject.scripts.AbstractScriptArchEditor;
+import net.sf.gridarta.gameobject.anim.AnimationObject;
 import net.sf.gridarta.gui.About;
 import net.sf.gridarta.gui.HideFileFilterProxy;
 import net.sf.gridarta.gui.LeftPanel;
@@ -211,7 +215,6 @@
      */
     public CMainControl() {
         super(new CrossfireObjectsFactory(), "cfeditor", new GlobalSettingsImpl(), new AnimationObjects(), new FaceObjects());
-        archetypeSet = new ArchetypeSet(this, globalSettings, editTypes, animationObjects, faceObjects, ((GlobalSettingsImpl) globalSettings).getImageSet(), gridartaObjectsFactory);
         ScriptedEvent.setArchetypeSet(archetypeSet);
         final boolean mapTileListBottom = prefs.getBoolean(MainView.MAP_TILE_LIST_BOTTOM_KEY, MainView.MAP_TILE_LIST_BOTTOM_DEFAULT);
         ACTION_FACTORY.createActions(true, this, "createNew", "open", "options", "exit", "newScript", "editScript", "zoom", "gc", "onlineHelp", "tod", "about");
@@ -674,4 +677,11 @@
         createImageWanted(mapViewManager.getCurrentMapView(), new File(outfile)); // create map image
     }
 
+    /** {@inheritDoc} */
+    @NotNull
+    @Override
+    protected net.sf.gridarta.gameobject.ArchetypeSet<GameObject, MapArchObject, Archetype> newArchetypeSet(@NotNull final GlobalSettings globalSettings, @NotNull final EditTypes<GameObject, MapArchObject, Archetype, CMapViewBasic> editTypes, @NotNull final net.sf.gridarta.gameobject.anim.AnimationObjects<? extends AnimationObject> animationObjects, @NotNull final net.sf.gridarta.gameobject.face.FaceObjects faceObjects, @NotNull final GridartaObjectsFactory<GameObject, MapArchObject, Archetype, CMapViewBasic> gridartaObjectsFactory) {
+        return new ArchetypeSet(this, globalSettings, editTypes, animationObjects, faceObjects, ((GlobalSettingsImpl) globalSettings).getImageSet(), gridartaObjectsFactory);
+    }
+
 } // class CMainControl

Modified: trunk/daimonin/src/daieditor/CMainControl.java
===================================================================
--- trunk/daimonin/src/daieditor/CMainControl.java	2008-08-15 22:49:17 UTC (rev 4872)
+++ trunk/daimonin/src/daieditor/CMainControl.java	2008-08-15 22:58:22 UTC (rev 4873)
@@ -60,6 +60,9 @@
 import net.sf.gridarta.CommonConstants;
 import net.sf.gridarta.MainControl;
 import net.sf.gridarta.XmlHelper;
+import net.sf.gridarta.GlobalSettings;
+import net.sf.gridarta.EditTypes;
+import net.sf.gridarta.GridartaObjectsFactory;
 import net.sf.gridarta.archtype.ArchetypeAttributeParser;
 import net.sf.gridarta.archtype.ArchetypeTypeParser;
 import net.sf.gridarta.archtype.ArchetypeTypeSet;
@@ -71,6 +74,7 @@
 import net.sf.gridarta.gameobject.match.MutableOrGameObjectMatcher;
 import net.sf.gridarta.gameobject.match.ViewGameObjectMatcherManager;
 import net.sf.gridarta.gameobject.scripts.AbstractScriptArchEditor;
+import net.sf.gridarta.gameobject.anim.AnimationObject;
 import net.sf.gridarta.gui.About;
 import net.sf.gridarta.gui.HideFileFilterProxy;
 import net.sf.gridarta.gui.LeftPanel;
@@ -266,7 +270,6 @@
      */
     public CMainControl() {
         super(new DaimoninObjectsFactory(), "daieditor", new GlobalSettingsImpl(), new AnimationObjects(), new FaceObjects());
-        archetypeSet = new ArchetypeSet(this, globalSettings, editTypes, animationObjects, faceObjects, gridartaObjectsFactory);
         ScriptedEvent.setArchetypeSet(archetypeSet);
         final boolean mapTileListBottom = prefs.getBoolean(MainView.MAP_TILE_LIST_BOTTOM_KEY, MainView.MAP_TILE_LIST_BOTTOM_DEFAULT);
         ACTION_FACTORY.createActions(true, this, "createNew", "open", "options", "exit", "newScript", "editScript", "controlServer", "controlClient", "cleanCompletelyBlockedSquares", "zoom", "gc", "onlineHelp", "tod", "about");
@@ -937,4 +940,11 @@
         }
     }
 
+    /** {@inheritDoc} */
+    @NotNull
+    @Override
+    protected ArchetypeSet newArchetypeSet(@NotNull final GlobalSettings globalSettings, @NotNull final EditTypes<GameObject, MapArchObject, Archetype, CMapViewBasic> editTypes, @NotNull final net.sf.gridarta.gameobject.anim.AnimationObjects<? extends AnimationObject> animationObjects, @NotNull final net.sf.gridarta.gameobject.face.FaceObjects faceObjects, @NotNull final GridartaObjectsFactory<GameObject, MapArchObject, Archetype, CMapViewBasic> gridartaObjectsFactory) {
+        return new ArchetypeSet(this, globalSettings, editTypes, animationObjects, faceObjects, gridartaObjectsFactory);
+    }
+
 } // class CMainControl

Modified: trunk/src/app/net/sf/gridarta/AbstractMainControl.java
===================================================================
--- trunk/src/app/net/sf/gridarta/AbstractMainControl.java	2008-08-15 22:49:17 UTC (rev 4872)
+++ trunk/src/app/net/sf/gridarta/AbstractMainControl.java	2008-08-15 22:58:22 UTC (rev 4873)
@@ -113,7 +113,8 @@
     /**
      * The archetype set to use.
      */
-    protected ArchetypeSet<G, A, R> archetypeSet;
+    @NotNull
+    protected final ArchetypeSet<G, A, R> archetypeSet;
     
     /** The updater instance. */
     protected UpdaterManager updaterManager = null;
@@ -141,9 +142,23 @@
         this.gridartaObjectsFactory = gridartaObjectsFactory;
         globalSettings.readGlobalSettings();
         ScriptedEventEditor.setGlobalSettings(globalSettings);
+        archetypeSet = newArchetypeSet(globalSettings, editTypes, animationObjects, faceObjects, gridartaObjectsFactory);
     }
 
     /**
+     * Creates an {@link ArchetypeSet} instance.
+     * @param globalSettings the global settigns instance
+     * @param editTypes the edit types instance
+     * @param animationObjects the animations to use
+     * @param faceObjects the FaceObjects instance to use
+     * @param gridartaObjectsFactory the gridarta objects factory instance to
+     * use
+     * @return the archetype set instance
+     */
+    @NotNull
+    protected abstract ArchetypeSet<G, A, R> newArchetypeSet(@NotNull final GlobalSettings globalSettings, @NotNull final EditTypes<G, A, R, V> editTypes, @NotNull final AnimationObjects<? extends AnimationObject> animationObjects, @NotNull final FaceObjects faceObjects, @NotNull final GridartaObjectsFactory<G, A, R, V> gridartaObjectsFactory);
+
+    /**
      * Create the cache instance for map images.
      * @param baseDir The base directory to store the cached files.
      * @param defaultIcon The default icon to return if no icon can be created

Modified: trunk/src/test/net/sf/gridarta/map/DefaultMapModelTest.java
===================================================================
--- trunk/src/test/net/sf/gridarta/map/DefaultMapModelTest.java	2008-08-15 22:49:17 UTC (rev 4872)
+++ trunk/src/test/net/sf/gridarta/map/DefaultMapModelTest.java	2008-08-15 22:58:22 UTC (rev 4873)
@@ -468,6 +468,14 @@
         public ObjectChooser<TestGameObject, TestMapArchObject, TestArchetype> getObjectChooser() {
             throw new AssertionError();
         }
+
+        /** {@inheritDoc} */
+        @NotNull
+        @Override
+        protected ArchetypeSet<TestGameObject, TestMapArchObject, TestArchetype> newArchetypeSet(@NotNull final GlobalSettings globalSettings, @NotNull final EditTypes<TestGameObject, TestMapArchObject, TestArchetype, TestMapViewBasic> editTypes, @NotNull final AnimationObjects<? extends AnimationObject> animationObjects, @NotNull final FaceObjects faceObjects, @NotNull final GridartaObjectsFactory<TestGameObject, TestMapArchObject, TestArchetype, TestMapViewBasic> gridartaObjectsFactory) {
+            throw new AssertionError();
+        }
+
     }
 
     /**


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