Menu
▾
▴
[Gridarta-commit] SF.net SVN: gridarta: [4255] trunk
|
From: <aki...@us...> - 2008-07-08 18:48:23
|
Revision: 4255
http://gridarta.svn.sourceforge.net/gridarta/?rev=4255&view=rev
Author: akirschbaum
Date: 2008-07-08 11:47:32 -0700 (Tue, 08 Jul 2008)
Log Message:
-----------
Remove unused code.
Modified Paths:
--------------
trunk/crossfire/src/cfeditor/CMainControl.java
trunk/crossfire/src/cfeditor/gui/GameObjectAttributesPanel.java
trunk/daimonin/src/daieditor/CMainControl.java
trunk/daimonin/src/daieditor/gui/GameObjectAttributesPanel.java
trunk/src/app/net/sf/gridarta/CurrentMapListener.java
trunk/src/app/net/sf/gridarta/gui/GameObjectAttributesPanel.java
trunk/src/app/net/sf/gridarta/gui/MainView.java
trunk/src/app/net/sf/gridarta/gui/selectedsquare/SelectedSquareControl.java
trunk/src/app/net/sf/gridarta/treasurelist/TreasureCellRenderer.java
Modified: trunk/crossfire/src/cfeditor/CMainControl.java
===================================================================
--- trunk/crossfire/src/cfeditor/CMainControl.java 2008-07-08 18:29:46 UTC (rev 4254)
+++ trunk/crossfire/src/cfeditor/CMainControl.java 2008-07-08 18:47:32 UTC (rev 4255)
@@ -285,7 +285,7 @@
AbstractScriptArchEditor.initEventTypeBoxes(".py", "Python", ScriptArchUtils.createEventTypeBox());
final boolean mapTileListBottom = prefs.getBoolean(MainView.MAP_TILE_LIST_BOTTOM_KEY, MainView.MAP_TILE_LIST_BOTTOM_DEFAULT);
- selectedSquareControl = new SelectedSquareControl<GameObject, MapArchObject, Archetype, CMapViewBasic>(ACTION_FACTORY, this, mainView, mapTileListBottom, null);
+ selectedSquareControl = new SelectedSquareControl<GameObject, MapArchObject, Archetype, CMapViewBasic>(ACTION_FACTORY, this, mapTileListBottom, null);
// Initialize the main view
final GameObjectMatcher monsterMatcher = gameObjectMatchers.getMatcher("monster");
if (monsterMatcher == null) {
@@ -293,7 +293,7 @@
throw new MissingResourceException("GameObjectMatcher 'monster' does not exist", null, null);
}
final LockedItemsControl<GameObject, MapArchObject, Archetype, CMapViewBasic> lockedItemsControl = new LockedItemsControl<GameObject, MapArchObject, Archetype, CMapViewBasic>(getMapManager(), Archetype.TYPE_LOCKED_DOOR, Archetype.TYPE_SPECIAL_KEY, Archetype.TYPE_TRIGGER_ALTAR, Archetype.TYPE_DETECTOR, Archetype.TYPE_TRIGGER_MARKER, Archetype.TYPE_MARKER, Archetype.TYPE_INVENTORY_CHECKER, Archetype.TYPE_CONTAINER);
- final GameObjectAttributesPanel gameObjectAttributesPanel = new GameObjectAttributesPanel(this, getMapManager(), mainView, lockedItemsControl, monsterMatcher);
+ final GameObjectAttributesPanel gameObjectAttributesPanel = new GameObjectAttributesPanel(this, getMapManager(), lockedItemsControl, monsterMatcher);
mainView.init(gameObjectAttributesPanel, selectedSquareControl.getSelectedSquareView(), typeList, mapTileListBottom, gameObjectMatchers);
mapActions.updateMenuState();
scriptControl.getView().setMenu((JMenu) ACTION_FACTORY.find(mainView.getJMenuBar(), "plugins"));
Modified: trunk/crossfire/src/cfeditor/gui/GameObjectAttributesPanel.java
===================================================================
--- trunk/crossfire/src/cfeditor/gui/GameObjectAttributesPanel.java 2008-07-08 18:29:46 UTC (rev 4254)
+++ trunk/crossfire/src/cfeditor/gui/GameObjectAttributesPanel.java 2008-07-08 18:47:32 UTC (rev 4255)
@@ -26,7 +26,6 @@
import net.sf.gridarta.MainControl;
import net.sf.gridarta.MapManager;
import net.sf.gridarta.gameobject.match.GameObjectMatcher;
-import net.sf.gridarta.gui.MainView;
import net.sf.gridarta.gui.connectionview.LockedItemsControl;
import org.jetbrains.annotations.NotNull;
@@ -43,8 +42,8 @@
private static final long serialVersionUID = 1L;
/* Build Panel */
- public GameObjectAttributesPanel(final MainControl<GameObject, MapArchObject, Archetype, CMapViewBasic> mainControl, final MapManager<GameObject, MapArchObject, Archetype, CMapViewBasic> mapManager, final MainView<GameObject, MapArchObject, Archetype, CMapViewBasic> view, final LockedItemsControl<GameObject, MapArchObject, Archetype, CMapViewBasic> lockedItemsControl, @NotNull final GameObjectMatcher monsterMatcher) {
- super(mainControl, mapManager, view, lockedItemsControl, monsterMatcher);
+ public GameObjectAttributesPanel(final MainControl<GameObject, MapArchObject, Archetype, CMapViewBasic> mainControl, final MapManager<GameObject, MapArchObject, Archetype, CMapViewBasic> mapManager, final LockedItemsControl<GameObject, MapArchObject, Archetype, CMapViewBasic> lockedItemsControl, @NotNull final GameObjectMatcher monsterMatcher) {
+ super(mainControl, mapManager, lockedItemsControl, monsterMatcher);
}
/** {@inheritDoc} */
Modified: trunk/daimonin/src/daieditor/CMainControl.java
===================================================================
--- trunk/daimonin/src/daieditor/CMainControl.java 2008-07-08 18:29:46 UTC (rev 4254)
+++ trunk/daimonin/src/daieditor/CMainControl.java 2008-07-08 18:47:32 UTC (rev 4255)
@@ -341,7 +341,7 @@
AbstractScriptArchEditor.initEventTypeBoxes(".lua", "Lua", ScriptArchUtils.createEventTypeBox());
final boolean mapTileListBottom = prefs.getBoolean(MainView.MAP_TILE_LIST_BOTTOM_KEY, MainView.MAP_TILE_LIST_BOTTOM_DEFAULT);
- selectedSquareControl = new SelectedSquareControl<GameObject, MapArchObject, Archetype, CMapViewBasic>(ACTION_FACTORY, this, mainView, mapTileListBottom, GUIUtils.getSysIcon(IGUIConstants.TILE_NORTH));
+ selectedSquareControl = new SelectedSquareControl<GameObject, MapArchObject, Archetype, CMapViewBasic>(ACTION_FACTORY, this, mapTileListBottom, GUIUtils.getSysIcon(IGUIConstants.TILE_NORTH));
// Initialize the main view
final GameObjectMatcher monsterMatcher = gameObjectMatchers.getMatcher("monster");
if (monsterMatcher == null) {
@@ -349,7 +349,7 @@
throw new MissingResourceException("GameObjectMatcher 'monster' does not exist", null, null);
}
final LockedItemsControl<GameObject, MapArchObject, Archetype, CMapViewBasic> lockedItemsControl = new LockedItemsControl<GameObject, MapArchObject, Archetype, CMapViewBasic>(getMapManager(), 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);
- final GameObjectAttributesPanel gameObjectAttributesPanel = new GameObjectAttributesPanel(this, getMapManager(), mainView, lockedItemsControl, monsterMatcher);
+ final GameObjectAttributesPanel gameObjectAttributesPanel = new GameObjectAttributesPanel(this, getMapManager(), lockedItemsControl, monsterMatcher);
mainView.init(gameObjectAttributesPanel, selectedSquareControl.getSelectedSquareView(), typeList, mapTileListBottom, gameObjectMatchers);
mapActions.updateMenuState();
archetypeParser = new ArchetypeParser(this, objectChooser.getArchetypeChooserControl(), animationObjects);
Modified: trunk/daimonin/src/daieditor/gui/GameObjectAttributesPanel.java
===================================================================
--- trunk/daimonin/src/daieditor/gui/GameObjectAttributesPanel.java 2008-07-08 18:29:46 UTC (rev 4254)
+++ trunk/daimonin/src/daieditor/gui/GameObjectAttributesPanel.java 2008-07-08 18:47:32 UTC (rev 4255)
@@ -26,7 +26,6 @@
import net.sf.gridarta.MainControl;
import net.sf.gridarta.MapManager;
import net.sf.gridarta.gameobject.match.GameObjectMatcher;
-import net.sf.gridarta.gui.MainView;
import net.sf.gridarta.gui.connectionview.LockedItemsControl;
import org.jetbrains.annotations.NotNull;
@@ -43,8 +42,8 @@
private static final long serialVersionUID = 1L;
/* Build Panel */
- public GameObjectAttributesPanel(final MainControl<GameObject, MapArchObject, Archetype, CMapViewBasic> mainControl, final MapManager<GameObject, MapArchObject, Archetype, CMapViewBasic> mapManager, final MainView<GameObject, MapArchObject, Archetype, CMapViewBasic> view, final LockedItemsControl<GameObject, MapArchObject, Archetype, CMapViewBasic> lockedItemsControl, @NotNull final GameObjectMatcher monsterMatcher) {
- super(mainControl, mapManager, view, lockedItemsControl, monsterMatcher);
+ public GameObjectAttributesPanel(final MainControl<GameObject, MapArchObject, Archetype, CMapViewBasic> mainControl, final MapManager<GameObject, MapArchObject, Archetype, CMapViewBasic> mapManager, final LockedItemsControl<GameObject, MapArchObject, Archetype, CMapViewBasic> lockedItemsControl, @NotNull final GameObjectMatcher monsterMatcher) {
+ super(mainControl, mapManager, lockedItemsControl, monsterMatcher);
}
/** {@inheritDoc} */
Modified: trunk/src/app/net/sf/gridarta/CurrentMapListener.java
===================================================================
--- trunk/src/app/net/sf/gridarta/CurrentMapListener.java 2008-07-08 18:29:46 UTC (rev 4254)
+++ trunk/src/app/net/sf/gridarta/CurrentMapListener.java 2008-07-08 18:47:32 UTC (rev 4255)
@@ -37,17 +37,13 @@
*/
public abstract class CurrentMapListener<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>, V extends MapViewBasic<G, A, R>> {
- /** The main control. */
- @NotNull
- private final MainControl<G, A, R, V> mainControl;
-
/** The map manager. */
@NotNull
private final MapManager<G, A, R, V> mapManager;
/**
- * The map control to track, or <code>null</code> if {@link #mainControl}'s
- * current map is tracked.
+ * The map control to track, or <code>null</code> if the current map is
+ * tracked.
*/
@Nullable
private final MapControl<G, A, R, V> mapControl;
@@ -118,7 +114,7 @@
};
/**
- * The map manager listener which is attached to {@link #mainControl} if the
+ * The map manager listener which is attached to the current map if the
* current map is tracked. Otherwise it is unused.
*/
private final MapManagerListener<G, A, R, V> mapManagerListener = new MapManagerListener<G, A, R, V>() {
@@ -183,7 +179,6 @@
* current map view
*/
protected CurrentMapListener(@NotNull final MainControl<G, A, R, V> mainControl, @NotNull final MapManager<G, A, R, V> mapManager, @Nullable final MapControl<G, A, R, V> mapControl, final boolean trackMapModified, final boolean trackMapFileName, final boolean trackMapCursor) {
- this.mainControl = mainControl;
this.mapManager = mapManager;
this.mapControl = mapControl;
this.trackMapModified = trackMapModified;
Modified: trunk/src/app/net/sf/gridarta/gui/GameObjectAttributesPanel.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/GameObjectAttributesPanel.java 2008-07-08 18:29:46 UTC (rev 4254)
+++ trunk/src/app/net/sf/gridarta/gui/GameObjectAttributesPanel.java 2008-07-08 18:47:32 UTC (rev 4255)
@@ -129,8 +129,6 @@
private static final String MAPARCHPANEL_LOCATION_KEY = "MainWindowMapArchPanel.dividerLocation";
- private final MainView<G, A, R, V> mainView;
-
/**
* The buttons for the direction panel.
* @see #directionButtonGroup
@@ -266,12 +264,11 @@
* @param monsterMatcher the <code>GameObjectMatcher</code> for matching
* monster objects
*/
- protected GameObjectAttributesPanel(@NotNull final MainControl<G, A, R, V> mainControl, @NotNull final MapManager<G, A, R, V> mapManager, final MainView<G, A, R, V> mainView, final LockedItemsControl<G, A, R, V> lockedItemsControl, @NotNull final GameObjectMatcher monsterMatcher) {
+ protected GameObjectAttributesPanel(@NotNull final MainControl<G, A, R, V> mainControl, @NotNull final MapManager<G, A, R, V> mapManager, final LockedItemsControl<G, A, R, V> lockedItemsControl, @NotNull final GameObjectMatcher monsterMatcher) {
super(new BorderLayout());
this.mainControl = mainControl;
this.mapManager = mapManager;
errorListView = new ErrorListView<G, A, R, V>(mapManager, mainControl.getSelectedSquareControl().getSelectedSquareView());
- this.mainView = mainView;
gameObjectTextEditor = new GameObjectTextEditor();
Modified: trunk/src/app/net/sf/gridarta/gui/MainView.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/MainView.java 2008-07-08 18:29:46 UTC (rev 4254)
+++ trunk/src/app/net/sf/gridarta/gui/MainView.java 2008-07-08 18:47:32 UTC (rev 4255)
@@ -151,9 +151,6 @@
/** Action Factory to create Actions. */
private final ActionFactory actionFactory;
- /** The controller of this view. */
- private final MainControl<G, A, R, V> mainControl;
-
/** The panel that contains the object chooser. */
private final AbstractObjectChooser<G, A, R, V> objectChooser;
@@ -255,7 +252,6 @@
}
});
- this.mainControl = mainControl;
this.objectChooser = objectChooser;
this.actionFactory = actionFactory;
this.aCloseAll = aCloseAll;
Modified: trunk/src/app/net/sf/gridarta/gui/selectedsquare/SelectedSquareControl.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/selectedsquare/SelectedSquareControl.java 2008-07-08 18:29:46 UTC (rev 4254)
+++ trunk/src/app/net/sf/gridarta/gui/selectedsquare/SelectedSquareControl.java 2008-07-08 18:47:32 UTC (rev 4255)
@@ -29,7 +29,6 @@
import net.sf.gridarta.MainControl;
import net.sf.gridarta.gameobject.Archetype;
import net.sf.gridarta.gameobject.GameObject;
-import net.sf.gridarta.gui.MainView;
import net.sf.gridarta.gui.map.MapView;
import net.sf.gridarta.gui.map.MapViewBasic;
import net.sf.gridarta.map.MapArchObject;
@@ -54,8 +53,6 @@
/** Controller of this subview. */
private final MainControl<G, A, R, V> mainControl;
- private final MainView<G, A, R, V> mainView;
-
/** The view for this controller. */
private final SelectedSquareView<G, A, R, V> view;
@@ -84,15 +81,13 @@
* Create a SelectedSquareControl.
* @param actionFactory the action factory
* @param mainControl MainControl, used for icons
- * @param mainView MainView, used for updating UI
* @param mapTileListBottom set if the map tile list should be at the bottom
* or on the top of the main view
* @param compassIcon If non-<code>null</code>, display this icon on the top
* of the list
*/
- public SelectedSquareControl(@NotNull final ActionFactory actionFactory, final MainControl<G, A, R, V> mainControl, final MainView<G, A, R, V> mainView, final boolean mapTileListBottom, @Nullable final ImageIcon compassIcon) {
+ public SelectedSquareControl(@NotNull final ActionFactory actionFactory, final MainControl<G, A, R, V> mainControl, final boolean mapTileListBottom, @Nullable final ImageIcon compassIcon) {
this.mainControl = mainControl;
- this.mainView = mainView;
view = new SelectedSquareView<G, A, R, V>(actionFactory, this, mainControl, mapTileListBottom, compassIcon);
}
Modified: trunk/src/app/net/sf/gridarta/treasurelist/TreasureCellRenderer.java
===================================================================
--- trunk/src/app/net/sf/gridarta/treasurelist/TreasureCellRenderer.java 2008-07-08 18:29:46 UTC (rev 4254)
+++ trunk/src/app/net/sf/gridarta/treasurelist/TreasureCellRenderer.java 2008-07-08 18:47:32 UTC (rev 4255)
@@ -58,8 +58,6 @@
private final ImageIcon noIcon; // icon for "NO" objects
- private final ImageIcon noface; // icon for faceless arches
-
private final ImageIcon noarch; // icon for unknown arches
/**
@@ -74,7 +72,6 @@
tlistOneIcon = GUIUtils.getSysIcon(GUIConstants.TILE_TREASUREONE);
yesIcon = GUIUtils.getSysIcon(GUIConstants.TILE_TR_YES);
noIcon = GUIUtils.getSysIcon(GUIConstants.TILE_TR_NO);
- noface = GUIUtils.getSysIcon(GUIConstants.TILE_NOFACE);
noarch = GUIUtils.getSysIcon(GUIConstants.TILE_NOARCH);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
