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

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

Revision: 4928
          http://gridarta.svn.sourceforge.net/gridarta/?rev=4928&view=rev
Author:   akirschbaum
Date:     2008-08-20 20:22:52 +0000 (Wed, 20 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-20 20:21:35 UTC (rev 4927)
+++ trunk/crossfire/src/cfeditor/CMainControl.java	2008-08-20 20:22:52 UTC (rev 4928)
@@ -192,7 +192,6 @@
      */
     public CMainControl() {
         super(new CrossfireObjectsFactory(), new DefaultRendererFactory(), "cfeditor", new GlobalSettingsImpl(), new AnimationObjects(), new FaceObjects(), new DefaultMapControlFactory(), false);
-        SystemIcons.init();
         createMapImageCache(CResourceLoader.getHomeFile("thumbnails"), SystemIcons.getDefaultIcon(), SystemIcons.getDefaultPreview(), new StatusBar<GameObject, MapArchObject, Archetype, CMapViewBasic>(mapManager, mapViewManager, archetypeSet, faceObjects));
         mainView = new MainView<GameObject, MapArchObject, Archetype, CMapViewBasic>(this, editTypes, mapManager, mapViewManager, ACTION_FACTORY, mapManagerActions.getCloseAllAction(), statusBar);
         final ReplaceDialogManager<GameObject, MapArchObject, Archetype, CMapViewBasic> replaceDialogManager = new ReplaceDialogManager<GameObject, MapArchObject, Archetype, CMapViewBasic>(mainView, archetypeSet, copyBuffer);

Modified: trunk/daimonin/src/daieditor/CMainControl.java
===================================================================
--- trunk/daimonin/src/daieditor/CMainControl.java	2008-08-20 20:21:35 UTC (rev 4927)
+++ trunk/daimonin/src/daieditor/CMainControl.java	2008-08-20 20:22:52 UTC (rev 4928)
@@ -252,7 +252,6 @@
      */
     public CMainControl() {
         super(new DaimoninObjectsFactory(), new DefaultRendererFactory(), "daieditor", new GlobalSettingsImpl(), new AnimationObjects(), new FaceObjects(), new DefaultMapControlFactory(), true);
-        SystemIcons.init();
         createMapImageCache(null, SystemIcons.getDefaultIcon(), SystemIcons.getDefaultPreview(), new StatusBar<GameObject, MapArchObject, Archetype, CMapViewBasic>(mapManager, mapViewManager, archetypeSet, faceObjects));
         mainView = new MainView<GameObject, MapArchObject, Archetype, CMapViewBasic>(this, editTypes, mapManager, mapViewManager, ACTION_FACTORY, mapManagerActions.getCloseAllAction(), statusBar);
         final ReplaceDialogManager<GameObject, MapArchObject, Archetype, CMapViewBasic> replaceDialogManager = new ReplaceDialogManager<GameObject, MapArchObject, Archetype, CMapViewBasic>(mainView, archetypeSet, copyBuffer);

Modified: trunk/src/app/net/sf/gridarta/AbstractMainControl.java
===================================================================
--- trunk/src/app/net/sf/gridarta/AbstractMainControl.java	2008-08-20 20:21:35 UTC (rev 4927)
+++ trunk/src/app/net/sf/gridarta/AbstractMainControl.java	2008-08-20 20:22:52 UTC (rev 4928)
@@ -43,6 +43,7 @@
 import net.sf.gridarta.gui.MapPreview;
 import net.sf.gridarta.gui.MapViewManager;
 import net.sf.gridarta.gui.StatusBar;
+import net.sf.gridarta.gui.SystemIcons;
 import net.sf.gridarta.gui.archetypechooser.ArchetypeChooserControl;
 import net.sf.gridarta.gui.archetypechooser.ArchetypeChooserModel;
 import net.sf.gridarta.gui.gameobjectattributesdialog.GameObjectAttributesDialogFactory;
@@ -216,6 +217,7 @@
         gameObjectAttributesDialogFactory = new GameObjectAttributesDialogFactory<G, A, R, V>(archetypeTypeSet, archetypeSet, mapManager);
         archetypeChooserControl.init(createDirectionPane, gameObjectAttributesDialogFactory);
         mapViewManager = new MapViewManager<G, A, R, V>();
+        SystemIcons.init();
     }
 
     /**


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