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

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

Revision: 5001
          http://gridarta.svn.sourceforge.net/gridarta/?rev=5001&view=rev
Author:   akirschbaum
Date:     2008-08-22 18:37:07 +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:31:55 UTC (rev 5000)
+++ trunk/crossfire/src/cfeditor/CMainControl.java	2008-08-22 18:37:07 UTC (rev 5001)
@@ -135,7 +135,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, });
-        scriptControl.getView().setMenu((JMenu) ACTION_FACTORY.find(mainView.getJMenuBar(), "plugins"));
         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);
@@ -237,6 +236,12 @@
     }
 
     /** {@inheritDoc} */
+    @Override
+    protected void init3() {
+        scriptControl.getView().setMenu((JMenu) ACTION_FACTORY.find(mainView.getJMenuBar(), "plugins"));
+    }
+
+    /** {@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 18:31:55 UTC (rev 5000)
+++ trunk/daimonin/src/daieditor/CMainControl.java	2008-08-22 18:37:07 UTC (rev 5001)
@@ -309,6 +309,11 @@
     }
 
     /** {@inheritDoc} */
+    @Override
+    protected void init3() {
+    }
+
+    /** {@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 18:31:55 UTC (rev 5000)
+++ trunk/src/app/net/sf/gridarta/AbstractMainControl.java	2008-08-22 18:37:07 UTC (rev 5001)
@@ -488,6 +488,7 @@
         createActions();
         mainView.init(gameObjectAttributesControl, selectedSquareView, archetypeTypeSet, mapTileListBottom, gameObjectMatchers, archetypeChooserControl, pickmapChooserControl, objectChooser, leftPanel);
         mapActions.updateMenuState();
+        init3();
     }
 
     protected abstract void createActions();
@@ -506,6 +507,8 @@
 
     protected abstract void init2();
 
+    protected abstract void init3();
+
     /**
      * The file control instance.
      */

Modified: trunk/src/test/net/sf/gridarta/map/DefaultMapModelTest.java
===================================================================
--- trunk/src/test/net/sf/gridarta/map/DefaultMapModelTest.java	2008-08-22 18:31:55 UTC (rev 5000)
+++ trunk/src/test/net/sf/gridarta/map/DefaultMapModelTest.java	2008-08-22 18:37:07 UTC (rev 5001)
@@ -543,6 +543,12 @@
         }
 
         /** {@inheritDoc} */
+        @Override
+        protected void init3() {
+            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.