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

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

Revision: 4727
          http://gridarta.svn.sourceforge.net/gridarta/?rev=4727&view=rev
Author:   akirschbaum
Date:     2008-08-03 14:24:19 +0000 (Sun, 03 Aug 2008)

Log Message:
-----------
Remove unused parameters.

Modified Paths:
--------------
    trunk/crossfire/src/cfeditor/CMainControl.java
    trunk/daimonin/src/daieditor/CMainControl.java
    trunk/src/app/net/sf/gridarta/gui/map/tools/ToolPalette.java
    trunk/src/app/net/sf/gridarta/gui/map/tools/ToolSelector.java
    trunk/src/app/net/sf/gridarta/gui/objectchooser/DefaultObjectChooser.java

Modified: trunk/crossfire/src/cfeditor/CMainControl.java
===================================================================
--- trunk/crossfire/src/cfeditor/CMainControl.java	2008-08-03 14:21:26 UTC (rev 4726)
+++ trunk/crossfire/src/cfeditor/CMainControl.java	2008-08-03 14:24:19 UTC (rev 4727)
@@ -239,7 +239,7 @@
         newMapDialogFactory.setPickmapChooserControl(pickmapChooserControl);
         archetypeTypeSet = new ArchetypeTypeSet<GameObject, MapArchObject, Archetype>();
         final ReplaceDialogManager<GameObject, MapArchObject, Archetype, CMapViewBasic> replaceDialogManager = new ReplaceDialogManager<GameObject, MapArchObject, Archetype, CMapViewBasic>(this, archetypeSet, copyBuffer);
-        objectChooser = new DefaultObjectChooser<GameObject, MapArchObject, Archetype, CMapViewBasic>(this, replaceDialogManager, archetypeTypeSet, editTypes, selectedSquareView, archetypeChooserControl, pickmapChooserControl, copyBuffer);
+        objectChooser = new DefaultObjectChooser<GameObject, MapArchObject, Archetype, CMapViewBasic>(replaceDialogManager, archetypeTypeSet, editTypes, selectedSquareView, archetypeChooserControl, pickmapChooserControl, copyBuffer);
         replaceDialogManager.setObjectChooser(objectChooser);
         mainActions = new MainActions<GameObject, MapArchObject, Archetype, CMapViewBasic>(replaceDialogManager, this, editTypes, archetypeSet, copyBuffer, pickmapChooserControl, animationObjects, ACTION_FACTORY, faceObjects, objectChooser, mapManager);
         SystemIcons.init();

Modified: trunk/daimonin/src/daieditor/CMainControl.java
===================================================================
--- trunk/daimonin/src/daieditor/CMainControl.java	2008-08-03 14:21:26 UTC (rev 4726)
+++ trunk/daimonin/src/daieditor/CMainControl.java	2008-08-03 14:24:19 UTC (rev 4727)
@@ -302,7 +302,7 @@
         newMapDialogFactory.setPickmapChooserControl(pickmapChooserControl);
         archetypeTypeSet = new ArchetypeTypeSet<GameObject, MapArchObject, Archetype>();
         final ReplaceDialogManager<GameObject, MapArchObject, Archetype, CMapViewBasic> replaceDialogManager = new ReplaceDialogManager<GameObject, MapArchObject, Archetype, CMapViewBasic>(this, archetypeSet, copyBuffer);
-        objectChooser = new DefaultObjectChooser<GameObject, MapArchObject, Archetype, CMapViewBasic>(this, replaceDialogManager, archetypeTypeSet, editTypes, selectedSquareView, archetypeChooserControl, pickmapChooserControl, copyBuffer);
+        objectChooser = new DefaultObjectChooser<GameObject, MapArchObject, Archetype, CMapViewBasic>(replaceDialogManager, archetypeTypeSet, editTypes, selectedSquareView, archetypeChooserControl, pickmapChooserControl, copyBuffer);
         replaceDialogManager.setObjectChooser(objectChooser);
         mainActions = new MainActions<GameObject, MapArchObject, Archetype, CMapViewBasic>(replaceDialogManager, this, editTypes, archetypeSet, copyBuffer, pickmapChooserControl, animationObjects, ACTION_FACTORY, faceObjects, objectChooser, mapManager);
         SystemIcons.init();

Modified: trunk/src/app/net/sf/gridarta/gui/map/tools/ToolPalette.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/map/tools/ToolPalette.java	2008-08-03 14:21:26 UTC (rev 4726)
+++ trunk/src/app/net/sf/gridarta/gui/map/tools/ToolPalette.java	2008-08-03 14:24:19 UTC (rev 4727)
@@ -27,7 +27,6 @@
 import javax.swing.JTabbedPane;
 import net.sf.gridarta.CopyBuffer;
 import net.sf.gridarta.EditTypes;
