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

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

Revision: 4366
          http://gridarta.svn.sourceforge.net/gridarta/?rev=4366&view=rev
Author:   akirschbaum
Date:     2008-07-21 18:07:02 +0000 (Mon, 21 Jul 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/DefaultObjectChooser.java

Modified: trunk/crossfire/src/cfeditor/CMainControl.java
===================================================================
--- trunk/crossfire/src/cfeditor/CMainControl.java	2008-07-21 18:02:26 UTC (rev 4365)
+++ trunk/crossfire/src/cfeditor/CMainControl.java	2008-07-21 18:07:02 UTC (rev 4366)
@@ -245,7 +245,7 @@
         newMapDialogFactory = new NewMapDialogFactory<GameObject, MapArchObject, Archetype, CMapViewBasic>(this, IGUIConstants.DEF_MAPSIZE, IGUIConstants.DEF_MAPSIZE, 0, false, false, IGUIConstants.DEF_PICKMAP_WIDTH, IGUIConstants.DEF_PICKMAP_HEIGHT);
         pickmapChooserControl = new PickmapChooserControl<GameObject, MapArchObject, Archetype, CMapViewBasic>(newMapDialogFactory, this, new File(globalSettings.getMapDir(), IGUIConstants.PICKMAP_DIR), mapManager);
         newMapDialogFactory.setPickmapChooserControl(pickmapChooserControl);
-        objectChooser = new DefaultObjectChooser<GameObject, MapArchObject, Archetype, CMapViewBasic>(this, selectedSquareView, archetypeChooserControl, mapManager, pickmapChooserControl);
+        objectChooser = new DefaultObjectChooser<GameObject, MapArchObject, Archetype, CMapViewBasic>(this, selectedSquareView, archetypeChooserControl, pickmapChooserControl);
         mainActions = new MainActions<GameObject, MapArchObject, Archetype, CMapViewBasic>(this, pickmapChooserControl, animationObjects, ACTION_FACTORY, faceObjects, objectChooser);
         getGridartaObjectsFactory().init(faceObjects, objectChooser, archetypeChooserControl, pickmapChooserControl, selectedSquareView);
         mainView = new MainView<GameObject, MapArchObject, Archetype, CMapViewBasic>(this, objectChooser, getMapManager(), ACTION_FACTORY, mapManagerActions.getCloseAllAction(), faceObjects);

Modified: trunk/daimonin/src/daieditor/CMainControl.java
===================================================================
--- trunk/daimonin/src/daieditor/CMainControl.java	2008-07-21 18:02:26 UTC (rev 4365)
+++ trunk/daimonin/src/daieditor/CMainControl.java	2008-07-21 18:07:02 UTC (rev 4366)
@@ -298,7 +298,7 @@
         newMapDialogFactory = new NewMapDialogFactory<GameObject, MapArchObject, Archetype, CMapViewBasic>(this, IGUIConstants.DEF_MAPSIZE, IGUIConstants.DEF_MAPSIZE, IGUIConstants.DEF_MAPDIFFICULTY, true, true, IGUIConstants.DEF_PICKMAP_WIDTH, IGUIConstants.DEF_PICKMAP_HEIGHT);
         pickmapChooserControl = new PickmapChooserControl<GameObject, MapArchObject, Archetype, CMapViewBasic>(newMapDialogFactory, this, new File(globalSettings.getArchDefaultFolder(), IGUIConstants.PICKMAP_DIR), mapManager);
         newMapDialogFactory.setPickmapChooserControl(pickmapChooserControl);
-        objectChooser = new DefaultObjectChooser<GameObject, MapArchObject, Archetype, CMapViewBasic>(this, selectedSquareView, archetypeChooserControl, mapManager, pickmapChooserControl);
+        objectChooser = new DefaultObjectChooser<GameObject, MapArchObject, Archetype, CMapViewBasic>(this, selectedSquareView, archetypeChooserControl, pickmapChooserControl);
         mainActions = new MainActions<GameObject, MapArchObject, Archetype, CMapViewBasic>(this, pickmapChooserControl, animationObjects, ACTION_FACTORY, faceObjects, objectChooser);
         getGridartaObjectsFactory().init(faceObjects, objectChooser, archetypeChooserControl, pickmapChooserControl, selectedSquareView);
         mainView = new MainView<GameObject, MapArchObject, Archetype, CMapViewBasic>(this, objectChooser, getMapManager(), ACTION_FACTORY, mapManagerActions.getCloseAllAction(), faceObjects);

Modified: trunk/src/app/net/sf/gridarta/gui/DefaultObjectChooser.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/DefaultObjectChooser.java	2008-07-21 18:02:26 UTC (rev 4365)
+++ trunk/src/app/net/sf/gridarta/gui/DefaultObjectChooser.java	2008-07-21 18:07:02 UTC (rev 4366)
@@ -28,7 +28,6 @@
 import javax.swing.JTabbedPane;
 import javax.swing.SwingConstants;
 import net.sf.gridarta.MainControl;
-import net.sf.gridarta.MapManager;
 import net.sf.gridarta.gameobject.Archetype;
 import net.sf.gridarta.gameobject.GameObject;
 import net.sf.gridarta.gui.archetypechooser.ArchetypeChooserControl;
@@ -94,7 +93,7 @@
      * @param archetypeChooserControl the archetype chooser control
      * @param pickmapChooserControl the pickmap chooser control
      */
-    public DefaultObjectChooser(final MainControl<G, A, R, V> mainControl, @NotNull final SelectedSquareView<G, A, R, V> selectedSquareView, @NotNull final ArchetypeChooserControl<G, A, R, V> archetypeChooserControl, @NotNull final MapManager<G, A, R, V> mapManager, @NotNull final PickmapChooserControl<G, A, R, V> pickmapChooserControl) {
+    public DefaultObjectChooser(final MainControl<G, A, R, V> mainControl, @NotNull final SelectedSquareView<G, A, R, V> selectedSquareView, @NotNull final ArchetypeChooserControl<G, A, R, V> archetypeChooserControl, @NotNull final PickmapChooserControl<G, A, R, V> pickmapChooserControl) {
         super(new BorderLayout());
         this.archetypeChooserControl = archetypeChooserControl;
         this.pickmapChooserControl = pickmapChooserControl;


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