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

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

Revision: 4998
          http://gridarta.svn.sourceforge.net/gridarta/?rev=4998&view=rev
Author:   akirschbaum
Date:     2008-08-22 18:29:26 +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:26:19 UTC (rev 4997)
+++ trunk/crossfire/src/cfeditor/CMainControl.java	2008-08-22 18:29:26 UTC (rev 4998)
@@ -186,6 +186,10 @@
     }
 
     /** {@inheritDoc} */
+    protected void createActions() {
+    }
+
+    /** {@inheritDoc} */
     @NotNull
     @Override
     protected NewMapDialogFactory<GameObject, MapArchObject, Archetype, CMapViewBasic> newNewMapDialogFactory(@NotNull final MapManager<GameObject, MapArchObject, Archetype, CMapViewBasic> mapManager, @NotNull final GridartaObjectsFactory<GameObject, MapArchObject, Archetype, CMapViewBasic> gridartaObjectsFactory) {

Modified: trunk/daimonin/src/daieditor/CMainControl.java
===================================================================
--- trunk/daimonin/src/daieditor/CMainControl.java	2008-08-22 18:26:19 UTC (rev 4997)
+++ trunk/daimonin/src/daieditor/CMainControl.java	2008-08-22 18:29:26 UTC (rev 4998)
@@ -190,8 +190,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, });
-        ACTION_FACTORY.createActions(true, this, "controlServer", "controlClient", "cleanCompletelyBlockedSquares", "collectSpells");
-        ACTION_FACTORY.createToggles(true, this, "drawDouble");
         mainView.init(gameObjectAttributesControl, selectedSquareView, archetypeTypeSet, mapTileListBottom, gameObjectMatchers, archetypeChooserControl, pickmapChooserControl, objectChooser, leftPanel);
         mapActions.updateMenuState();
         final ArchetypeParser archetypeParser = new ArchetypeParser(archetypeChooserControl, animationObjects, archetypeSet);
@@ -264,6 +262,12 @@
     }
 
     /** {@inheritDoc} */
+    protected void createActions() {
+        ACTION_FACTORY.createActions(true, this, "controlServer", "controlClient", "cleanCompletelyBlockedSquares", "collectSpells");
+        ACTION_FACTORY.createToggles(true, this, "drawDouble");
+    }
+
+    /** {@inheritDoc} */
     @NotNull
     @Override
     protected NewMapDialogFactory<GameObject, MapArchObject, Archetype, CMapViewBasic> newNewMapDialogFactory(@NotNull final MapManager<GameObject, MapArchObject, Archetype, CMapViewBasic> mapManager, @NotNull final GridartaObjectsFactory<GameObject, MapArchObject, Archetype, CMapViewBasic> gridartaObjectsFactory) {

Modified: trunk/src/app/net/sf/gridarta/AbstractMainControl.java
===================================================================
--- trunk/src/app/net/sf/gridarta/AbstractMainControl.java	2008-08-22 18:26:19 UTC (rev 4997)
+++ trunk/src/app/net/sf/gridarta/AbstractMainControl.java	2008-08-22 18:29:26 UTC (rev 4998)
@@ -485,8 +485,11 @@
         toolPalette = new ToolPalette<G, A, R, V>(editTypes, selectedSquareView, objectChooser, pickmapChooserControl);
         leftPanel = new LeftPanel(objectChooser, toolPalette, objectChoiceDisplay);
         ACTION_FACTORY.createActions(true, this, "createNew", "open", "options", "exit", "newScript", "editScript", "zoom", "gc", "onlineHelp", "tod");
+        createActions();
     }
 
+    protected abstract void createActions();
+
     @NotNull
     protected abstract GameObjectAttributesControl<G, A, R, V> newGameObjectAttributesControl(final GameObjectAttributesModel<G, A, R> gameObjectAttributesModel, final GameObjectAttributesDialogFactory<G, A, R, V> gameObjectAttributesDialogFactory, final DefaultObjectChooser<G, A, R> objectChooser, final ArchetypeTypeSet<G, A, R> archetypeTypeSet, final MapManager<G, A, R, V> mapManager, final MapViewManager<G, A, R, V> mapViewManager, final AnimationObjects<? extends AnimationObject> animationObjects, final LockedItemsControl<G, A, R, V> lockedItemsControl, final GameObjectMatcher monsterMatcher, final SelectedSquareControl<G, A, R, V> selectedSquareControl, final SelectedSquareView<G, A, R, V> selectedSquareView, final MainView<G, A, R, V> mainView);
 

Modified: trunk/src/test/net/sf/gridarta/map/DefaultMapModelTest.java
===================================================================
--- trunk/src/test/net/sf/gridarta/map/DefaultMapModelTest.java	2008-08-22 18:26:19 UTC (rev 4997)
+++ trunk/src/test/net/sf/gridarta/map/DefaultMapModelTest.java	2008-08-22 18:29:26 UTC (rev 4998)
@@ -512,6 +512,10 @@
         }
 
         /** {@inheritDoc} */
+        protected void createActions() {
+        }
+
+        /** {@inheritDoc} */
         @NotNull
         @Override
         protected GameObjectAttributesControl<TestGameObject, TestMapArchObject, TestArchetype, TestMapViewBasic> newGameObjectAttributesControl(final GameObjectAttributesModel<TestGameObject, TestMapArchObject, TestArchetype> gameObjectAttributesModel, final GameObjectAttributesDialogFactory<TestGameObject, TestMapArchObject, TestArchetype, TestMapViewBasic> gameObjectAttributesDialogFactory, final DefaultObjectChooser<TestGameObject, TestMapArchObject, TestArchetype> objectChooser, final ArchetypeTypeSet<TestGameObject, TestMapArchObject, TestArchetype> archetypeTypeSet, final MapManager<TestGameObject, TestMapArchObject, TestArchetype, TestMapViewBasic> mapManager, final MapViewManager<TestGameObject, TestMapArchObject, TestArchetype, TestMapViewBasic> mapViewManager, final AnimationObjects<? extends AnimationObject> animationObjects, final LockedItemsControl<TestGameObject, TestMapArchObject, TestArchetype, TestMapViewBasic> lockedItemsControl, final GameObjectMatcher monsterMatcher, final SelectedSquareControl<TestGameObject, TestMapArchObject, TestArchetype, TestMapViewBasic> selectedSquareControl, final SelectedSquareView<TestGameObject, TestMapArchObject, TestArchetype, TestMapViewBasic> selectedSquareView, final MainView<TestGameObject, TestMapArchObject, TestArchetype, TestMapViewBasic> mainView) {


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