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

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

Revision: 4959
          http://gridarta.svn.sourceforge.net/gridarta/?rev=4959&view=rev
Author:   akirschbaum
Date:     2008-08-21 21:00:37 +0000 (Thu, 21 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

Modified: trunk/crossfire/src/cfeditor/CMainControl.java
===================================================================
--- trunk/crossfire/src/cfeditor/CMainControl.java	2008-08-21 20:59:27 UTC (rev 4958)
+++ trunk/crossfire/src/cfeditor/CMainControl.java	2008-08-21 21:00:37 UTC (rev 4959)
@@ -68,7 +68,6 @@
 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.gui.About;
 import net.sf.gridarta.gui.HideFileFilterProxy;
 import net.sf.gridarta.gui.LeftPanel;
 import net.sf.gridarta.gui.MainView;
@@ -174,7 +173,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);
-        new About("cfeditor", mainView);
         new UndoControl<GameObject, MapArchObject, Archetype, CMapViewBasic>(mapManager);
         updaterManager = new UpdaterManager("cfeditor", this, mapManager, mainView, "CrossfireEditor.jar");
         updaterManager.startup();

Modified: trunk/daimonin/src/daieditor/CMainControl.java
===================================================================
--- trunk/daimonin/src/daieditor/CMainControl.java	2008-08-21 20:59:27 UTC (rev 4958)
+++ trunk/daimonin/src/daieditor/CMainControl.java	2008-08-21 21:00:37 UTC (rev 4959)
@@ -75,7 +75,6 @@
 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.gui.About;
 import net.sf.gridarta.gui.HideFileFilterProxy;
 import net.sf.gridarta.gui.LeftPanel;
 import net.sf.gridarta.gui.MainView;
@@ -234,7 +233,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));
-        new About("daieditor", mainView);
         new UndoControl<GameObject, MapArchObject, Archetype, CMapViewBasic>(mapManager);
         updaterManager = new UpdaterManager("daieditor", this, mapManager, mainView, "DaimoninEditor.jar");
         updaterManager.startup();

Modified: trunk/src/app/net/sf/gridarta/AbstractMainControl.java
===================================================================
--- trunk/src/app/net/sf/gridarta/AbstractMainControl.java	2008-08-21 20:59:27 UTC (rev 4958)
+++ trunk/src/app/net/sf/gridarta/AbstractMainControl.java	2008-08-21 21:00:37 UTC (rev 4959)
@@ -37,6 +37,7 @@
 import net.sf.gridarta.gameobject.face.FaceObjects;
 import net.sf.gridarta.gameobject.scripts.ScriptedEvent;
 import net.sf.gridarta.gameobject.scripts.ScriptedEventEditor;
+import net.sf.gridarta.gui.About;
 import net.sf.gridarta.gui.HideFileFilterProxy;
 import net.sf.gridarta.gui.MainActions;
 import net.sf.gridarta.gui.MainView;
@@ -263,6 +264,7 @@
         validators = createMapValidators();
         mainActions = new MainActions<G, A, R, V>(replaceDialogManager, this, validators, editTypes, archetypeSet, copyBuffer, animationObjects, ACTION_FACTORY, faceObjects, objectChooser, mapManager, mapViewManager);
         gameObjectAttributesDialogFactory.setParent(mainView);
+        new About(key, mainView);
     }
 
     /**


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