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

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

Revision: 5002
          http://gridarta.svn.sourceforge.net/gridarta/?rev=5002&view=rev
Author:   akirschbaum
Date:     2008-08-22 18:51:46 +0000 (Fri, 22 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-22 18:37:07 UTC (rev 5001)
+++ trunk/crossfire/src/cfeditor/CMainControl.java	2008-08-22 18:51:46 UTC (rev 5002)
@@ -54,12 +54,14 @@
 import net.sf.gridarta.GridartaObjectsFactory;
 import net.sf.gridarta.MapManager;
 import net.sf.gridarta.archtype.ArchetypeTypeSet;
+import net.sf.gridarta.gameobject.AbstractArchetypeParser;
 import net.sf.gridarta.gameobject.anim.AnimationObject;
 import net.sf.gridarta.gameobject.match.GameObjectMatcher;
 import net.sf.gridarta.gui.MainView;
 import net.sf.gridarta.gui.MapViewManager;
 import net.sf.gridarta.gui.RecentManager;
 import net.sf.gridarta.gui.SystemIcons;
+import net.sf.gridarta.gui.archetypechooser.ArchetypeChooserControl;
 import net.sf.gridarta.gui.connectionview.LockedItemsControl;
 import net.sf.gridarta.gui.gameobjectattributesdialog.GameObjectAttributesDialogFactory;
 import net.sf.gridarta.gui.gameobjectattributespanel.GameObjectAttributesModel;
@@ -135,7 +137,6 @@
      */
     public CMainControl(@NotNull final GridartaObjectsFactory<GameObject, MapArchObject, Archetype, CMapViewBasic> gridartaObjectsFactory) {
         super(gridartaObjectsFactory, new DefaultRendererFactory(), "cfeditor", new GlobalSettingsImpl(), new AnimationObjects(), new FaceObjects(), new DefaultMapControlFactory(gridartaObjectsFactory), false, CResourceLoader.getHomeFile("thumbnails"), null, "DaimoninEditor.jar", pythonFileFilter, ".py", "Python", Archetype.TYPE_SPELL, null, Archetype.TYPE_EVENT_CONNECTOR, false, 0, new int[] { Archetype.TYPE_LOCKED_DOOR, Archetype.TYPE_SPECIAL_KEY, Archetype.TYPE_TRIGGER_ALTAR, Archetype.TYPE_DETECTOR, Archetype.TYPE_TRIGGER_MARKER, Archetype.TYPE_MARKER, Archetype.TYPE_INVENTORY_CHECKER, Archetype.TYPE_CONTAINER, });
-        final ArchetypeParser archetypeParser = new ArchetypeParser(gridartaObjectsFactory, archetypeChooserControl, animationObjects, archetypeSet);
         gridartaObjectsFactory.init(faceObjects, archetypeChooserModel, selectedSquareView, this, mainView, editTypes, mapImageCache, mapActions, archetypeParser, archetypeSet, toolPalette, autojoinLists, exitMatcher);
         ((DefaultMapControlFactory) mapControlFactory).init(gridartaObjectsFactory, rendererFactory, mapActions, archetypeChooserModel, mapImageCache, autojoinLists, exitMatcher);
         archetypeSet.loadArchetypes(archetypeParser);
@@ -183,6 +184,12 @@
     }
 
     /** {@inheritDoc} */
+    @Override
+    protected AbstractArchetypeParser<GameObject, MapArchObject, Archetype> newArchetypeParser(final GridartaObjectsFactory<GameObject, MapArchObject, Archetype, CMapViewBasic> gridartaObjectsFactory, final ArchetypeChooserControl<GameObject, MapArchObject, Archetype, CMapViewBasic> archetypeChooserControl, final net.sf.gridarta.gameobject.anim.AnimationObjects<? extends AnimationObject> animationObjects, final net.sf.gridarta.gameobject.ArchetypeSet<GameObject, MapArchObject, Archetype> archetypeSet) {
+        return new ArchetypeParser(gridartaObjectsFactory, archetypeChooserControl, animationObjects, archetypeSet);
+    }
+
+    /** {@inheritDoc} */
     protected void createActions() {
     }
 

Modified: trunk/daimonin/src/daieditor/CMainControl.java
===================================================================
--- trunk/daimonin/src/daieditor/CMainControl.java	2008-08-22 18:37:07 UTC (rev 5001)
+++ trunk/daimonin/src/daieditor/CMainControl.java	2008-08-22 18:51:46 UTC (rev 5002)
@@ -58,6 +58,7 @@
 import net.sf.gridarta.GridartaObjectsFactory;
 import net.sf.gridarta.MapManager;
 import net.sf.gridarta.archtype.ArchetypeTypeSet;
+import net.sf.gridarta.gameobject.AbstractArchetypeParser;
 import net.sf.gridarta.gameobject.anim.AnimationObject;
 import net.sf.gridarta.gameobject.face.FaceObjectProviders;
 import net.sf.gridarta.gameobject.match.GameObjectMatcher;
@@ -67,6 +68,7 @@
 import net.sf.gridarta.gui.MapViewManager;
 import net.sf.gridarta.gui.RecentManager;
 import net.sf.gridarta.gui.SystemIcons;
+import net.sf.gridarta.gui.archetypechooser.ArchetypeChooserControl;
 import net.sf.gridarta.gui.connectionview.LockedItemsControl;
 import net.sf.gridarta.gui.gameobjectattributesdialog.GameObjectAttributesDialogFactory;
 import net.sf.gridarta.gui.gameobjectattributespanel.GameObjectAttributesModel;
@@ -190,7 +192,6 @@
      */
     public CMainControl(@NotNull final GridartaObjectsFactory<GameObject, MapArchObject, Archetype, CMapViewBasic> gridartaObjectsFactory) {
         super(gridartaObjectsFactory, new DefaultRendererFactory(), "daieditor", new GlobalSettingsImpl(), new AnimationObjects(), new FaceObjects(), new DefaultMapControlFactory(gridartaObjectsFactory), true, null, GUIUtils.getSysIcon(IGUIConstants.TILE_NORTH), "CrossfireEditor.jar", luaFileFilter, ".lua", "Lua", 0, IGUIConstants.SPELL_FILE, 0, true, -1, new int[] { Archetype.TYPE_LOCKED_DOOR, Archetype.TYPE_SPECIAL_KEY, Archetype.TYPE_ALTAR_TRIGGER, Archetype.TYPE_MARKER, Archetype.TYPE_INVENTORY_CHECKER, Archetype.TYPE_SPAWN_POINT, Archetype.TYPE_CONTAINER, });
-        final ArchetypeParser archetypeParser = new ArchetypeParser(archetypeChooserControl, animationObjects, archetypeSet);
         ((DefaultMapControlFactory) mapControlFactory).init(gridartaObjectsFactory, rendererFactory, mapActions, archetypeChooserModel, mapImageCache, autojoinLists, exitMatcher);
         gridartaObjectsFactory.init(faceObjects, archetypeChooserModel, selectedSquareView, this, mainView, editTypes, mapImageCache, mapActions, archetypeParser, archetypeSet, toolPalette, autojoinLists, exitMatcher);
 
@@ -260,6 +261,12 @@
     }
 
     /** {@inheritDoc} */
+    @Override
+    protected AbstractArchetypeParser<GameObject, MapArchObject, Archetype> newArchetypeParser(final GridartaObjectsFactory<GameObject, MapArchObject, Archetype, CMapViewBasic> gridartaObjectsFactory, final ArchetypeChooserControl<GameObject, MapArchObject, Archetype, CMapViewBasic> archetypeChooserControl, final net.sf.gridarta.gameobject.anim.AnimationObjects<? extends AnimationObject> animationObjects, final net.sf.gridarta.gameobject.ArchetypeSet<GameObject, MapArchObject, Archetype> archetypeSet) {
+        return new ArchetypeParser(archetypeChooserControl, animationObjects, archetypeSet);
+    }
+
+    /** {@inheritDoc} */
     protected void createActions() {
         ACTION_FACTORY.createActions(true, this, "controlServer", "controlClient", "cleanCompletelyBlockedSquares", "collectSpells");
         ACTION_FACTORY.createToggles(true, this, "drawDouble");

Modified: trunk/src/app/net/sf/gridarta/AbstractMainControl.java
===================================================================
--- trunk/src/app/net/sf/gridarta/AbstractMainControl.java	2008-08-22 18:37:07 UTC (rev 5001)
+++ trunk/src/app/net/sf/gridarta/AbstractMainControl.java	2008-08-22 18:51:46 UTC (rev 5002)
@@ -37,6 +37,7 @@
 import net.sf.gridarta.archtype.ArchetypeTypeParser;
 import net.sf.gridarta.archtype.ArchetypeTypeSet;
 import net.sf.gridarta.archtype.ArchetypeTypeSetParser;
+import net.sf.gridarta.gameobject.AbstractArchetypeParser;
 import net.sf.gridarta.gameobject.Archetype;
 import net.sf.gridarta.gameobject.ArchetypeSet;
 import net.sf.gridarta.gameobject.GameObject;
@@ -341,6 +342,9 @@
     @Nullable
     private PreferencesGroup prefsGroup = null;
 
+    @NotNull
+    protected final AbstractArchetypeParser<G, A, R> archetypeParser;
+
     /**
      * Creates a new instance.
      * @param gridartaObjectsFactory the gridarta objects factory
@@ -489,8 +493,11 @@
         mainView.init(gameObjectAttributesControl, selectedSquareView, archetypeTypeSet, mapTileListBottom, gameObjectMatchers, archetypeChooserControl, pickmapChooserControl, objectChooser, leftPanel);
         mapActions.updateMenuState();
         init3();
+        archetypeParser = newArchetypeParser(gridartaObjectsFactory, archetypeChooserControl, animationObjects, archetypeSet);
     }
 
+    protected abstract AbstractArchetypeParser<G, A, R> newArchetypeParser(final GridartaObjectsFactory<G, A, R, V> gridartaObjectsFactory, final ArchetypeChooserControl<G, A, R, V> archetypeChooserControl, final net.sf.gridarta.gameobject.anim.AnimationObjects<? extends AnimationObject> animationObjects, final net.sf.gridarta.gameobject.ArchetypeSet<G, A, R> archetypeSet);
+
     protected abstract void createActions();
 
     @NotNull

Modified: trunk/src/test/net/sf/gridarta/map/DefaultMapModelTest.java
===================================================================
--- trunk/src/test/net/sf/gridarta/map/DefaultMapModelTest.java	2008-08-22 18:37:07 UTC (rev 5001)
+++ trunk/src/test/net/sf/gridarta/map/DefaultMapModelTest.java	2008-08-22 18:51:46 UTC (rev 5002)
@@ -67,6 +67,7 @@
 import net.sf.gridarta.gui.MainView;
 import net.sf.gridarta.gui.MapViewManager;
 import net.sf.gridarta.gui.archetypechooser.ArchetypeChooserModel;
+import net.sf.gridarta.gui.archetypechooser.ArchetypeChooserControl;
 import net.sf.gridarta.gui.connectionview.LockedItemsControl;
 import net.sf.gridarta.gui.gameobjectattributesdialog.GameObjectAttributesDialogFactory;
 import net.sf.gridarta.gui.gameobjectattributespanel.GameObjectAttributesControl;
@@ -512,6 +513,13 @@
         }
 
         /** {@inheritDoc} */
+        @Override
+        protected AbstractArchetypeParser<TestGameObject, TestMapArchObject, TestArchetype> newArchetypeParser(final GridartaObjectsFactory<TestGameObject, TestMapArchObject, TestArchetype, TestMapViewBasic> gridartaObjectsFactory, final ArchetypeChooserControl<TestGameObject, TestMapArchObject, TestArchetype, TestMapViewBasic> archetypeChooserControl, final AnimationObjects<? extends AnimationObject> animationObjects, final ArchetypeSet<TestGameObject, TestMapArchObject, TestArchetype> archetypeSet) {
+            return null;
+        }
+
+        /** {@inheritDoc} */
+        @Override
         protected void createActions() {
         }
 


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