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

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

Revision: 4557
          http://gridarta.svn.sourceforge.net/gridarta/?rev=4557&view=rev
Author:   akirschbaum
Date:     2008-07-28 21:43:24 +0000 (Mon, 28 Jul 2008)

Log Message:
-----------
Remove dependency MainView -> FaceObjects.

Modified Paths:
--------------
    trunk/crossfire/src/cfeditor/CMainControl.java
    trunk/daimonin/src/daieditor/CMainControl.java
    trunk/src/app/net/sf/gridarta/AbstractMainControl.java
    trunk/src/app/net/sf/gridarta/gui/MainView.java

Modified: trunk/crossfire/src/cfeditor/CMainControl.java
===================================================================
--- trunk/crossfire/src/cfeditor/CMainControl.java	2008-07-28 21:32:17 UTC (rev 4556)
+++ trunk/crossfire/src/cfeditor/CMainControl.java	2008-07-28 21:43:24 UTC (rev 4557)
@@ -69,6 +69,7 @@
 import net.sf.gridarta.gui.MapPreview;
 import net.sf.gridarta.gui.ObjectChooser;
 import net.sf.gridarta.gui.RecentManager;
+import net.sf.gridarta.gui.StatusBar;
 import net.sf.gridarta.gui.SystemIcons;
 import net.sf.gridarta.gui.archetypechooser.ArchetypeChooserControl;
 import net.sf.gridarta.gui.connectionview.LockedItemsControl;
@@ -234,8 +235,9 @@
         objectChooser = new DefaultObjectChooser<GameObject, MapArchObject, Archetype, CMapViewBasic>(this, getEditTypes(), selectedSquareView, archetypeChooserControl, pickmapChooserControl, getCopyBuffer());
         mainActions = new MainActions<GameObject, MapArchObject, Archetype, CMapViewBasic>(this, getEditTypes(), archetypeSet, getCopyBuffer(), pickmapChooserControl, animationObjects, ACTION_FACTORY, faceObjects, objectChooser, getMapManager());
         SystemIcons.init();
-        createMapImageCache(CResourceLoader.getHomeFile("thumbnails"), SystemIcons.getDefaultIcon(), SystemIcons.getDefaultPreview());
-        mainView = new MainView<GameObject, MapArchObject, Archetype, CMapViewBasic>(this, getEditTypes(), objectChooser, getMapManager(), ACTION_FACTORY, mapManagerActions.getCloseAllAction(), faceObjects);
+        final StatusBar<GameObject, MapArchObject, Archetype, CMapViewBasic> statusBar = new StatusBar<GameObject, MapArchObject, Archetype, CMapViewBasic>(this, faceObjects);
+        createMapImageCache(CResourceLoader.getHomeFile("thumbnails"), SystemIcons.getDefaultIcon(), SystemIcons.getDefaultPreview(), statusBar);
+        mainView = new MainView<GameObject, MapArchObject, Archetype, CMapViewBasic>(this, getEditTypes(), objectChooser, getMapManager(), ACTION_FACTORY, mapManagerActions.getCloseAllAction(), statusBar);
         new About("cfeditor", mainView);
         new UndoControl<GameObject, MapArchObject, Archetype, CMapViewBasic>(getMapManager());
         updaterManager = new UpdaterManager("cfeditor", this, mainView, "CrossfireEditor.jar");

Modified: trunk/daimonin/src/daieditor/CMainControl.java
===================================================================
--- trunk/daimonin/src/daieditor/CMainControl.java	2008-07-28 21:32:17 UTC (rev 4556)
+++ trunk/daimonin/src/daieditor/CMainControl.java	2008-07-28 21:43:24 UTC (rev 4557)
@@ -78,6 +78,7 @@
 import net.sf.gridarta.gui.MapPreview;
 import net.sf.gridarta.gui.ObjectChooser;
 import net.sf.gridarta.gui.RecentManager;
+import net.sf.gridarta.gui.StatusBar;
 import net.sf.gridarta.gui.SystemIcons;
 import net.sf.gridarta.gui.archetypechooser.ArchetypeChooserControl;
 import net.sf.gridarta.gui.connectionview.LockedItemsControl;
@@ -291,8 +292,9 @@
         objectChooser = new DefaultObjectChooser<GameObject, MapArchObject, Archetype, CMapViewBasic>(this, getEditTypes(), selectedSquareView, archetypeChooserControl, pickmapChooserControl, getCopyBuffer());
         mainActions = new MainActions<GameObject, MapArchObject, Archetype, CMapViewBasic>(this, getEditTypes(), archetypeSet, getCopyBuffer(), pickmapChooserControl, animationObjects, ACTION_FACTORY, faceObjects, objectChooser, getMapManager());
         SystemIcons.init();
