Menu
▾
▴
[Gridarta-commit] SF.net SVN: gridarta:[4846] trunk
|
From: <aki...@us...> - 2008-08-15 18:39:23
|
Revision: 4846
http://gridarta.svn.sourceforge.net/gridarta/?rev=4846&view=rev
Author: akirschbaum
Date: 2008-08-15 18:39:30 +0000 (Fri, 15 Aug 2008)
Log Message:
-----------
Remove unused code.
Modified Paths:
--------------
trunk/crossfire/src/cfeditor/CMainControl.java
trunk/daimonin/src/daieditor/CMainControl.java
trunk/src/app/net/sf/gridarta/gui/map/MapCursorActions.java
trunk/src/app/net/sf/gridarta/gui/map/MapCursorControl.java
Modified: trunk/crossfire/src/cfeditor/CMainControl.java
===================================================================
--- trunk/crossfire/src/cfeditor/CMainControl.java 2008-08-15 18:37:00 UTC (rev 4845)
+++ trunk/crossfire/src/cfeditor/CMainControl.java 2008-08-15 18:39:30 UTC (rev 4846)
@@ -243,7 +243,7 @@
objectChooser = new DefaultObjectChooser<GameObject, MapArchObject, Archetype, CMapViewBasic>(archetypeChooserControl, pickmapChooserControl);
final SelectedSquareControl<GameObject, MapArchObject, Archetype, CMapViewBasic> selectedSquareControl = new SelectedSquareControl<GameObject, MapArchObject, Archetype, CMapViewBasic>(ACTION_FACTORY, gameObjectAttributesDialogFactory, objectChooser, mapManager, mapViewManager, editTypes, mapTileListBottom, null, archetypeSet);
final SelectedSquareView<GameObject, MapArchObject, Archetype, CMapViewBasic> selectedSquareView = selectedSquareControl.getSelectedSquareView();
- new MapCursorControl<GameObject, MapArchObject, Archetype, CMapViewBasic>("cfeditor", this, gameObjectAttributesDialogFactory, mapManager, mapViewManager, selectedSquareControl, selectedSquareView);
+ new MapCursorControl<GameObject, MapArchObject, Archetype, CMapViewBasic>("cfeditor", gameObjectAttributesDialogFactory, mapManager, mapViewManager, selectedSquareControl, selectedSquareView);
replaceDialogManager.setObjectChooser(objectChooser);
validators = createMapValidators();
mainActions = new MainActions<GameObject, MapArchObject, Archetype, CMapViewBasic>(replaceDialogManager, this, validators, editTypes, archetypeSet, copyBuffer, animationObjects, ACTION_FACTORY, faceObjects, objectChooser, mapManager, mapViewManager);
Modified: trunk/daimonin/src/daieditor/CMainControl.java
===================================================================
--- trunk/daimonin/src/daieditor/CMainControl.java 2008-08-15 18:37:00 UTC (rev 4845)
+++ trunk/daimonin/src/daieditor/CMainControl.java 2008-08-15 18:39:30 UTC (rev 4846)
@@ -301,7 +301,7 @@
objectChooser = new DefaultObjectChooser<GameObject, MapArchObject, Archetype, CMapViewBasic>(archetypeChooserControl, pickmapChooserControl);
final SelectedSquareControl<GameObject, MapArchObject, Archetype, CMapViewBasic> selectedSquareControl = new SelectedSquareControl<GameObject, MapArchObject, Archetype, CMapViewBasic>(ACTION_FACTORY, gameObjectAttributesDialogFactory, objectChooser, mapManager, mapViewManager, editTypes, mapTileListBottom, GUIUtils.getSysIcon(IGUIConstants.TILE_NORTH), archetypeSet);
final SelectedSquareView<GameObject, MapArchObject, Archetype, CMapViewBasic> selectedSquareView = selectedSquareControl.getSelectedSquareView();
- new MapCursorControl<GameObject, MapArchObject, Archetype, CMapViewBasic>("daieditor", this, gameObjectAttributesDialogFactory, mapManager, mapViewManager, selectedSquareControl, selectedSquareView);
+ new MapCursorControl<GameObject, MapArchObject, Archetype, CMapViewBasic>("daieditor", gameObjectAttributesDialogFactory, mapManager, mapViewManager, selectedSquareControl, selectedSquareView);
replaceDialogManager.setObjectChooser(objectChooser);
validators = createMapValidators();
mainActions = new MainActions<GameObject, MapArchObject, Archetype, CMapViewBasic>(replaceDialogManager, this, validators, editTypes, archetypeSet, copyBuffer, animationObjects, ACTION_FACTORY, faceObjects, objectChooser, mapManager, mapViewManager);
Modified: trunk/src/app/net/sf/gridarta/gui/map/MapCursorActions.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/map/MapCursorActions.java 2008-08-15 18:37:00 UTC (rev 4845)
+++ trunk/src/app/net/sf/gridarta/gui/map/MapCursorActions.java 2008-08-15 18:39:30 UTC (rev 4846)
@@ -21,7 +21,6 @@
import javax.swing.Action;
import net.sf.gridarta.CommonConstants;
-import net.sf.gridarta.MainControl;
import net.sf.gridarta.MapManager;
import net.sf.gridarta.MapManagerListener;
import net.sf.gridarta.gameobject.Archetype;
@@ -150,11 +149,10 @@
* Create a new instance.
* @param key the action factory key
* @param mapCursorControl the map control for this instance
- * @param mainControl the main control to query for current map changes
* @param mapManager the map manager
* @param mapViewManager the map view manager
*/
- public MapCursorActions(@NotNull final String key, @NotNull final MapCursorControl<G, A, R, V> mapCursorControl, @NotNull final MainControl<G, A, R, V> mainControl, @NotNull final MapManager<G, A, R, V> mapManager, @NotNull final MapViewManager<G, A, R, V> mapViewManager) {
+ public MapCursorActions(@NotNull final String key, @NotNull final MapCursorControl<G, A, R, V> mapCursorControl, @NotNull final MapManager<G, A, R, V> mapManager, @NotNull final MapViewManager<G, A, R, V> mapViewManager) {
actionFactory = ActionFactory.getFactory(key);
this.mapCursorControl = mapCursorControl;
actionFactory.createActions(true, this, directionsGo);
Modified: trunk/src/app/net/sf/gridarta/gui/map/MapCursorControl.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/map/MapCursorControl.java 2008-08-15 18:37:00 UTC (rev 4845)
+++ trunk/src/app/net/sf/gridarta/gui/map/MapCursorControl.java 2008-08-15 18:39:30 UTC (rev 4846)
@@ -20,7 +20,6 @@
package net.sf.gridarta.gui.map;
import java.awt.Point;
-import net.sf.gridarta.MainControl;
import net.sf.gridarta.MapManager;
import net.sf.gridarta.gameobject.Archetype;
import net.sf.gridarta.gameobject.GameObject;
@@ -63,7 +62,6 @@
/**
* Create a MapCursorControl.
* @param key The action factory key.
- * @param mainControl the main control
* @param gameObjectAttributesDialogFactory the factory for creating game
* object attributes dialog instances
* @param mapManager the map manager
@@ -71,12 +69,12 @@
* @param selectedSquareControl the selected square control
* @param selectedSquareView the selected square view
*/
- public MapCursorControl(final String key, @NotNull final MainControl<G, A, R, V> mainControl, @NotNull final GameObjectAttributesDialogFactory<G, A, R, V> gameObjectAttributesDialogFactory, @NotNull final MapManager<G, A, R, V> mapManager, @NotNull final MapViewManager<G, A, R, V> mapViewManager, @NotNull final SelectedSquareControl<G, A, R, V> selectedSquareControl, @NotNull final SelectedSquareView<G, A, R, V> selectedSquareView) {
+ public MapCursorControl(final String key, @NotNull final GameObjectAttributesDialogFactory<G, A, R, V> gameObjectAttributesDialogFactory, @NotNull final MapManager<G, A, R, V> mapManager, @NotNull final MapViewManager<G, A, R, V> mapViewManager, @NotNull final SelectedSquareControl<G, A, R, V> selectedSquareControl, @NotNull final SelectedSquareView<G, A, R, V> selectedSquareView) {
this.gameObjectAttributesDialogFactory = gameObjectAttributesDialogFactory;
this.selectedSquareControl = selectedSquareControl;
this.selectedSquareView = selectedSquareView;
goLocationDialogManager = new GoLocationDialogManager<G, A, R, V>(mapViewManager);
- actions = new MapCursorActions<G, A, R, V>(key, this, mainControl, mapManager, mapViewManager);
+ actions = new MapCursorActions<G, A, R, V>(key, this, mapManager, mapViewManager);
}
/**
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
