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

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

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

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

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 08:05:59 UTC (rev 4986)
+++ trunk/crossfire/src/cfeditor/CMainControl.java	2008-08-22 08:10:44 UTC (rev 4987)
@@ -120,8 +120,10 @@
     public static final boolean PREFS_SYSTEM_EXIT_DEFAULT = true;
 
     /** The current script controller. */
-    private final ScriptController scriptControl;
+    private ScriptController scriptControl;
 
+    private CFilterControl filterControl;
+
     /** Preferences default for auto validation. */
     private static final boolean PREFS_VALIDATOR_AUTO_DEFAULT = true;
 
@@ -138,12 +140,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, });
-        PluginParameterFactory.init(archetypeSet, gameObjectAttributesModel, objectChooser, mapManager);
-        final NamedFilterList defaultNamedFilterList = new NamedFilterList(gameObjectMatchers.getFilters());
-        final CFilterControl filterControl = new CFilterControl(null, mapManager, defaultNamedFilterList);
-        ((CrossfireObjectsFactory) gridartaObjectsFactory).setFilterControl(filterControl);
-        final ScriptParameters scriptParameters = new ScriptParameters(archetypeSet, globalSettings, mapManager, validators);
-        scriptControl = new ScriptController(filterControl, scriptParameters, mainView);
         final ObjectChoiceDisplay<GameObject, MapArchObject, Archetype, CMapViewBasic> objectChoiceDisplay = new ObjectChoiceDisplay<GameObject, MapArchObject, Archetype, CMapViewBasic>(replaceDialogManager, archetypeTypeSet, objectChooser, archetypeChooserModel, pickmapChooserControl);
         final ToolPalette<GameObject, MapArchObject, Archetype, CMapViewBasic> toolPalette = new ToolPalette<GameObject, MapArchObject, Archetype, CMapViewBasic>(editTypes, selectedSquareView, objectChooser, pickmapChooserControl);
         final LeftPanel leftPanel = new LeftPanel(objectChooser, toolPalette, objectChoiceDisplay);
@@ -237,6 +233,17 @@
     }
 
     /** {@inheritDoc} */
+    @Override
+    protected void init2() {
+        PluginParameterFactory.init(archetypeSet, gameObjectAttributesModel, objectChooser, mapManager);
+        final NamedFilterList defaultNamedFilterList = new NamedFilterList(gameObjectMatchers.getFilters());
+        filterControl = new CFilterControl(null, mapManager, defaultNamedFilterList);
+        ((CrossfireObjectsFactory) gridartaObjectsFactory).setFilterControl(filterControl);
+        final ScriptParameters scriptParameters = new ScriptParameters(archetypeSet, globalSettings, mapManager, validators);
+        scriptControl = new ScriptController(filterControl, scriptParameters, mainView);
+    }
+
+    /** {@inheritDoc} */
     @NotNull
     @Override
     protected DelegatingMapValidator<GameObject, MapArchObject, Archetype> createMapValidators() {

Modified: trunk/daimonin/src/daieditor/CMainControl.java
===================================================================
--- trunk/daimonin/src/daieditor/CMainControl.java	2008-08-22 08:05:59 UTC (rev 4986)
+++ trunk/daimonin/src/daieditor/CMainControl.java	2008-08-22 08:10:44 UTC (rev 4987)
@@ -316,6 +316,11 @@
     }
 
     /** {@inheritDoc} */
+    @Override
+    protected void init2() {
+    }
+
+    /** {@inheritDoc} */
     @NotNull
     @Override
     protected DelegatingMapValidator<GameObject, MapArchObject, Archetype> createMapValidators() {

Modified: trunk/src/app/net/sf/gridarta/AbstractMainControl.java
===================================================================
--- trunk/src/app/net/sf/gridarta/AbstractMainControl.java	2008-08-22 08:05:59 UTC (rev 4986)
+++ trunk/src/app/net/sf/gridarta/AbstractMainControl.java	2008-08-22 08:10:44 UTC (rev 4987)
@@ -463,6 +463,7 @@
         lockedItemsControl = new LockedItemsControl<G, A, R, V>(mapManager, mapViewManager, lockedItemsTypeNumbers);
         gameObjectAttributesModel = new GameObjectAttributesModel<G, A, R>();
         gameObjectAttributesControl = newGameObjectAttributesControl(gameObjectAttributesModel, gameObjectAttributesDialogFactory, objectChooser, archetypeTypeSet, mapManager, mapViewManager, animationObjects, lockedItemsControl, monsterMatcher, selectedSquareControl, selectedSquareView, mainView);
+        init2();
     }
 
     @NotNull
@@ -477,6 +478,8 @@
     @NotNull
     protected abstract MapActions init1();
 
+    protected abstract void init2();
+
     /**
      * Initializes the map validators.
      * @return A MapValidator that delegates to other map validators.

Modified: trunk/src/test/net/sf/gridarta/map/DefaultMapModelTest.java
===================================================================
--- trunk/src/test/net/sf/gridarta/map/DefaultMapModelTest.java	2008-08-22 08:05:59 UTC (rev 4986)
+++ trunk/src/test/net/sf/gridarta/map/DefaultMapModelTest.java	2008-08-22 08:10:44 UTC (rev 4987)
@@ -525,6 +525,12 @@
         }
 
         /** {@inheritDoc} */
+        @Override
+        protected void init2() {
+            throw new AssertionError();
+        }
+
+        /** {@inheritDoc} */
         @NotNull
         @Override
         protected MapActions init1() {


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