-import net.sf.gridarta.MainControl;
 import net.sf.gridarta.gameobject.Archetype;
 import net.sf.gridarta.gameobject.GameObject;
 import net.sf.gridarta.gui.map.MapViewBasic;
@@ -68,8 +67,6 @@
 
     /**
      * Create a ToolPalette.
-     * @param mainControl MainControl to use (required for {@link
-     * InsertionTool}).
      * @param editTypes the edit types instance
      * @param selectedSquareView the selected square view
      * @param objectChooser the object chooser to use
@@ -77,11 +74,11 @@
      * @param objectChoiceDisplay the object choice display to use
      * @param copyBuffer the copy buffer instance to use
      */
-    public ToolPalette(@NotNull final MainControl<G, A, R, V> mainControl, @NotNull final EditTypes<G, A, R, V> editTypes, @NotNull final SelectedSquareView<G, A, R, V> selectedSquareView, @NotNull final ObjectChooser<G, A, R> objectChooser, @NotNull final ObjectChoiceDisplay<G, A, R, V> objectChoiceDisplay, @NotNull final PickmapChooserControl<G, A, R, V> pickmapChooserControl, @NotNull final CopyBuffer<G, A, R, V> copyBuffer) {
+    public ToolPalette(@NotNull final EditTypes<G, A, R, V> editTypes, @NotNull final SelectedSquareView<G, A, R, V> selectedSquareView, @NotNull final ObjectChooser<G, A, R> objectChooser, @NotNull final ObjectChoiceDisplay<G, A, R, V> objectChoiceDisplay, @NotNull final PickmapChooserControl<G, A, R, V> pickmapChooserControl, @NotNull final CopyBuffer<G, A, R, V> copyBuffer) {
         super(new BorderLayout());
-        lmbSelector = new ToolSelector<G, A, R, V>("selection", mainControl, editTypes, selectedSquareView, objectChooser, objectChoiceDisplay, pickmapChooserControl, copyBuffer);
-        mmbSelector = new ToolSelector<G, A, R, V>("deletion", mainControl, editTypes, selectedSquareView, objectChooser, objectChoiceDisplay, pickmapChooserControl, copyBuffer);
-        rmbSelector = new ToolSelector<G, A, R, V>("insertion", mainControl, editTypes, selectedSquareView, objectChooser, objectChoiceDisplay, pickmapChooserControl, copyBuffer);
+        lmbSelector = new ToolSelector<G, A, R, V>("selection", editTypes, selectedSquareView, objectChooser, objectChoiceDisplay, pickmapChooserControl, copyBuffer);
+        mmbSelector = new ToolSelector<G, A, R, V>("deletion", editTypes, selectedSquareView, objectChooser, objectChoiceDisplay, pickmapChooserControl, copyBuffer);
+        rmbSelector = new ToolSelector<G, A, R, V>("insertion", editTypes, selectedSquareView, objectChooser, objectChoiceDisplay, pickmapChooserControl, copyBuffer);
         add(new JLabel(ACTION_FACTORY.getString("mouse")), BorderLayout.NORTH);
         mouseTabs.add(ACTION_FACTORY.getString("left"), lmbSelector);
         mouseTabs.add(ACTION_FACTORY.getString("middle"), mmbSelector);

Modified: trunk/src/app/net/sf/gridarta/gui/map/tools/ToolSelector.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/map/tools/ToolSelector.java	2008-08-03 14:21:26 UTC (rev 4726)
+++ trunk/src/app/net/sf/gridarta/gui/map/tools/ToolSelector.java	2008-08-03 14:24:19 UTC (rev 4727)
@@ -34,7 +34,6 @@
 import javax.swing.JToggleButton;
 import net.sf.gridarta.CopyBuffer;
 import net.sf.gridarta.EditTypes;
-import net.sf.gridarta.MainControl;
 import net.sf.gridarta.gameobject.Archetype;
 import net.sf.gridarta.gameobject.GameObject;
 import net.sf.gridarta.gui.map.MapViewBasic;
@@ -90,8 +89,6 @@
     /**
      * Create a ToolSelector component.
      * @param defaultTool name of the tool that should be selected by default
-     * @param mainControl MainControl to use (required for {@link
-     * InsertionTool}).
      * @param editTypes the edit types instance
      * @param selectedSquareView the selected square view
      * @param objectChooser the object chooser to use
@@ -99,7 +96,7 @@
      * @param pickmapChooserControl the pickmap chooser control to use
      * @param copyBuffer the copy buffer instance to use
      */
-    public ToolSelector(@NotNull final String defaultTool, @NotNull final MainControl<G, A, R, V> mainControl, @NotNull final EditTypes<G, A, R, V> editTypes, @NotNull final SelectedSquareView<G, A, R, V> selectedSquareView, @NotNull final ObjectChooser<G, A, R> objectChooser, @NotNull final ObjectChoiceDisplay<G, A, R, V> objectChoiceDisplay, @NotNull final PickmapChooserControl<G, A, R, V> pickmapChooserControl, @NotNull final CopyBuffer<G, A, R, V> copyBuffer) {
+    public ToolSelector(@NotNull final String defaultTool, @NotNull final EditTypes<G, A, R, V> editTypes, @NotNull final SelectedSquareView<G, A, R, V> selectedSquareView, @NotNull final ObjectChooser<G, A, R> objectChooser, @NotNull final ObjectChoiceDisplay<G, A, R, V> objectChoiceDisplay, @NotNull final PickmapChooserControl<G, A, R, V> pickmapChooserControl, @NotNull final CopyBuffer<G, A, R, V> copyBuffer) {
         createUI();
         for (final Tool<G, A, R, V> toolToAdd : new Tool[] {new VoidTool<G, A, R, V>(), new SelectionTool<G, A, R, V>(objectChooser, objectChoiceDisplay, copyBuffer), new DeletionTool<G, A, R, V>(editTypes, objectChooser, pickmapChooserControl), new InsertionTool<G, A, R, V>(selectedSquareView, objectChooser, pickmapChooserControl)}) {
             add(toolToAdd, toolToAdd.getId().equals(defaultTool));

Modified: trunk/src/app/net/sf/gridarta/gui/objectchooser/DefaultObjectChooser.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/objectchooser/DefaultObjectChooser.java	2008-08-03 14:21:26 UTC (rev 4726)
+++ trunk/src/app/net/sf/gridarta/gui/objectchooser/DefaultObjectChooser.java	2008-08-03 14:24:19 UTC (rev 4727)
@@ -29,7 +29,6 @@
 import javax.swing.SwingConstants;
 import net.sf.gridarta.CopyBuffer;
 import net.sf.gridarta.EditTypes;
-import net.sf.gridarta.MainControl;
 import net.sf.gridarta.archtype.ArchetypeTypeSet;
 import net.sf.gridarta.gameobject.Archetype;
 import net.sf.gridarta.gameobject.GameObject;
@@ -98,14 +97,13 @@
 
     /**
      * Creates a new instance.
-     * @param mainControl the main control
      * @param archetypeTypeSet the archetype type set
      * @param editTypes the edit types instance
      * @param archetypeChooserControl the archetype chooser control
      * @param pickmapChooserControl the pickmap chooser control
      * @param copyBuffer the copy buffer instance to use
      */
-    public DefaultObjectChooser(final MainControl<G, A, R, V> mainControl, @NotNull final ReplaceDialogManager<G, A, R, V> replaceDialogManager, @NotNull final ArchetypeTypeSet<G, A, R> archetypeTypeSet, @NotNull final EditTypes<G, A, R, V> editTypes, @NotNull final SelectedSquareView<G, A, R, V> selectedSquareView, @NotNull final ArchetypeChooserControl<G, A, R, V> archetypeChooserControl, @NotNull final PickmapChooserControl<G, A, R, V> pickmapChooserControl, @NotNull final CopyBuffer<G, A, R, V> copyBuffer) {
+    public DefaultObjectChooser(@NotNull final ReplaceDialogManager<G, A, R, V> replaceDialogManager, @NotNull final ArchetypeTypeSet<G, A, R> archetypeTypeSet, @NotNull final EditTypes<G, A, R, V> editTypes, @NotNull final SelectedSquareView<G, A, R, V> selectedSquareView, @NotNull final ArchetypeChooserControl<G, A, R, V> archetypeChooserControl, @NotNull final PickmapChooserControl<G, A, R, V> pickmapChooserControl, @NotNull final CopyBuffer<G, A, R, V> copyBuffer) {
         super(new BorderLayout());
         this.archetypeChooserControl = archetypeChooserControl;
         this.pickmapChooserControl = pickmapChooserControl;
@@ -122,7 +120,7 @@
 
         });
         objectChoiceDisplay = new ObjectChoiceDisplay<G, A, R, V>(replaceDialogManager, archetypeTypeSet, this);
-        toolPalette = new ToolPalette<G, A, R, V>(mainControl, editTypes, selectedSquareView, this, objectChoiceDisplay, pickmapChooserControl, copyBuffer);
+        toolPalette = new ToolPalette<G, A, R, V>(editTypes, selectedSquareView, this, objectChoiceDisplay, pickmapChooserControl, copyBuffer);
 
         // archAndPickPane is the panel containing both archpanel and pickmaps
         archAndPickPane.addTab(ACTION_FACTORY.getString("objectChooser.archetypesTabTitle"), archetypeChooserControl.getArchetypeChooserView());


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