Menu
▾
▴
[Gridarta-commit] SF.net SVN: gridarta:[4648] trunk
|
From: <aki...@us...> - 2008-07-31 22:50:46
|
Revision: 4648
http://gridarta.svn.sourceforge.net/gridarta/?rev=4648&view=rev
Author: akirschbaum
Date: 2008-07-31 22:50:50 +0000 (Thu, 31 Jul 2008)
Log Message:
-----------
Remove calls to MainControl.getAutojoinLists().
Modified Paths:
--------------
trunk/crossfire/src/cfeditor/CMainControl.java
trunk/crossfire/src/cfeditor/CrossfireObjectsFactory.java
trunk/daimonin/src/daieditor/CMainControl.java
trunk/daimonin/src/daieditor/DaimoninObjectsFactory.java
trunk/src/app/net/sf/gridarta/GridartaObjectsFactory.java
trunk/src/app/net/sf/gridarta/map/DefaultMapControl.java
trunk/src/app/net/sf/gridarta/map/DefaultMapModel.java
trunk/src/test/net/sf/gridarta/map/DefaultMapModelTest.java
Modified: trunk/crossfire/src/cfeditor/CMainControl.java
===================================================================
--- trunk/crossfire/src/cfeditor/CMainControl.java 2008-07-31 22:37:20 UTC (rev 4647)
+++ trunk/crossfire/src/cfeditor/CMainControl.java 2008-07-31 22:50:50 UTC (rev 4648)
@@ -330,7 +330,7 @@
mapActions.updateMenuState();
scriptControl.getView().setMenu((JMenu) ACTION_FACTORY.find(mainView.getJMenuBar(), "plugins"));
archetypeParser = new ArchetypeParser(gridartaObjectsFactory, archetypeChooserControl, animationObjects, archetypeSet);
- gridartaObjectsFactory.init(faceObjects, objectChooser, archetypeChooserControl, selectedSquareView, this, editTypes, getMapImageCache(), mapActions, archetypeParser, archetypeSet);
+ gridartaObjectsFactory.init(faceObjects, objectChooser, archetypeChooserControl, selectedSquareView, this, editTypes, getMapImageCache(), mapActions, archetypeParser, archetypeSet, autojoinLists);
archetypeSet.loadArchetypes(archetypeParser);
if (globalSettings.isAutoPopupDocu()) {
Modified: trunk/crossfire/src/cfeditor/CrossfireObjectsFactory.java
===================================================================
--- trunk/crossfire/src/cfeditor/CrossfireObjectsFactory.java 2008-07-31 22:37:20 UTC (rev 4647)
+++ trunk/crossfire/src/cfeditor/CrossfireObjectsFactory.java 2008-07-31 22:50:50 UTC (rev 4648)
@@ -33,6 +33,7 @@
import java.util.List;
import java.util.prefs.Preferences;
import net.sf.gridarta.AbstractMainControl;
+import net.sf.gridarta.AutojoinLists;
import net.sf.gridarta.EditTypes;
import net.sf.gridarta.GridartaObjectsFactory;
import net.sf.gridarta.MainControl;
@@ -104,6 +105,10 @@
@NotNull
private ArchetypeSet<GameObject, MapArchObject, Archetype> archetypeSet = null;
+ /** The {@link AutojoinLists} instance. */
+ @NotNull
+ private AutojoinLists<GameObject, MapArchObject, Archetype> autojoinLists = null;
+
/** {@inheritDoc} */
@NotNull
public GameObject newGameObject() {
@@ -145,13 +150,13 @@
/** {@inheritDoc} */
@NotNull
public MapControl<GameObject, MapArchObject, Archetype, CMapViewBasic> newMapControl(@Nullable final List<GameObject> objects, @NotNull final MapArchObject mapArchObject) {
- return new DefaultMapControl<GameObject, MapArchObject, Archetype, CMapViewBasic>(this, mainControl, mapImageCache, objects, mapArchObject, false, GameObjectMatchersInstance.getInstance().getMatcher("exit"), archetypeChooserControl, mapActions);
+ return new DefaultMapControl<GameObject, MapArchObject, Archetype, CMapViewBasic>(this, mainControl, autojoinLists, mapImageCache, objects, mapArchObject, false, GameObjectMatchersInstance.getInstance().getMatcher("exit"), archetypeChooserControl, mapActions);
}
/** {@inheritDoc} */
@NotNull
public MapControl<GameObject, MapArchObject, Archetype, CMapViewBasic> newPickmapControl(@Nullable final List<GameObject> objects, @NotNull final MapArchObject mapArchObject) {
- return new DefaultMapControl<GameObject, MapArchObject, Archetype, CMapViewBasic>(this, mainControl, mapImageCache, objects, mapArchObject, true, GameObjectMatchersInstance.getInstance().getMatcher("exit"), archetypeChooserControl, mapActions);
+ return new DefaultMapControl<GameObject, MapArchObject, Archetype, CMapViewBasic>(this, mainControl, autojoinLists, mapImageCache, objects, mapArchObject, true, GameObjectMatchersInstance.getInstance().getMatcher("exit"), archetypeChooserControl, mapActions);
}
/** {@inheritDoc} */
@@ -167,7 +172,7 @@
}
/** {@inheritDoc} */
- public void init(@NotNull final FaceObjects faceObjects, @NotNull final ObjectChooser<GameObject, MapArchObject, Archetype> objectChooser, @NotNull final ArchetypeChooserControl<GameObject, MapArchObject, Archetype, CMapViewBasic> archetypeChooserControl, @NotNull final SelectedSquareView<GameObject, MapArchObject, Archetype, CMapViewBasic> selectedSquareView, @NotNull final MainControl<GameObject, MapArchObject, Archetype, CMapViewBasic> mainControl, @NotNull final EditTypes<GameObject, MapArchObject, Archetype, CMapViewBasic> editTypes, @NotNull final MapImageCache<GameObject, MapArchObject, Archetype, CMapViewBasic> mapImageCache, @NotNull final MapActions mapActions, @NotNull final ArchetypeParser<GameObject, MapArchObject, Archetype> archetypeParser, @NotNull final ArchetypeSet<GameObject, MapArchObject, Archetype> archetypeSet) {
+ public void init(@NotNull final FaceObjects faceObjects, @NotNull final ObjectChooser<GameObject, MapArchObject, Archetype> objectChooser, @NotNull final ArchetypeChooserControl<GameObject, MapArchObject, Archetype, CMapViewBasic> archetypeChooserControl, @NotNull final SelectedSquareView<GameObject, MapArchObject, Archetype, CMapViewBasic> selectedSquareView, @NotNull final MainControl<GameObject, MapArchObject, Archetype, CMapViewBasic> mainControl, @NotNull final EditTypes<GameObject, MapArchObject, Archetype, CMapViewBasic> editTypes, @NotNull final MapImageCache<GameObject, MapArchObject, Archetype, CMapViewBasic> mapImageCache, @NotNull final MapActions mapActions, @NotNull final ArchetypeParser<GameObject, MapArchObject, Archetype> archetypeParser, @NotNull final ArchetypeSet<GameObject, MapArchObject, Archetype> archetypeSet, @NotNull final AutojoinLists<GameObject, MapArchObject, Archetype> autojoinLists) {
this.objectChooser = objectChooser;
this.archetypeChooserControl = archetypeChooserControl;
this.selectedSquareView = selectedSquareView;
@@ -177,6 +182,7 @@
this.mapActions = mapActions;
this.archetypeParser = archetypeParser;
this.archetypeSet = archetypeSet;
+ this.autojoinLists = autojoinLists;
}
} // class CrossfireObjectsFactory
Modified: trunk/daimonin/src/daieditor/CMainControl.java
===================================================================
--- trunk/daimonin/src/daieditor/CMainControl.java 2008-07-31 22:37:20 UTC (rev 4647)
+++ trunk/daimonin/src/daieditor/CMainControl.java 2008-07-31 22:50:50 UTC (rev 4648)
@@ -388,7 +388,7 @@
mainView.init(gameObjectAttributesPanel, selectedSquareView, archetypeTypeSet, mapTileListBottom, gameObjectMatchers, archetypeChooserControl, objectChooser);
mapActions.updateMenuState();
archetypeParser = new ArchetypeParser(archetypeChooserControl, animationObjects, archetypeSet);
- gridartaObjectsFactory.init(faceObjects, objectChooser, archetypeChooserControl, selectedSquareView, this, editTypes, getMapImageCache(), mapActions, archetypeParser, archetypeSet);
+ gridartaObjectsFactory.init(faceObjects, objectChooser, archetypeChooserControl, selectedSquareView, this, editTypes, getMapImageCache(), mapActions, archetypeParser, archetypeSet, autojoinLists);
archetypeSet.loadArchetypes(archetypeParser);
if (globalSettings.isAutoPopupDocu()) {
Modified: trunk/daimonin/src/daieditor/DaimoninObjectsFactory.java
===================================================================
--- trunk/daimonin/src/daieditor/DaimoninObjectsFactory.java 2008-07-31 22:37:20 UTC (rev 4647)
+++ trunk/daimonin/src/daieditor/DaimoninObjectsFactory.java 2008-07-31 22:50:50 UTC (rev 4648)
@@ -33,6 +33,7 @@
import java.util.List;
import java.util.prefs.Preferences;
import net.sf.gridarta.AbstractMainControl;
+import net.sf.gridarta.AutojoinLists;
import net.sf.gridarta.EditTypes;
import net.sf.gridarta.GridartaObjectsFactory;
import net.sf.gridarta.MainControl;
@@ -107,6 +108,10 @@
@NotNull
private ArchetypeSet<GameObject, MapArchObject, Archetype> archetypeSet = null;
+ /** The {@link AutojoinLists} instance. */
+ @NotNull
+ private AutojoinLists<GameObject, MapArchObject, Archetype> autojoinLists = null;
+
/** {@inheritDoc} */
@NotNull
public GameObject newGameObject() {
@@ -148,13 +153,13 @@
/** {@inheritDoc} */
@NotNull
public MapControl<GameObject, MapArchObject, Archetype, CMapViewBasic> newMapControl(@Nullable final List<GameObject> objects, @NotNull final MapArchObject mapArchObject) {
- return new DefaultMapControl<GameObject, MapArchObject, Archetype, CMapViewBasic>(this, mainControl, mapImageCache, objects, mapArchObject, false, GameObjectMatchersInstance.getInstance().getMatcher("exit"), archetypeChooserControl, mapActions);
+ return new DefaultMapControl<GameObject, MapArchObject, Archetype, CMapViewBasic>(this, mainControl, autojoinLists, mapImageCache, objects, mapArchObject, false, GameObjectMatchersInstance.getInstance().getMatcher("exit"), archetypeChooserControl, mapActions);
}
/** {@inheritDoc} */
@NotNull
public MapControl<GameObject, MapArchObject, Archetype, CMapViewBasic> newPickmapControl(@Nullable final List<GameObject> objects, @NotNull final MapArchObject mapArchObject) {
- final DefaultMapControl<GameObject, MapArchObject, Archetype, CMapViewBasic> mapControl = new DefaultMapControl<GameObject, MapArchObject, Archetype, CMapViewBasic>(this, mainControl, mapImageCache, objects, mapArchObject, true, GameObjectMatchersInstance.getInstance().getMatcher("exit"), archetypeChooserControl, mapActions);
+ final DefaultMapControl<GameObject, MapArchObject, Archetype, CMapViewBasic> mapControl = new DefaultMapControl<GameObject, MapArchObject, Archetype, CMapViewBasic>(this, mainControl, autojoinLists, mapImageCache, objects, mapArchObject, true, GameObjectMatchersInstance.getInstance().getMatcher("exit"), archetypeChooserControl, mapActions);
mapArchObject.setDifficulty(1);
return mapControl;
}
@@ -172,7 +177,7 @@
}
/** {@inheritDoc} */
- public void init(@NotNull final FaceObjects faceObjects, @NotNull final ObjectChooser<GameObject, MapArchObject, Archetype> objectChooser, @NotNull final ArchetypeChooserControl<GameObject, MapArchObject, Archetype, CMapViewBasic> archetypeChooserControl, @NotNull final SelectedSquareView<GameObject, MapArchObject, Archetype, CMapViewBasic> selectedSquareView, @NotNull final MainControl<GameObject, MapArchObject, Archetype, CMapViewBasic> mainControl, @NotNull final EditTypes<GameObject, MapArchObject, Archetype, CMapViewBasic> editTypes, @NotNull final MapImageCache<GameObject, MapArchObject, Archetype, CMapViewBasic> mapImageCache, @NotNull final MapActions mapActions, @NotNull final ArchetypeParser<GameObject, MapArchObject, Archetype> archetypeParser, @NotNull final ArchetypeSet<GameObject, MapArchObject, Archetype> archetypeSet) {
+ public void init(@NotNull final FaceObjects faceObjects, @NotNull final ObjectChooser<GameObject, MapArchObject, Archetype> objectChooser, @NotNull final ArchetypeChooserControl<GameObject, MapArchObject, Archetype, CMapViewBasic> archetypeChooserControl, @NotNull final SelectedSquareView<GameObject, MapArchObject, Archetype, CMapViewBasic> selectedSquareView, @NotNull final MainControl<GameObject, MapArchObject, Archetype, CMapViewBasic> mainControl, @NotNull final EditTypes<GameObject, MapArchObject, Archetype, CMapViewBasic> editTypes, @NotNull final MapImageCache<GameObject, MapArchObject, Archetype, CMapViewBasic> mapImageCache, @NotNull final MapActions mapActions, @NotNull final ArchetypeParser<GameObject, MapArchObject, Archetype> archetypeParser, @NotNull final ArchetypeSet<GameObject, MapArchObject, Archetype> archetypeSet, @NotNull final AutojoinLists<GameObject, MapArchObject, Archetype> autojoinLists) {
this.faceObjects = faceObjects;
this.objectChooser = objectChooser;
this.archetypeChooserControl = archetypeChooserControl;
@@ -183,6 +188,7 @@
this.mapActions = mapActions;
this.archetypeParser = archetypeParser;
this.archetypeSet = archetypeSet;
+ this.autojoinLists = autojoinLists;
}
} // class DaimoninObjectsFactory
Modified: trunk/src/app/net/sf/gridarta/GridartaObjectsFactory.java
===================================================================
--- trunk/src/app/net/sf/gridarta/GridartaObjectsFactory.java 2008-07-31 22:37:20 UTC (rev 4647)
+++ trunk/src/app/net/sf/gridarta/GridartaObjectsFactory.java 2008-07-31 22:50:50 UTC (rev 4648)
@@ -143,7 +143,8 @@
* @param mapActions the map actions instance
* @param archetypeParser the archetype parser instance
* @param archetypeSet the archetype set instance
+ * @param autojoinLists the autojoin lists instance
*/
- void init(@NotNull FaceObjects faceObjects, @NotNull ObjectChooser<G, A, R> objectChooser, @NotNull ArchetypeChooserControl<G, A, R, V> archetypeChooserControl, @NotNull final SelectedSquareView<G, A, R, V> selectedSquareView, @NotNull MainControl<G, A, R, V> mainControl, @NotNull EditTypes<G, A, R, V> editTypes, @NotNull MapImageCache<G, A, R, V> mapImageCache, @NotNull MapActions mapActions, @NotNull ArchetypeParser<G, A, R> archetypeParser, @NotNull ArchetypeSet<G, A, R> archetypeSet);
+ void init(@NotNull FaceObjects faceObjects, @NotNull ObjectChooser<G, A, R> objectChooser, @NotNull ArchetypeChooserControl<G, A, R, V> archetypeChooserControl, @NotNull final SelectedSquareView<G, A, R, V> selectedSquareView, @NotNull MainControl<G, A, R, V> mainControl, @NotNull EditTypes<G, A, R, V> editTypes, @NotNull MapImageCache<G, A, R, V> mapImageCache, @NotNull MapActions mapActions, @NotNull ArchetypeParser<G, A, R> archetypeParser, @NotNull ArchetypeSet<G, A, R> archetypeSet, @NotNull final AutojoinLists<G, A, R> autojoinLists);
} // interface GridartaObjectsFactory
Modified: trunk/src/app/net/sf/gridarta/map/DefaultMapControl.java
===================================================================
--- trunk/src/app/net/sf/gridarta/map/DefaultMapControl.java 2008-07-31 22:37:20 UTC (rev 4647)
+++ trunk/src/app/net/sf/gridarta/map/DefaultMapControl.java 2008-07-31 22:50:50 UTC (rev 4648)
@@ -27,6 +27,7 @@
import java.util.LinkedList;
import java.util.List;
import javax.swing.event.EventListenerList;
+import net.sf.gridarta.AutojoinLists;
import net.sf.gridarta.CommonConstants;
import net.sf.gridarta.GridartaObjectsFactory;
import net.sf.gridarta.MainControl;
@@ -149,6 +150,7 @@
* Creates a new instance.
* @param gridartaObjectsFactory the gridarta objects factory instance
* @param mainControl the main control
+ * @param autojoinLists the autojoin lists instance to use
* @param mapImageCache the map image cache instance
* @param objects the game objects to insert; my be <code>null</code>
* @param mapArchObject the map arch object for this map
@@ -157,13 +159,13 @@
* @param archetypeChooserControl the archeype chooser control to use
* @param mapActions the map actions to use
*/
- public DefaultMapControl(@NotNull final GridartaObjectsFactory<G, A, R, V> gridartaObjectsFactory, @NotNull final MainControl<G, A, R, V> mainControl, @NotNull final MapImageCache<G, A, R, V> mapImageCache, @Nullable final List<G> objects, @NotNull final A mapArchObject, final boolean isPickmap, @Nullable final GameObjectMatcher exitTypeGameObjectMatcher, @NotNull final ArchetypeChooserControl<G, A, R, V> archetypeChooserControl, @NotNull final MapActions mapActions) {
+ public DefaultMapControl(@NotNull final GridartaObjectsFactory<G, A, R, V> gridartaObjectsFactory, @NotNull final MainControl<G, A, R, V> mainControl, @NotNull final AutojoinLists<G, A, R> autojoinLists, @NotNull final MapImageCache<G, A, R, V> mapImageCache, @Nullable final List<G> objects, @NotNull final A mapArchObject, final boolean isPickmap, @Nullable final GameObjectMatcher exitTypeGameObjectMatcher, @NotNull final ArchetypeChooserControl<G, A, R, V> archetypeChooserControl, @NotNull final MapActions mapActions) {
this.gridartaObjectsFactory = gridartaObjectsFactory;
this.mainControl = mainControl;
this.mapImageCache = mapImageCache;
this.isPickmap = isPickmap;
// we create model (= data)
- mapModel = new DefaultMapModel<G, A, R>(mainControl, this, objects, mapArchObject, exitTypeGameObjectMatcher, archetypeChooserControl, mapActions);
+ mapModel = new DefaultMapModel<G, A, R>(mainControl, autojoinLists, this, objects, mapArchObject, exitTypeGameObjectMatcher, archetypeChooserControl, mapActions);
mapModel.addMapModelListener(mapModelListener);
}
Modified: trunk/src/app/net/sf/gridarta/map/DefaultMapModel.java
===================================================================
--- trunk/src/app/net/sf/gridarta/map/DefaultMapModel.java 2008-07-31 22:37:20 UTC (rev 4647)
+++ trunk/src/app/net/sf/gridarta/map/DefaultMapModel.java 2008-07-31 22:50:50 UTC (rev 4648)
@@ -27,6 +27,7 @@
import java.util.Set;
import javax.swing.event.EventListenerList;
import net.sf.gridarta.AutojoinList;
+import net.sf.gridarta.AutojoinLists;
import net.sf.gridarta.MainControl;
import net.sf.gridarta.MapActions;
import net.sf.gridarta.Size2D;
@@ -88,6 +89,9 @@
private final transient MainControl<G, A, R, ?> mainControl;
@NotNull
+ private final AutojoinLists<G, A, R> autojoinLists;
+
+ @NotNull
private final ArchetypeChooserControl<G, A, R, ?> archetypeChooserControl;
/** The {@link GameObjectMatcher} for selecting exit objects. */
@@ -147,6 +151,7 @@
/**
* Create an DefaultMapModel.
* @param mainControl main controller
+ * @param autojoinLists the autojoin lists instance to use
* @param mapControl MapControl to associate with this model.
* @param objects the <code>GameObject</code> list of this map or
* <code>null</code> for an empty map
@@ -155,10 +160,11 @@
* @param archetypeChooserControl the archetype chooser control
* @param mapActions the map actions to use
*/
- public DefaultMapModel(@NotNull final MainControl<G, A, R, ?> mainControl, @NotNull final MapControl<G, A, R, ?> mapControl, @Nullable final List<G> objects, @NotNull final A mapArchObject, @Nullable final GameObjectMatcher exitTypeGameObjectMatcher, @NotNull final ArchetypeChooserControl<G, A, R, ?> archetypeChooserControl, @NotNull final MapActions mapActions) {
+ public DefaultMapModel(@NotNull final MainControl<G, A, R, ?> mainControl, @NotNull final AutojoinLists<G, A, R> autojoinLists, @NotNull final MapControl<G, A, R, ?> mapControl, @Nullable final List<G> objects, @NotNull final A mapArchObject, @Nullable final GameObjectMatcher exitTypeGameObjectMatcher, @NotNull final ArchetypeChooserControl<G, A, R, ?> archetypeChooserControl, @NotNull final MapActions mapActions) {
this.mapControl = mapControl;
this.mapArchObject = mapArchObject;
this.mainControl = mainControl;
+ this.autojoinLists = autojoinLists;
this.archetypeChooserControl = archetypeChooserControl;
this.exitTypeGameObjectMatcher = exitTypeGameObjectMatcher;
this.mapActions = mapActions;
@@ -602,7 +608,7 @@
// do autojoining
final R archetype = gameObject.getArchetype();
if (mapActions.isAutoJoin() && join && !archetype.isMulti()) {
- final AutojoinList<G, A, R> autojoinList = mainControl.getAutojoinLists().getAutojoinList(archetype);
+ final AutojoinList<G, A, R> autojoinList = autojoinLists.getAutojoinList(archetype);
if (autojoinList != null) {
// remove connections to the deleted arch
autojoinList.joinDelete(this, new Point(mapSquare.getMapX(), mapSquare.getMapY()));
@@ -719,7 +725,7 @@
}
if (mapActions.isAutoJoin() && join && !archetype.isMulti()) {
- final AutojoinList<G, A, R> autojoinList = mainControl.getAutojoinLists().getAutojoinList(archetype);
+ final AutojoinList<G, A, R> autojoinList = autojoinLists.getAutojoinList(archetype);
if (autojoinList != null) {
// do autojoining if enabled
archetype = autojoinList.joinInsert(this, pos);
Modified: trunk/src/test/net/sf/gridarta/map/DefaultMapModelTest.java
===================================================================
--- trunk/src/test/net/sf/gridarta/map/DefaultMapModelTest.java 2008-07-31 22:37:20 UTC (rev 4647)
+++ trunk/src/test/net/sf/gridarta/map/DefaultMapModelTest.java 2008-07-31 22:50:50 UTC (rev 4648)
@@ -29,6 +29,7 @@
import javax.swing.ImageIcon;
import javax.swing.JList;
import net.sf.gridarta.AbstractMainControl;
+import net.sf.gridarta.AutojoinLists;
import net.sf.gridarta.DefaultMapManager;
import net.sf.gridarta.EditTypes;
import net.sf.gridarta.GlobalSettings;
@@ -386,8 +387,9 @@
final MapManager<TestGameObject, TestMapArchObject, TestArchetype, TestMapViewBasic> mapManager = new DefaultMapManager<TestGameObject, TestMapArchObject, TestArchetype, TestMapViewBasic>(mainControl, "test");
final MapImageCache<TestGameObject, TestMapArchObject, TestArchetype, TestMapViewBasic> mapImageCache = new MapImageCache<TestGameObject, TestMapArchObject, TestArchetype, TestMapViewBasic>(null, mapManager, null, new ImageIcon(), new ImageIcon());
final MapActions mapActions = new TestMapActions();
- final TestMapControl mapControl = new TestMapControl(gridartaObjectsFactory, mainControl, mapImageCache, null, mapArchObject, false, null, archetypeChooserControl, mapActions);
- mapModel = new DefaultMapModel<TestGameObject, TestMapArchObject, TestArchetype>(mainControl, mapControl, null, mapArchObject, null, archetypeChooserControl, mapActions);
+ final AutojoinLists<TestGameObject, TestMapArchObject, TestArchetype> autojoinLists = new AutojoinLists<TestGameObject, TestMapArchObject, TestArchetype>();
+ final TestMapControl mapControl = new TestMapControl(gridartaObjectsFactory, mainControl, autojoinLists, mapImageCache, null, mapArchObject, false, null, archetypeChooserControl, mapActions);
+ mapModel = new DefaultMapModel<TestGameObject, TestMapArchObject, TestArchetype>(mainControl, autojoinLists, mapControl, null, mapArchObject, null, archetypeChooserControl, mapActions);
result.setLength(0);
mapModel.addMapModelListener(mapModelListener);
@@ -509,8 +511,8 @@
* @param archetypeChooserControl the archetype chooser control to use
* @param mapActions the map actions to use
*/
- public TestMapControl(@NotNull final GridartaObjectsFactory<TestGameObject, TestMapArchObject, TestArchetype, TestMapViewBasic> gridartaObjectsFactory, @NotNull final MainControl<TestGameObject, TestMapArchObject, TestArchetype, TestMapViewBasic> mainControl, @NotNull final MapImageCache<TestGameObject, TestMapArchObject, TestArchetype, TestMapViewBasic> mapImageCache, @Nullable final List<TestGameObject> objects, @NotNull final TestMapArchObject mapArchObject, final boolean isPickmap, @Nullable final GameObjectMatcher exitTypeGameObjectMatcher, @NotNull final ArchetypeChooserControl<TestGameObject, TestMapArchObject, TestArchetype, TestMapViewBasic> archetypeChooserControl, @NotNull final MapActions mapActions) {
- super(gridartaObjectsFactory, mainControl, mapImageCache, objects, mapArchObject, isPickmap, exitTypeGameObjectMatcher, archetypeChooserControl, mapActions);
+ public TestMapControl(@NotNull final GridartaObjectsFactory<TestGameObject, TestMapArchObject, TestArchetype, TestMapViewBasic> gridartaObjectsFactory, @NotNull final MainControl<TestGameObject, TestMapArchObject, TestArchetype, TestMapViewBasic> mainControl, @NotNull final AutojoinLists<TestGameObject, TestMapArchObject, TestArchetype> autojoinLists, @NotNull final MapImageCache<TestGameObject, TestMapArchObject, TestArchetype, TestMapViewBasic> mapImageCache, @Nullable final List<TestGameObject> objects, @NotNull final TestMapArchObject mapArchObject, final boolean isPickmap, @Nullable final GameObjectMatcher exitTypeGameObjectMatcher, @NotNull final ArchetypeChooserControl<TestGameObject, TestMapArchObject, TestArchetype, TestMapViewBasic> archetypeChooserControl, @NotNull final MapActions mapActions) {
+ super(gridartaObjectsFactory, mainControl, autojoinLists, mapImageCache, objects, mapArchObject, isPickmap, exitTypeGameObjectMatcher, archetypeChooserControl, mapActions);
}
}
@@ -899,7 +901,7 @@
}
/** {@inheritDoc} */
- public void init(@NotNull final FaceObjects faceObjects, @NotNull final ObjectChooser<TestGameObject, TestMapArchObject, TestArchetype> testGameObjectTestMapArchObjectTestArchetypeObjectChooser, @NotNull final ArchetypeChooserControl<TestGameObject, TestMapArchObject, TestArchetype, TestMapViewBasic> testGameObjectTestMapArchObjectTestArchetypeTestMapViewBasicArchetypeChooserControl, @NotNull final SelectedSquareView<TestGameObject, TestMapArchObject, TestArchetype, TestMapViewBasic> selectedSquareView, @NotNull final MainControl<TestGameObject, TestMapArchObject, TestArchetype, TestMapViewBasic> mainControl, @NotNull final EditTypes<TestGameObject, TestMapArchObject, TestArchetype, TestMapViewBasic> editTypes, @NotNull final MapImageCache<TestGameObject, TestMapArchObject, TestArchetype, TestMapViewBasic> mapImageCache, @NotNull final MapActions mapActions, @NotNull final ArchetypeParser<TestGameObject, TestMapArchObject, TestArchetype> archetypeParser, @NotNull final ArchetypeSet<TestGameObject, TestMapArchObject, TestArchetype> archetypeSet) {
+ public void init(@NotNull final FaceObjects faceObjects, @NotNull final ObjectChooser<TestGameObject, TestMapArchObject, TestArchetype> testGameObjectTestMapArchObjectTestArchetypeObjectChooser, @NotNull final ArchetypeChooserControl<TestGameObject, TestMapArchObject, TestArchetype, TestMapViewBasic> testGameObjectTestMapArchObjectTestArchetypeTestMapViewBasicArchetypeChooserControl, @NotNull final SelectedSquareView<TestGameObject, TestMapArchObject, TestArchetype, TestMapViewBasic> selectedSquareView, @NotNull final MainControl<TestGameObject, TestMapArchObject, TestArchetype, TestMapViewBasic> mainControl, @NotNull final EditTypes<TestGameObject, TestMapArchObject, TestArchetype, TestMapViewBasic> editTypes, @NotNull final MapImageCache<TestGameObject, TestMapArchObject, TestArchetype, TestMapViewBasic> mapImageCache, @NotNull final MapActions mapActions, @NotNull final ArchetypeParser<TestGameObject, TestMapArchObject, TestArchetype> archetypeParser, @NotNull final ArchetypeSet<TestGameObject, TestMapArchObject, TestArchetype> archetypeSet, @NotNull final AutojoinLists<TestGameObject, TestMapArchObject, TestArchetype> autojoinLists) {
throw new AssertionError();
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
