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

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

Revision: 4520
          http://gridarta.svn.sourceforge.net/gridarta/?rev=4520&view=rev
Author:   akirschbaum
Date:     2008-07-27 22:53:48 +0000 (Sun, 27 Jul 2008)

Log Message:
-----------
Remove calls to MainControl.getEditTypes().

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

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

--- trunk/crossfire/src/cfeditor/CMainControl.java	2008-07-27 22:35:50 UTC (rev 4519)
+++ trunk/crossfire/src/cfeditor/CMainControl.java	2008-07-27 22:53:48 UTC (rev 4520)
@@ -235,7 +235,7 @@
         pickmapChooserControl = new PickmapChooserControl<GameObject, MapArchObject, Archetype, CMapViewBasic>(newMapDialogFactory, this, new File(globalSettings.getMapDir(), IGUIConstants.PICKMAP_DIR), getMapManager());
         newMapDialogFactory.setPickmapChooserControl(pickmapChooserControl);
         objectChooser = new DefaultObjectChooser<GameObject, MapArchObject, Archetype, CMapViewBasic>(this, selectedSquareView, archetypeChooserControl, pickmapChooserControl, getCopyBuffer());
-        mainActions = new MainActions<GameObject, MapArchObject, Archetype, CMapViewBasic>(this, archetypeSet, getCopyBuffer(), pickmapChooserControl, animationObjects, ACTION_FACTORY, faceObjects, objectChooser, getMapManager());
+        mainActions = new MainActions<GameObject, MapArchObject, Archetype, CMapViewBasic>(this, getEditTypes(), archetypeSet, getCopyBuffer(), pickmapChooserControl, animationObjects, ACTION_FACTORY, faceObjects, objectChooser, getMapManager());
         getGridartaObjectsFactory().init(faceObjects, objectChooser, archetypeChooserControl, selectedSquareView, this, getEditTypes());
         mainView = new MainView<GameObject, MapArchObject, Archetype, CMapViewBasic>(this, objectChooser, getMapManager(), ACTION_FACTORY, mapManagerActions.getCloseAllAction(), faceObjects);
         new About("cfeditor", mainView);

Modified: trunk/daimonin/src/daieditor/CMainControl.java
===================================================================
--- trunk/daimonin/src/daieditor/CMainControl.java	2008-07-27 22:35:50 UTC (rev 4519)
+++ trunk/daimonin/src/daieditor/CMainControl.java	2008-07-27 22:53:48 UTC (rev 4520)
@@ -293,7 +293,7 @@
         pickmapChooserControl = new PickmapChooserControl<GameObject, MapArchObject, Archetype, CMapViewBasic>(newMapDialogFactory, this, new File(globalSettings.getArchDefaultFolder(), IGUIConstants.PICKMAP_DIR), getMapManager());
         newMapDialogFactory.setPickmapChooserControl(pickmapChooserControl);
         objectChooser = new DefaultObjectChooser<GameObject, MapArchObject, Archetype, CMapViewBasic>(this, selectedSquareView, archetypeChooserControl, pickmapChooserControl, getCopyBuffer());
-        mainActions = new MainActions<GameObject, MapArchObject, Archetype, CMapViewBasic>(this, archetypeSet, getCopyBuffer(), pickmapChooserControl, animationObjects, ACTION_FACTORY, faceObjects, objectChooser, getMapManager());
+        mainActions = new MainActions<GameObject, MapArchObject, Archetype, CMapViewBasic>(this, getEditTypes(), archetypeSet, getCopyBuffer(), pickmapChooserControl, animationObjects, ACTION_FACTORY, faceObjects, objectChooser, getMapManager());
         getGridartaObjectsFactory().init(faceObjects, objectChooser, archetypeChooserControl, selectedSquareView, this, getEditTypes());
         mainView = new MainView<GameObject, MapArchObject, Archetype, CMapViewBasic>(this, objectChooser, getMapManager(), ACTION_FACTORY, mapManagerActions.getCloseAllAction(), faceObjects);
         new About("daieditor", mainView);

Modified: trunk/src/app/net/sf/gridarta/gui/MainActions.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/MainActions.java	2008-07-27 22:35:50 UTC (rev 4519)
+++ trunk/src/app/net/sf/gridarta/gui/MainActions.java	2008-07-27 22:53:48 UTC (rev 4520)
@@ -26,6 +26,7 @@
 import javax.swing.Action;
 import javax.swing.JOptionPane;
 import net.sf.gridarta.CopyBuffer;
+import net.sf.gridarta.EditTypes;
 import net.sf.gridarta.MainControl;
 import net.sf.gridarta.MapManager;
 import net.sf.gridarta.MapManagerListener;
@@ -67,6 +68,10 @@
     /** The MainControl. */
     private final MainControl<G, A, R, V> mainControl;
 
+    /** The edit types instance. */
+    @NotNull
+    private final EditTypes<G, A, R, V> editTypes;
+
     /** The archetype set instance. */
     private final ArchetypeSet<G, A, R> archetypeSet;
 
@@ -290,6 +295,7 @@
     /**
      * Create a new instance.
      * @param mainControl the MainControl
+     * @param editTypes the edit types instance
      * @param archetypeSet the archetype set
      * @param copyBuffer the copy buffer instance
      * @param pickmapChooserControl the pickmap chooser control instance to use
@@ -299,8 +305,9 @@
      * @param objectChooser the animation objects instance to use
      * @param mapManager the map manager instance
      */