-        createMapImageCache(null, SystemIcons.getDefaultIcon(), SystemIcons.getDefaultPreview());
-        mainView = new MainView<GameObject, MapArchObject, Archetype, CMapViewBasic>(this, getEditTypes(), objectChooser, getMapManager(), ACTION_FACTORY, mapManagerActions.getCloseAllAction(), faceObjects);
+        final StatusBar<GameObject, MapArchObject, Archetype, CMapViewBasic> statusBar = new StatusBar<GameObject, MapArchObject, Archetype, CMapViewBasic>(this, faceObjects);
+        createMapImageCache(null, SystemIcons.getDefaultIcon(), SystemIcons.getDefaultPreview(), statusBar);
+        mainView = new MainView<GameObject, MapArchObject, Archetype, CMapViewBasic>(this, getEditTypes(), objectChooser, getMapManager(), ACTION_FACTORY, mapManagerActions.getCloseAllAction(), statusBar);
         new About("daieditor", mainView);
         new UndoControl<GameObject, MapArchObject, Archetype, CMapViewBasic>(getMapManager());
         updaterManager = new UpdaterManager("daieditor", this, mainView, "DaimoninEditor.jar");

Modified: trunk/src/app/net/sf/gridarta/AbstractMainControl.java
===================================================================
--- trunk/src/app/net/sf/gridarta/AbstractMainControl.java	2008-07-28 21:32:17 UTC (rev 4556)
+++ trunk/src/app/net/sf/gridarta/AbstractMainControl.java	2008-07-28 21:43:24 UTC (rev 4557)
@@ -30,6 +30,7 @@
 import net.sf.gridarta.gameobject.Archetype;
 import net.sf.gridarta.gameobject.GameObject;
 import net.sf.gridarta.gui.HideFileFilterProxy;
+import net.sf.gridarta.gui.StatusBar;
 import net.sf.gridarta.gui.map.MapPreviewAccessory;
 import net.sf.gridarta.gui.map.MapView;
 import net.sf.gridarta.gui.map.MapViewBasic;
@@ -145,9 +146,10 @@
      * for a map.
      * @param defaultPreview The default preview image to return if no preview
      * can be created for a map.
+     * @param statusBar the status bar instance
      */
-    protected void createMapImageCache(@Nullable final File baseDir, @NotNull final ImageIcon defaultIcon, @NotNull final ImageIcon defaultPreview) {
-        mapImageCache = new MapImageCache<G, A, R, V>(getMainView().getStatusBar(), mapManager, baseDir, defaultIcon, defaultPreview);
+    protected void createMapImageCache(@Nullable final File baseDir, @NotNull final ImageIcon defaultIcon, @NotNull final ImageIcon defaultPreview, @NotNull final StatusBar<G, A, R, V> statusBar) {
+        mapImageCache = new MapImageCache<G, A, R, V>(statusBar, mapManager, baseDir, defaultIcon, defaultPreview);
         mapPreviewAccessory = new MapPreviewAccessory(mapImageCache);
 
     }

Modified: trunk/src/app/net/sf/gridarta/gui/MainView.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/MainView.java	2008-07-28 21:32:17 UTC (rev 4556)
+++ trunk/src/app/net/sf/gridarta/gui/MainView.java	2008-07-28 21:43:24 UTC (rev 4557)
@@ -49,7 +49,6 @@
 import net.sf.gridarta.archtype.ArchetypeTypeSet;
 import net.sf.gridarta.gameobject.Archetype;
 import net.sf.gridarta.gameobject.GameObject;
-import net.sf.gridarta.gameobject.face.FaceObjects;
 import net.sf.gridarta.gameobject.match.GameObjectMatchers;
 import net.sf.gridarta.gui.archetypechooser.ArchetypeChooserControl;
 import net.sf.gridarta.gui.map.MapFileActions;
@@ -239,13 +238,13 @@
      * @param mapManager the map manager
      * @param actionFactory the action factory to use
      * @param aCloseAll the action "close all map windows"
-     * @param faceObjects the FaceObjects instance to use
+     * @param statusBar the status bar instance
      */
-    public MainView(@NotNull final MainControl<G, A, R, V> mainControl, @NotNull final EditTypes<G, A, R, V> editTypes, @NotNull final DefaultObjectChooser<G, A, R, V> objectChooser, @NotNull final MapManager<G, A, R, V> mapManager, @NotNull final ActionFactory actionFactory, @NotNull final Action aCloseAll, @NotNull final FaceObjects faceObjects) {
+    public MainView(@NotNull final MainControl<G, A, R, V> mainControl, @NotNull final EditTypes<G, A, R, V> editTypes, @NotNull final DefaultObjectChooser<G, A, R, V> objectChooser, @NotNull final MapManager<G, A, R, V> mapManager, @NotNull final ActionFactory actionFactory, @NotNull final Action aCloseAll, @NotNull final StatusBar<G, A, R, V> statusBar) {
         super(actionFactory.format("mainWindow.title", AbstractMainControl.getBuildNumberAsString()));
         this.mapManager = mapManager;
         mapFileAction = new MapFileActions<G, A, R, V>(mainControl, mapManager, null);
-        statusBar = new StatusBar<G, A, R, V>(mainControl, faceObjects);
+        this.statusBar = statusBar;
         add(statusBar, BorderLayout.SOUTH);
         setDefaultCloseOperation(DO_NOTHING_ON_CLOSE);
         addWindowListener(new WindowAdapter() {


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