Menu
▾
▴
[Gridarta-commit] SF.net SVN: gridarta:[4749] trunk
|
From: <aki...@us...> - 2008-08-03 23:15:41
|
Revision: 4749
http://gridarta.svn.sourceforge.net/gridarta/?rev=4749&view=rev
Author: akirschbaum
Date: 2008-08-03 23:15:48 +0000 (Sun, 03 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/map/tools/SelectionTool.java
trunk/src/app/net/sf/gridarta/gui/map/tools/ToolPalette.java
trunk/src/app/net/sf/gridarta/gui/map/tools/ToolSelector.java
Modified: trunk/crossfire/src/cfeditor/CMainControl.java
===================================================================
--- trunk/crossfire/src/cfeditor/CMainControl.java 2008-08-03 23:12:36 UTC (rev 4748)
+++ trunk/crossfire/src/cfeditor/CMainControl.java 2008-08-03 23:15:48 UTC (rev 4749)
@@ -330,7 +330,7 @@
((CrossfireObjectsFactory) gridartaObjectsFactory).setFilterControl(filterControl);
scriptControl = new ScriptController(this, filterControl, archetypeSet, mainView);
final ObjectChoiceDisplay<GameObject, MapArchObject, Archetype, CMapViewBasic> objectChoiceDisplay = new ObjectChoiceDisplay<GameObject, MapArchObject, Archetype, CMapViewBasic>(replaceDialogManager, archetypeTypeSet, objectChooser, archetypeChooserControl, pickmapChooserControl);
- final ToolPalette<GameObject, MapArchObject, Archetype, CMapViewBasic> toolPalette = new ToolPalette<GameObject, MapArchObject, Archetype, CMapViewBasic>(editTypes, selectedSquareView, objectChooser, objectChoiceDisplay, pickmapChooserControl, copyBuffer);
+ final ToolPalette<GameObject, MapArchObject, Archetype, CMapViewBasic> toolPalette = new ToolPalette<GameObject, MapArchObject, Archetype, CMapViewBasic>(editTypes, selectedSquareView, objectChooser, pickmapChooserControl, copyBuffer);
final LeftPanel<GameObject, MapArchObject, Archetype, CMapViewBasic> leftPanel = new LeftPanel<GameObject, MapArchObject, Archetype, CMapViewBasic>(objectChooser, toolPalette, objectChoiceDisplay);
mainView.init(gameObjectAttributesPanel, selectedSquareView, archetypeTypeSet, mapTileListBottom, gameObjectMatchers, archetypeChooserControl, objectChooser, leftPanel);
mapActions.updateMenuState();
Modified: trunk/daimonin/src/daieditor/CMainControl.java
===================================================================
--- trunk/daimonin/src/daieditor/CMainControl.java 2008-08-03 23:12:36 UTC (rev 4748)
+++ trunk/daimonin/src/daieditor/CMainControl.java 2008-08-03 23:15:48 UTC (rev 4749)
@@ -391,7 +391,7 @@
final LockedItemsControl<GameObject, MapArchObject, Archetype, CMapViewBasic> lockedItemsControl = new LockedItemsControl<GameObject, MapArchObject, Archetype, CMapViewBasic>(mapManager, Archetype.TYPE_LOCKED_DOOR, Archetype.TYPE_SPECIAL_KEY, Archetype.TYPE_ALTAR_TRIGGER, Archetype.TYPE_MARKER, Archetype.TYPE_INVENTORY_CHECKER, Archetype.TYPE_SPAWN_POINT, Archetype.TYPE_CONTAINER);
gameObjectAttributesPanel = new GameObjectAttributesPanel(this, objectChooser, archetypeTypeSet, mapManager, animationObjects, lockedItemsControl, monsterMatcher, selectedSquareControl, selectedSquareView, mainView);
final ObjectChoiceDisplay<GameObject, MapArchObject, Archetype, CMapViewBasic> objectChoiceDisplay = new ObjectChoiceDisplay<GameObject, MapArchObject, Archetype, CMapViewBasic>(replaceDialogManager, archetypeTypeSet, objectChooser, archetypeChooserControl, pickmapChooserControl);
- final ToolPalette<GameObject, MapArchObject, Archetype, CMapViewBasic> toolPalette = new ToolPalette<GameObject, MapArchObject, Archetype, CMapViewBasic>(editTypes, selectedSquareView, objectChooser, objectChoiceDisplay, pickmapChooserControl, copyBuffer);
+ final ToolPalette<GameObject, MapArchObject, Archetype, CMapViewBasic> toolPalette = new ToolPalette<GameObject, MapArchObject, Archetype, CMapViewBasic>(editTypes, selectedSquareView, objectChooser, pickmapChooserControl, copyBuffer);
final LeftPanel<GameObject, MapArchObject, Archetype, CMapViewBasic> leftPanel = new LeftPanel<GameObject, MapArchObject, Archetype, CMapViewBasic>(objectChooser, toolPalette, objectChoiceDisplay);
mainView.init(gameObjectAttributesPanel, selectedSquareView, archetypeTypeSet, mapTileListBottom, gameObjectMatchers, archetypeChooserControl, objectChooser, leftPanel);
mapActions.updateMenuState();
Modified: trunk/src/app/net/sf/gridarta/gui/map/tools/SelectionTool.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/map/tools/SelectionTool.java 2008-08-03 23:12:36 UTC (rev 4748)
+++ trunk/src/app/net/sf/gridarta/gui/map/tools/SelectionTool.java 2008-08-03 23:15:48 UTC (rev 4749)
@@ -33,12 +33,10 @@
import net.sf.gridarta.gui.map.MapGrid;
import net.sf.gridarta.gui.map.MapViewBasic;
import net.sf.gridarta.gui.map.event.MouseOpEvent;
-import net.sf.gridarta.gui.objectchoicedisplay.ObjectChoiceDisplay;
import net.sf.gridarta.gui.objectchooser.ObjectChooser;
import net.sf.gridarta.gui.undo.SwingUtils;
import net.sf.gridarta.map.InsertionMode;
import net.sf.gridarta.map.MapArchObject;
-import net.sf.gridarta.map.MapControl;
import net.sf.japi.swing.ActionFactory;
import net.sf.japi.swing.ToggleAction;
import org.jetbrains.annotations.NotNull;
@@ -93,10 +91,6 @@
@NotNull
private final ObjectChooser<G, ?, ?> objectChooser;
- /** The object choice display to update. */
- @NotNull
- private final ObjectChoiceDisplay<G, ?, ?, ?> objectChoiceDisplay;
-
/**
* The copy buffer instance to use.
*/
@@ -111,13 +105,11 @@
/**
* Create a BasicAbstractTool.
* @param objectChooser the object chooser to update
- * @param objectChoiceDisplay the object choice display to update
* @param copyBuffer the copy buffer instance to use
*/
- public SelectionTool(@NotNull final ObjectChooser<G, ?, ?> objectChooser, @NotNull final ObjectChoiceDisplay<G, ?, ?, ?> objectChoiceDisplay, @NotNull final CopyBuffer<G, A, R, V> copyBuffer) {
+ public SelectionTool(@NotNull final ObjectChooser<G, ?, ?> objectChooser, @NotNull final CopyBuffer<G, A, R, V> copyBuffer) {
super("selection");
this.objectChooser = objectChooser;
- this.objectChoiceDisplay = objectChoiceDisplay;
this.copyBuffer = copyBuffer;
selectionToolAutoFillChanged();
}
@@ -128,7 +120,6 @@
final Point mapLoc = e.getMapLocation();
final int mod = e.getModifiers();
final MapCursor mapCursor = e.getMapCursor();
- final MapControl<G, A, R, V> mapControl = e.getMapControl();
// left mouse button: select tiles
// Throw away old selection if neither SHIFT nor CTRL is not pressed
if ((mod & (InputEvent.CTRL_DOWN_MASK | InputEvent.SHIFT_DOWN_MASK)) == 0) {
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 23:12:36 UTC (rev 4748)
+++ trunk/src/app/net/sf/gridarta/gui/map/tools/ToolPalette.java 2008-08-03 23:15:48 UTC (rev 4749)
@@ -31,7 +31,6 @@
import net.sf.gridarta.gameobject.GameObject;
import net.sf.gridarta.gui.map.MapViewBasic;
import net.sf.gridarta.gui.map.event.MouseOpEvent;
-import net.sf.gridarta.gui.objectchoicedisplay.ObjectChoiceDisplay;
import net.sf.gridarta.gui.objectchooser.ObjectChooser;
import net.sf.gridarta.gui.pickmapchooser.PickmapChooserControl;
import net.sf.gridarta.gui.selectedsquare.SelectedSquareView;
@@ -71,14 +70,13 @@
* @param selectedSquareView the selected square view
* @param objectChooser the object chooser to use
* @param pickmapChooserControl the pickmap chooser control to use
- * @param objectChoiceDisplay the object choice display to use
* @param copyBuffer the copy buffer instance to use
*/
- 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) {
+ 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 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", 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);
+ lmbSelector = new ToolSelector<G, A, R, V>("selection", editTypes, selectedSquareView, objectChooser, pickmapChooserControl, copyBuffer);
+ mmbSelector = new ToolSelector<G, A, R, V>("deletion", editTypes, selectedSquareView, objectChooser, pickmapChooserControl, copyBuffer);
+ rmbSelector = new ToolSelector<G, A, R, V>("insertion", editTypes, selectedSquareView, objectChooser, 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 23:12:36 UTC (rev 4748)
+++ trunk/src/app/net/sf/gridarta/gui/map/tools/ToolSelector.java 2008-08-03 23:15:48 UTC (rev 4749)
@@ -37,7 +37,6 @@
import net.sf.gridarta.gameobject.Archetype;
import net.sf.gridarta.gameobject.GameObject;
import net.sf.gridarta.gui.map.MapViewBasic;
-import net.sf.gridarta.gui.objectchoicedisplay.ObjectChoiceDisplay;
import net.sf.gridarta.gui.objectchooser.ObjectChooser;
import net.sf.gridarta.gui.pickmapchooser.PickmapChooserControl;
import net.sf.gridarta.gui.selectedsquare.SelectedSquareView;
@@ -92,13 +91,12 @@
* @param editTypes the edit types instance
* @param selectedSquareView the selected square view
* @param objectChooser the object chooser to use
- * @param objectChoiceDisplay the object choice display to use
* @param pickmapChooserControl the pickmap chooser control to use
* @param copyBuffer the copy buffer instance to use
*/
- 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) {
+ 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 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)}) {
+ for (final Tool<G, A, R, V> toolToAdd : new Tool[] {new VoidTool<G, A, R, V>(), new SelectionTool<G, A, R, V>(objectChooser, 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));
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