-    public MainActions(@NotNull final MainControl<G, A, R, V> mainControl, @NotNull final ArchetypeSet<G, A, R> archetypeSet, @NotNull final CopyBuffer<G, A, R, V> copyBuffer, @NotNull final PickmapChooserControl<G, A, R, V> pickmapChooserControl, @NotNull final AnimationObjects<?> animationObjects, @NotNull final ActionFactory actionFactory, @NotNull final FaceObjects faceObjects, @NotNull final ObjectChooser<G, A, R> objectChooser, @NotNull final MapManager<G, A, R, V> mapManager) {
+    public MainActions(@NotNull final MainControl<G, A, R, V> mainControl, @NotNull final EditTypes<G, A, R, V> editTypes, @NotNull final ArchetypeSet<G, A, R> archetypeSet, @NotNull final CopyBuffer<G, A, R, V> copyBuffer, @NotNull final PickmapChooserControl<G, A, R, V> pickmapChooserControl, @NotNull final AnimationObjects<?> animationObjects, @NotNull final ActionFactory actionFactory, @NotNull final FaceObjects faceObjects, @NotNull final ObjectChooser<G, A, R> objectChooser, @NotNull final MapManager<G, A, R, V> mapManager) {
         this.mainControl = mainControl;
+        this.editTypes = editTypes;
         this.archetypeSet = archetypeSet;
         this.copyBuffer = copyBuffer;
         this.pickmapChooserControl = pickmapChooserControl;
@@ -699,7 +706,7 @@
             return null;
         }
 
-        final ShiftProcessor<G, A, R> shiftProcessor = new ShiftProcessor<G, A, R>(mainControl, mapView, mapControl.getMapModel());
+        final ShiftProcessor<G, A, R> shiftProcessor = new ShiftProcessor<G, A, R>(editTypes, mapView, mapControl.getMapModel());
         return shiftProcessor.canShift(dir) ? shiftProcessor : null;
     }
 

Modified: trunk/src/app/net/sf/gridarta/gui/ShiftProcessor.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/ShiftProcessor.java	2008-07-27 22:35:50 UTC (rev 4519)
+++ trunk/src/app/net/sf/gridarta/gui/ShiftProcessor.java	2008-07-27 22:53:48 UTC (rev 4520)
@@ -23,7 +23,7 @@
 import java.awt.Rectangle;
 import java.util.LinkedList;
 import java.util.List;
-import net.sf.gridarta.MainControl;
+import net.sf.gridarta.EditTypes;
 import net.sf.gridarta.Size2D;
 import net.sf.gridarta.gameobject.Archetype;
 import net.sf.gridarta.gameobject.GameObject;
@@ -45,7 +45,7 @@
 
     /** The main control. */
     @NotNull
-    private final MainControl<G, A, R, ?> mainControl;
+    private final EditTypes<G, A, R, ?> editTypes;
 
     /** The map view to operate on. */
     @NotNull
@@ -71,12 +71,12 @@
 
     /**
      * Create a new instance.
-     * @param mainControl The main control.
+     * @param editTypes the edit types instance
      * @param mapView The map view to operate on.
      * @param mapModel The map model to operate on.
      */
-    public ShiftProcessor(@NotNull final MainControl<G, A, R, ?> mainControl, @NotNull final MapView<G, A, R, ?> mapView, @NotNull final MapModel<G, A, R> mapModel) {
-        this.mainControl = mainControl;
+    public ShiftProcessor(@NotNull final EditTypes<G, A, R, ?> editTypes, @NotNull final MapView<G, A, R, ?> mapView, @NotNull final MapModel<G, A, R> mapModel) {
+        this.editTypes = editTypes;
         this.mapView = mapView;
         this.mapModel = mapModel;
     }
@@ -257,7 +257,7 @@
                     // [startGameObjects] = [prevPos]
                     assert startGameObjects.isEmpty();
                     for (final G gameObject : mapModel.getMapSquare(prevPos)) {
-                        if (gameObject.isHead() && !gameObject.isInContainer() && mainControl.getEditTypes().isEditType(gameObject)) {
+                        if (gameObject.isHead() && !gameObject.isInContainer() && editTypes.isEditType(gameObject)) {
                             startGameObjects.add(gameObject);
                             gameObjectsToDelete.add(gameObject);
                         }
@@ -265,7 +265,7 @@
                 }
                 // [prevPos] = [pos]
                 for (final G gameObject : mapModel.getMapSquare(pos)) {
-                    if (gameObject.isHead() && !gameObject.isInContainer() && mainControl.getEditTypes().isEditType(gameObject)) {
+                    if (gameObject.isHead() && !gameObject.isInContainer() && editTypes.isEditType(gameObject)) {
                         mapModel.addGameObjectToMap(gameObject.createClone(prevPos.x, prevPos.y), InsertionMode.TOPMOST);
                         gameObjectsToDelete.add(gameObject);
                     }
@@ -275,7 +275,7 @@
                     isStart = true;
                     // [prevPos] = [startGameObjects]
                     for (final G gameObject : startGameObjects) {
-                        assert gameObject.isHead() && !gameObject.isInContainer() && mainControl.getEditTypes().isEditType(gameObject);
+                        assert gameObject.isHead() && !gameObject.isInContainer() && editTypes.isEditType(gameObject);
                         mapModel.addGameObjectToMap(gameObject.createClone(prevPos.x, prevPos.y), InsertionMode.TOPMOST);
                     }
                     startGameObjects.clear();
@@ -295,7 +295,7 @@
         if (!isStart) {
             // [prevPos] = [startGameObjects]
             for (final G gameObject : startGameObjects) {
-                assert gameObject.isHead() && !gameObject.isInContainer() && mainControl.getEditTypes().isEditType(gameObject);
+                assert gameObject.isHead() && !gameObject.isInContainer() && editTypes.isEditType(gameObject);
                 mapModel.addGameObjectToMap(gameObject.createClone(prevPos.x, prevPos.y), InsertionMode.TOPMOST);
             }
             startGameObjects.clear();


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:[4520] trunk (Page 3)

gridarta-commit