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

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

Revision: 4836
          http://gridarta.svn.sourceforge.net/gridarta/?rev=4836&view=rev
Author:   akirschbaum
Date:     2008-08-15 17:23:07 +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/MainActions.java

Modified: trunk/crossfire/src/cfeditor/CMainControl.java
===================================================================
--- trunk/crossfire/src/cfeditor/CMainControl.java	2008-08-15 17:20:52 UTC (rev 4835)
+++ trunk/crossfire/src/cfeditor/CMainControl.java	2008-08-15 17:23:07 UTC (rev 4836)
@@ -245,7 +245,7 @@
         final SelectedSquareView<GameObject, MapArchObject, Archetype, CMapViewBasic> selectedSquareView = selectedSquareControl.getSelectedSquareView();
         new MapCursorControl<GameObject, MapArchObject, Archetype, CMapViewBasic>("cfeditor", this, gameObjectAttributesDialogFactory, mapManager, mapViewManager, selectedSquareControl, selectedSquareView);
         replaceDialogManager.setObjectChooser(objectChooser);
-        mainActions = new MainActions<GameObject, MapArchObject, Archetype, CMapViewBasic>(replaceDialogManager, this, editTypes, archetypeSet, copyBuffer, pickmapChooserControl, animationObjects, ACTION_FACTORY, faceObjects, objectChooser, mapManager, mapViewManager);
+        mainActions = new MainActions<GameObject, MapArchObject, Archetype, CMapViewBasic>(replaceDialogManager, this, editTypes, archetypeSet, copyBuffer, animationObjects, ACTION_FACTORY, faceObjects, objectChooser, mapManager, mapViewManager);
         SystemIcons.init();
         GameObject.setArchetypeSet(archetypeSet, SystemIcons.getNofaceTileIcon());
         createMapImageCache(CResourceLoader.getHomeFile("thumbnails"), SystemIcons.getDefaultIcon(), SystemIcons.getDefaultPreview(), new StatusBar<GameObject, MapArchObject, Archetype, CMapViewBasic>(mapManager, mapViewManager, archetypeSet, faceObjects));

Modified: trunk/daimonin/src/daieditor/CMainControl.java
===================================================================
--- trunk/daimonin/src/daieditor/CMainControl.java	2008-08-15 17:20:52 UTC (rev 4835)
+++ trunk/daimonin/src/daieditor/CMainControl.java	2008-08-15 17:23:07 UTC (rev 4836)
@@ -302,7 +302,7 @@
         final SelectedSquareView<GameObject, MapArchObject, Archetype, CMapViewBasic> selectedSquareView = selectedSquareControl.getSelectedSquareView();
         new MapCursorControl<GameObject, MapArchObject, Archetype, CMapViewBasic>("daieditor", this, gameObjectAttributesDialogFactory, mapManager, mapViewManager, selectedSquareControl, selectedSquareView);
         replaceDialogManager.setObjectChooser(objectChooser);
-        mainActions = new MainActions<GameObject, MapArchObject, Archetype, CMapViewBasic>(replaceDialogManager, this, editTypes, archetypeSet, copyBuffer, pickmapChooserControl, animationObjects, ACTION_FACTORY, faceObjects, objectChooser, mapManager, mapViewManager);
+        mainActions = new MainActions<GameObject, MapArchObject, Archetype, CMapViewBasic>(replaceDialogManager, this, editTypes, archetypeSet, copyBuffer, animationObjects, ACTION_FACTORY, faceObjects, objectChooser, mapManager, mapViewManager);
         SystemIcons.init();
         GameObject.setAnimationObjects(animationObjects, SystemIcons.getNofaceTileIcon());
         createMapImageCache(null, SystemIcons.getDefaultIcon(), SystemIcons.getDefaultPreview(), new StatusBar<GameObject, MapArchObject, Archetype, CMapViewBasic>(mapManager, mapViewManager, archetypeSet, faceObjects));

Modified: trunk/src/app/net/sf/gridarta/gui/MainActions.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/MainActions.java	2008-08-15 17:20:52 UTC (rev 4835)
+++ trunk/src/app/net/sf/gridarta/gui/MainActions.java	2008-08-15 17:23:07 UTC (rev 4836)
@@ -47,7 +47,6 @@
 import net.sf.gridarta.gui.map.MapView;
 import net.sf.gridarta.gui.map.MapViewBasic;
 import net.sf.gridarta.gui.objectchooser.ObjectChooser;
-import net.sf.gridarta.gui.pickmapchooser.PickmapChooserControl;
 import net.sf.gridarta.map.InsertionMode;
 import net.sf.gridarta.map.MapArchObject;
 import net.sf.gridarta.map.MapControl;
@@ -87,10 +86,6 @@
     @NotNull
     private final CopyBuffer<G, A, R, V> copyBuffer;
 
-    /** The pickmap chooser control instance. */
-    @NotNull
-    private final PickmapChooserControl<G, A, R, V> pickmapChooserControl;
-
     /** The animation objects instance to use. */
     @NotNull
     private final AnimationObjects<?> animationObjects;
@@ -312,7 +307,6 @@
      * @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
      * @param animationObjects the animation object instance to use
      * @param actionFactory The action factory to create actions.
      * @param faceObjects the FaceObjects instance to use
@@ -320,13 +314,12 @@
      * @param mapManager the map manager instance
      * @param mapViewManager the map view manager instance
      */
-    public MainActions(@NotNull final ReplaceDialogManager<G, A, R, V> replaceDialogManager, @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, @NotNull final MapViewManager<G, A, R, V> mapViewManager) {
+    public MainActions(@NotNull final ReplaceDialogManager<G, A, R, V> replaceDialogManager, @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 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, @NotNull final MapViewManager<G, A, R, V> mapViewManager) {
         this.replaceDialogManager = replaceDialogManager;
         this.mainControl = mainControl;
         this.editTypes = editTypes;
         this.archetypeSet = archetypeSet;
         this.copyBuffer = copyBuffer;
-        this.pickmapChooserControl = pickmapChooserControl;
         this.animationObjects = animationObjects;
         this.actionFactory = actionFactory;
         this.faceObjects = faceObjects;


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