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

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

Revision: 4180
          http://gridarta.svn.sourceforge.net/gridarta/?rev=4180&view=rev
Author:   akirschbaum
Date:     2008-06-12 11:46:13 -0700 (Thu, 12 Jun 2008)

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

Modified Paths:
--------------
    trunk/crossfire/src/cfeditor/CMainControl.java
    trunk/crossfire/src/cfeditor/CrossfireObjectsFactory.java
    trunk/crossfire/src/cfeditor/gui/map/CMapViewBasic.java
    trunk/crossfire/src/cfeditor/gui/map/MapUserListener.java
    trunk/daimonin/src/daieditor/CMainControl.java
    trunk/daimonin/src/daieditor/DaimoninObjectsFactory.java
    trunk/daimonin/src/daieditor/gui/map/tools/InsertionTool.java
    trunk/daimonin/src/daieditor/gui/map/tools/ToolSelector.java
    trunk/src/app/net/sf/gridarta/GridartaObjectsFactory.java
    trunk/src/app/net/sf/gridarta/gui/AbstractObjectChooser.java
    trunk/src/app/net/sf/gridarta/gui/ObjectChooser.java

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

--- trunk/crossfire/src/cfeditor/CMainControl.java	2008-06-12 09:22:43 UTC (rev 4179)
+++ trunk/crossfire/src/cfeditor/CMainControl.java	2008-06-12 18:46:13 UTC (rev 4180)
@@ -227,7 +227,6 @@
      */
     public CMainControl() {
         super(new CrossfireObjectsFactory(), "cfeditor");
-        getGridartaObjectsFactory().setFaceObjects(faceObjects);
         instance = this;
         animationObjects = new AnimationObjects();
         archetypeSet = new ArchetypeSet(this, animationObjects, faceObjects);
@@ -238,6 +237,7 @@
         globalSettings.readGlobalSettings();
         PathManager.setGlobalSettings(globalSettings);
         objectChooser = new ObjectChooser(newMapDialogFactory, this, new File(globalSettings.getMapDir(), IGUIConstants.PICKMAP_DIR));
+        getGridartaObjectsFactory().init(faceObjects, objectChooser);
         mainView = new MainView<GameObject, MapArchObject, Archetype, CMapViewBasic>(this, objectChooser, getMapManager(), ACTION_FACTORY, mapManagerActions.getCloseAllAction(), faceObjects);
         new About("cfeditor", mainView);
         undoControl = new UndoControl<GameObject, MapArchObject, Archetype, CMapViewBasic>(getMapManager());

Modified: trunk/crossfire/src/cfeditor/CrossfireObjectsFactory.java
===================================================================
--- trunk/crossfire/src/cfeditor/CrossfireObjectsFactory.java	2008-06-12 09:22:43 UTC (rev 4179)
+++ trunk/crossfire/src/cfeditor/CrossfireObjectsFactory.java	2008-06-12 18:46:13 UTC (rev 4180)
@@ -38,6 +38,7 @@
 import net.sf.gridarta.gameobject.ArchetypeSet;
 import net.sf.gridarta.gameobject.face.FaceObjects;
 import net.sf.gridarta.gameobject.match.GameObjectMatchers;
+import net.sf.gridarta.gui.ObjectChooser;
 import net.sf.gridarta.gui.map.LevelRenderer;
 import net.sf.gridarta.gui.map.MapView;
 import net.sf.gridarta.io.DefaultMapReader;
@@ -65,6 +66,9 @@
     /** The {@link FaceObjects} instance to use. */
     private FaceObjects faceObjects = null;
 
+    /** The {@link ObjectChooser} instance to use. */
+    private ObjectChooser<GameObject, MapArchObject, Archetype, CMapViewBasic> objectChooser = null;
+
     /** {@inheritDoc} */
     @NotNull public GameObject newGameObject() {
         return new GameObject();
@@ -116,12 +120,13 @@
 
     /** {@inheritDoc} */
     @NotNull public MapView<GameObject, MapArchObject, Archetype, CMapViewBasic> newMapView(@NotNull final MapControl mapControl, @Nullable final Point viewPosition, final int viewCounter) {
-        return new MapView<GameObject, MapArchObject, Archetype, CMapViewBasic>(AbstractMainControl.getInstance(), mapControl, viewCounter, new CMapViewBasic(CMainControl.getInstance(), mapControl, viewPosition, faceObjects), ACTION_FACTORY);
+        return new MapView<GameObject, MapArchObject, Archetype, CMapViewBasic>(AbstractMainControl.getInstance(), mapControl, viewCounter, new CMapViewBasic(CMainControl.getInstance(), mapControl, viewPosition, faceObjects, objectChooser), ACTION_FACTORY);
     }
 
     /** {@inheritDoc} */
-    public void setFaceObjects(final FaceObjects faceObjects) {
+    public void init(@NotNull final FaceObjects faceObjects, @NotNull final ObjectChooser<GameObject, MapArchObject, Archetype, CMapViewBasic> objectChooser) {
         this.faceObjects = faceObjects;
+        this.objectChooser = objectChooser;
     }
 
 } // class CrossfireObjectsFactory

Modified: trunk/crossfire/src/cfeditor/gui/map/CMapViewBasic.java
===================================================================
--- trunk/crossfire/src/cfeditor/gui/map/CMapViewBasic.java	2008-06-12 09:22:43 UTC (rev 4179)
+++ trunk/crossfire/src/cfeditor/gui/map/CMapViewBasic.java	2008-06-12 18:46:13 UTC (rev 4180)
@@ -29,6 +29,7 @@
 import java.util.Map;
 import javax.swing.JViewport;
 import net.sf.gridarta.gameobject.face.FaceObjects;
+import net.sf.gridarta.gui.ObjectChooser;
 import net.sf.gridarta.gui.map.LevelRenderer;
 import net.sf.gridarta.gui.map.MapCursor;
 import net.sf.gridarta.gui.map.MapCursorEvent;
@@ -96,8 +97,9 @@
      * @param initial the initial view position to show; null=show top left
      *                corner
      * @param faceObjects the FaceObjects instance to use
+     * @param objectChooser the ObjectChooser instance to use
      */
-    public CMapViewBasic(@NotNull final CMainControl mainControl, @NotNull final MapControl<GameObject, MapArchObject, Archetype, CMapViewBasic> mapControl, @Nullable final Point initial, @NotNull final FaceObjects faceObjects) {
+    public CMapViewBasic(@NotNull final CMainControl mainControl, @NotNull final MapControl<GameObject, MapArchObject, Archetype, CMapViewBasic> mapControl, @Nullable final Point initial, @NotNull final FaceObjects faceObjects, @NotNull final ObjectChooser<GameObject, MapArchObject, Archetype, CMapViewBasic> objectChooser) {
         super(mapControl);
         this.mapControl = mapControl;
         mapModel = mapControl.getMapModel();
@@ -121,7 +123,7 @@
             getViewport().setViewPosition(initial);
         }
 
-        mapUserListener = new MapUserListener(mainControl, mapControl, this, mainControl.getObjectChooser(), mainControl.getSelectedSquareControl().getSelectedSquareView(), mainControl.getObjectChooser().getPickmapChooserControl());
+        mapUserListener = new MapUserListener(mainControl, mapControl, this, objectChooser, mainControl.getSelectedSquareControl().getSelectedSquareView(), objectChooser.getPickmapChooserControl());
         renderer.addMouseListener(mapUserListener);
         renderer.addMouseMotionListener(mapUserListener);
         renderer.setErroneousMapSquares(erroneousMapSquares);

Modified: trunk/crossfire/src/cfeditor/gui/map/MapUserListener.java
===================================================================
--- trunk/crossfire/src/cfeditor/gui/map/MapUserListener.java	2008-06-12 09:22:43 UTC (rev 4179)
+++ trunk/crossfire/src/cfeditor/gui/map/MapUserListener.java	2008-06-12 18:46:13 UTC (rev 4180)
@@ -97,7 +97,7 @@
         } else if (isInsert(e)) {
             if (mapCursor.setLocation(temp) && temp != null) {
                 mapControl.getMapModel().beginTransaction("Insert Object");
-                final GameObject insertedObject = mainControl.getObjectChooser().insertSelectedObject(mapControl, temp, false);
+                final GameObject insertedObject = objectChooser.insertSelectedObject(mapControl, temp, false);
                 mapControl.getMapModel().endTransaction();
                 selectedSquareView.setSelectedGameObject(insertedObject);
             }
@@ -172,7 +172,7 @@
     private void insertObject(final Point mapLoc) {
         if (mapLoc.x != -1 && mapLoc.y != -1) {
             mapControl.getMapModel().beginTransaction("Insert Object");
-            final GameObject insertedObject = mainControl.getObjectChooser().insertSelectedObject(mapControl, mapLoc, true);
+            final GameObject insertedObject = objectChooser.insertSelectedObject(mapControl, mapLoc, true);
             mapControl.getMapModel().endTransaction();
             selectedSquareView.setSelectedGameObject(insertedObject);
         }

Modified: trunk/daimonin/src/daieditor/CMainControl.java
===================================================================
--- trunk/daimonin/src/daieditor/CMainControl.java	2008-06-12 09:22:43 UTC (rev 4179)
+++ trunk/daimonin/src/daieditor/CMainControl.java	2008-06-12 18:46:13 UTC (rev 4180)
@@ -281,7 +281,6 @@
      */
     public CMainControl() {
         super(new DaimoninObjectsFactory(), "daieditor");
-        getGridartaObjectsFactory().setFaceObjects(faceObjects);
         instance = this;
         animationObjects = new AnimationObjects();
         archetypeSet = new ArchetypeSet(this, animationObjects, faceObjects);
@@ -293,6 +292,7 @@
         globalSettings.readGlobalSettings();
         PathManager.setGlobalSettings(globalSettings);
         objectChooser = new ObjectChooser(newMapDialogFactory, this, new File(globalSettings.getArchDefaultFolder(), IGUIConstants.PICKMAP_DIR));
+        getGridartaObjectsFactory().init(faceObjects, objectChooser);
         mainView = new MainView<GameObject, MapArchObject, Archetype, CMapViewBasic>(this, objectChooser, getMapManager(), ACTION_FACTORY, mapManagerActions.getCloseAllAction(), faceObjects);
         new About("daieditor", mainView);
         undoControl = new UndoControl<GameObject, MapArchObject, Archetype, CMapViewBasic>(getMapManager());

Modified: trunk/daimonin/src/daieditor/DaimoninObjectsFactory.java
===================================================================
--- trunk/daimonin/src/daieditor/DaimoninObjectsFactory.java	2008-06-12 09:22:43 UTC (rev 4179)
+++ trunk/daimonin/src/daieditor/DaimoninObjectsFactory.java	2008-06-12 18:46:13 UTC (rev 4180)
@@ -38,6 +38,7 @@
 import net.sf.gridarta.gameobject.ArchetypeSet;
 import net.sf.gridarta.gameobject.face.FaceObjects;
 import net.sf.gridarta.gameobject.match.GameObjectMatchers;
+import net.sf.gridarta.gui.ObjectChooser;
 import net.sf.gridarta.gui.map.LevelRenderer;
 import net.sf.gridarta.gui.map.MapView;
 import net.sf.gridarta.io.DefaultMapReader;
@@ -65,6 +66,9 @@
     /** The {@link FaceObjects} instance to use. */
     private FaceObjects faceObjects = null;
 
+    /** The {@link ObjectChooser} instance to use. */
+    private ObjectChooser<GameObject, MapArchObject, Archetype, CMapViewBasic> objectChooser = null;
+
     /** {@inheritDoc} */
     @NotNull public GameObject newGameObject() {
         return new GameObject();
@@ -120,8 +124,9 @@
     }
 
     /** {@inheritDoc} */
-    public void setFaceObjects(final FaceObjects faceObjects) {
+    public void init(@NotNull final FaceObjects faceObjects, @NotNull final ObjectChooser<GameObject, MapArchObject, Archetype, CMapViewBasic> objectChooser) {
         this.faceObjects = faceObjects;
+        this.objectChooser = objectChooser;
     }
 
 } // class DaimoninObjectsFactory

Modified: trunk/daimonin/src/daieditor/gui/map/tools/InsertionTool.java
===================================================================
--- trunk/daimonin/src/daieditor/gui/map/tools/InsertionTool.java	2008-06-12 09:22:43 UTC (rev 4179)
+++ trunk/daimonin/src/daieditor/gui/map/tools/InsertionTool.java	2008-06-12 18:46:13 UTC (rev 4180)
@@ -24,6 +24,7 @@
 import daieditor.gameobject.GameObject;
 import daieditor.gui.map.CMapViewBasic;
 import daieditor.gui.map.event.MouseOpEvent;
+import daieditor.gui.ObjectChooser;
 import daieditor.map.MapArchObject;
 import java.awt.Component;
 import java.awt.Point;
@@ -52,16 +53,21 @@
     /** The main control. */
     @NotNull private final CMainControl mainControl;
 
+    /** The ObjectChooser to use. */
+    @NotNull private final ObjectChooser objectChooser;
+
     /** The position for insertion. */
     private boolean insertBelow;
 
     /**
      * Create a BasicAbstractTool.
      * @param mainControl The main control.
+     * @param objectChooser the ObjectChooser to use
      */
-    public InsertionTool(@NotNull final CMainControl mainControl) {
+    public InsertionTool(@NotNull final CMainControl mainControl, @NotNull final ObjectChooser objectChooser) {
         super("insertion");
         this.mainControl = mainControl;
+        this.objectChooser = objectChooser;
     }
 
     /** {@inheritDoc} */
@@ -71,7 +77,7 @@
         final MapControl<GameObject, MapArchObject, Archetype, CMapViewBasic> mapControl = e.getMapControl();
         if (p != null) {
             mapControl.getMapModel().beginTransaction("Insert Object");
-            final GameObject insertedObject = mainControl.getObjectChooser().insertSelectedObject(mapControl, p, true);
+            final GameObject insertedObject = objectChooser.insertSelectedObject(mapControl, p, true);
             if (!mapControl.isPickmap()) {
                 mapCursor.setLocation(p);
             }
@@ -87,7 +93,7 @@
         final MapControl<GameObject, MapArchObject, Archetype, CMapViewBasic> mapControl = e.getMapControl();
         if (!mapControl.isPickmap() && mapCursor.setLocationSafe(p)) {
             mapControl.getMapModel().beginTransaction("Insert Object");
-            final GameObject insertedObject = mainControl.getObjectChooser().insertSelectedObject(mapControl, p, false);
+            final GameObject insertedObject = objectChooser.insertSelectedObject(mapControl, p, false);
             mapControl.getMapModel().endTransaction();
             mainControl.getSelectedSquareControl().getSelectedSquareView().setSelectedGameObject(insertedObject);
         }

Modified: trunk/daimonin/src/daieditor/gui/map/tools/ToolSelector.java
===================================================================
--- trunk/daimonin/src/daieditor/gui/map/tools/ToolSelector.java	2008-06-12 09:22:43 UTC (rev 4179)
+++ trunk/daimonin/src/daieditor/gui/map/tools/ToolSelector.java	2008-06-12 18:46:13 UTC (rev 4180)
@@ -80,7 +80,7 @@
      */
     public ToolSelector(@NotNull final String defaultTool, @NotNull final CMainControl mainControl, @NotNull final ObjectChooser objectChooser) {
         createUI();
-        for (final Tool toolToAdd : new Tool[] { new VoidTool(), new SelectionTool(objectChooser), new DeletionTool(mainControl), new InsertionTool(mainControl) }) {
+        for (final Tool toolToAdd : new Tool[] { new VoidTool(), new SelectionTool(objectChooser), new DeletionTool(mainControl), new InsertionTool(mainControl, objectChooser) }) {
             add(toolToAdd, toolToAdd.getId().equals(defaultTool));
         }
     }

Modified: trunk/src/app/net/sf/gridarta/GridartaObjectsFactory.java
===================================================================
--- trunk/src/app/net/sf/gridarta/GridartaObjectsFactory.java	2008-06-12 09:22:43 UTC (rev 4179)
+++ trunk/src/app/net/sf/gridarta/GridartaObjectsFactory.java	2008-06-12 18:46:13 UTC (rev 4180)
@@ -27,6 +27,7 @@
 import net.sf.gridarta.gameobject.ArchetypeSet;
 import net.sf.gridarta.gameobject.GameObject;
 import net.sf.gridarta.gameobject.face.FaceObjects;
+import net.sf.gridarta.gui.ObjectChooser;
 import net.sf.gridarta.gui.map.LevelRenderer;
 import net.sf.gridarta.gui.map.MapView;
 import net.sf.gridarta.gui.map.MapViewBasic;
@@ -136,9 +137,10 @@
     @NotNull MapView<G, A, R, V> newMapView(@NotNull MapControl<G, A, R, V> mapControl, @Nullable Point viewPosition, int viewCounter);
 
     /**
-     * Sets the {@link FaceObjects} instance to use.
+     * Initializes the instance.
      * @param faceObjects the FaceObjects instance
+     * @param objectChooser the ObjectChooser instance
      */
-    void setFaceObjects(final FaceObjects faceObjects);
+    void init(@NotNull final FaceObjects faceObjects, @NotNull final ObjectChooser<G, A, R, V> objectChooser);
 
 } // interface GridartaObjectsFactory

Modified: trunk/src/app/net/sf/gridarta/gui/AbstractObjectChooser.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/AbstractObjectChooser.java	2008-06-12 09:22:43 UTC (rev 4179)
+++ trunk/src/app/net/sf/gridarta/gui/AbstractObjectChooser.java	2008-06-12 18:46:13 UTC (rev 4180)
@@ -61,10 +61,7 @@
         return pickmapActive;
     }
 
-    /**
-     * Sets the pickmap folders menu to manage.
-     * @param folderMenu the pickmap folders menu
-     */
+    /** {@inheritDoc} */
     public void setPickmapFoldersMenu(@Nullable final JMenu folderMenu) {
         getPickmapChooserControl().setPickmapFoldersMenu(folderMenu);
     }

Modified: trunk/src/app/net/sf/gridarta/gui/ObjectChooser.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/ObjectChooser.java	2008-06-12 09:22:43 UTC (rev 4179)
+++ trunk/src/app/net/sf/gridarta/gui/ObjectChooser.java	2008-06-12 18:46:13 UTC (rev 4180)
@@ -21,6 +21,7 @@
 
 import java.awt.Point;
 import java.util.List;
+import javax.swing.JMenu;
 import net.sf.gridarta.gameobject.Archetype;
 import net.sf.gridarta.gameobject.GameObject;
 import net.sf.gridarta.gui.archetypechooser.ArchetypeChooserControl;
@@ -128,4 +129,10 @@
      */
     @Nullable G insertSelectedObject(@NotNull final MapControl<G, A, R, V> mapControl, @NotNull Point pos, boolean allowMany);
 
+    /**
+     * Sets the pickmap folders menu to manage.
+     * @param folderMenu the pickmap folders menu
+     */
+    void setPickmapFoldersMenu(@Nullable JMenu folderMenu);
+
 } // interface ObjectChooser


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: [4180] trunk (Page 60)

gridarta-commit