Thread: [Gridarta-commit] SF.net SVN: gridarta: [4331] trunk (Page 64)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 4331
          http://gridarta.svn.sourceforge.net/gridarta/?rev=4331&view=rev
Author:   akirschbaum
Date:     2008-07-14 13:23:37 -0700 (Mon, 14 Jul 2008)

Log Message:
-----------
Remove MainControl.getSelectedSquareControl().

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

Modified: trunk/crossfire/src/cfeditor/CMainControl.java
===================================================================

--- trunk/crossfire/src/cfeditor/CMainControl.java	2008-07-14 20:21:29 UTC (rev 4330)
+++ trunk/crossfire/src/cfeditor/CMainControl.java	2008-07-14 20:23:37 UTC (rev 4331)
@@ -181,9 +181,6 @@
     /** The Spells. */
     private final Spells<GameObjectSpell<GameObject, MapArchObject, Archetype>> gameObjectSpells = new Spells<GameObjectSpell<GameObject, MapArchObject, Archetype>>();
 
-    /** List of objects on map (right side). */
-    private final SelectedSquareControl<GameObject, MapArchObject, Archetype, CMapViewBasic> selectedSquareControl;
-
     /** The ArchetypeSet, which is a registry of all Archetypes. */
     private final ArchetypeSet archetypeSet;
 
@@ -234,7 +231,7 @@
         archetypeSet = new ArchetypeSet(this, animationObjects, faceObjects);
         scriptControl = new ScriptController(this);
         final boolean mapTileListBottom = prefs.getBoolean(MainView.MAP_TILE_LIST_BOTTOM_KEY, MainView.MAP_TILE_LIST_BOTTOM_DEFAULT);
-        selectedSquareControl = new SelectedSquareControl<GameObject, MapArchObject, Archetype, CMapViewBasic>(ACTION_FACTORY, this, mapTileListBottom, null);
+        final SelectedSquareControl<GameObject, MapArchObject, Archetype, CMapViewBasic> selectedSquareControl = new SelectedSquareControl<GameObject, MapArchObject, Archetype, CMapViewBasic>(ACTION_FACTORY, this, mapTileListBottom, null);
         mapCursorControl = new MapCursorControl<GameObject, MapArchObject, Archetype, CMapViewBasic>("cfeditor", this, getMapManager(), selectedSquareControl, selectedSquareControl.getSelectedSquareView());
         ACTION_FACTORY.createActions(true, this, "createNew", "open", "options", "exit", "newScript", "editScript", "zoom", "gc", "onlineHelp", "tod", "about");
         mapManagerActions = new MapManagerActions<GameObject, MapArchObject, Archetype, CMapViewBasic>(getMapManager());
@@ -866,12 +863,6 @@
 
     /** {@inheritDoc} */
     @NotNull
-    public SelectedSquareControl<GameObject, MapArchObject, Archetype, CMapViewBasic> getSelectedSquareControl() {
-        return selectedSquareControl;
-    }
-
-    /** {@inheritDoc} */
-    @NotNull
     public MainActions<GameObject, MapArchObject, Archetype, CMapViewBasic> getMainActions() {
         return mainActions;
     }

Modified: trunk/daimonin/src/daieditor/CMainControl.java
===================================================================
--- trunk/daimonin/src/daieditor/CMainControl.java	2008-07-14 20:21:29 UTC (rev 4330)
+++ trunk/daimonin/src/daieditor/CMainControl.java	2008-07-14 20:23:37 UTC (rev 4331)
@@ -220,9 +220,6 @@
     /** The Spells. */
     private final Spells<GameObjectSpell<GameObject, MapArchObject, Archetype>> gameObjectSpells = new Spells<GameObjectSpell<GameObject, MapArchObject, Archetype>>();
 
-    /** List of objects on map (right side). */
-    private final SelectedSquareControl<GameObject, MapArchObject, Archetype, CMapViewBasic> selectedSquareControl;
-
     /** The ArchetypeSet, which is a registry of all Archetypes. */
     private final ArchetypeSet archetypeSet;
 
@@ -285,7 +282,7 @@
         animationObjects = new daieditor.gameobject.anim.AnimationObjects();
         archetypeSet = new ArchetypeSet(this, animationObjects, faceObjects);
         final boolean mapTileListBottom = prefs.getBoolean(MainView.MAP_TILE_LIST_BOTTOM_KEY, MainView.MAP_TILE_LIST_BOTTOM_DEFAULT);
-        selectedSquareControl = new SelectedSquareControl<GameObject, MapArchObject, Archetype, CMapViewBasic>(ACTION_FACTORY, this, mapTileListBottom, GUIUtils.getSysIcon(IGUIConstants.TILE_NORTH));
+        final SelectedSquareControl<GameObject, MapArchObject, Archetype, CMapViewBasic> selectedSquareControl = new SelectedSquareControl<GameObject, MapArchObject, Archetype, CMapViewBasic>(ACTION_FACTORY, this, mapTileListBottom, GUIUtils.getSysIcon(IGUIConstants.TILE_NORTH));
         mapCursorControl = new MapCursorControl<GameObject, MapArchObject, Archetype, CMapViewBasic>("daieditor", this, getMapManager(), selectedSquareControl, selectedSquareControl.getSelectedSquareView());
         ACTION_FACTORY.createActions(true, this, "createNew", "open", "options", "exit", "newScript", "editScript", "controlServer", "controlClient", "cleanCompletelyBlockedSquares", "zoom", "gc", "onlineHelp", "tod", "about");
         ACTION_FACTORY.createToggles(true, this, "drawDouble");
@@ -1033,12 +1030,6 @@
 
     /** {@inheritDoc} */
     @NotNull
-    public SelectedSquareControl<GameObject, MapArchObject, Archetype, CMapViewBasic> getSelectedSquareControl() {
-        return selectedSquareControl;
-    }
-
-    /** {@inheritDoc} */
-    @NotNull
     public MainActions<GameObject, MapArchObject, Archetype, CMapViewBasic> getMainActions() {
         return mainActions;
     }

Modified: trunk/src/app/net/sf/gridarta/MainControl.java
===================================================================
--- trunk/src/app/net/sf/gridarta/MainControl.java	2008-07-14 20:21:29 UTC (rev 4330)
+++ trunk/src/app/net/sf/gridarta/MainControl.java	2008-07-14 20:23:37 UTC (rev 4331)
@@ -286,13 +286,6 @@
     ObjectChooser<G, A, R, V> getObjectChooser();
 
     /**
-     * Return the Selected Square Control.
-     * @return The Selected Square Control.
-     */
-    @NotNull
-    SelectedSquareControl<G, A, R, V> getSelectedSquareControl();
-
-    /**
      * Returns the main actions.
      * @return the main actions
      */


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




Thread: [Gridarta-commit] SF.net SVN: gridarta: [4331] trunk (Page 64)

gridarta-commit