Menu
▾
▴
[Gridarta-commit] SF.net SVN: gridarta:[4683] trunk
|
From: <aki...@us...> - 2008-08-01 22:50:52
|
Revision: 4683
http://gridarta.svn.sourceforge.net/gridarta/?rev=4683&view=rev
Author: akirschbaum
Date: 2008-08-01 22:50:55 +0000 (Fri, 01 Aug 2008)
Log Message:
-----------
Remove calls to MainControl.getGridartaObjectsFactory().
Modified Paths:
--------------
trunk/crossfire/src/cfeditor/CrossfireObjectsFactory.java
trunk/daimonin/src/daieditor/DaimoninObjectsFactory.java
trunk/src/app/net/sf/gridarta/io/DefaultMapWriter.java
trunk/src/app/net/sf/gridarta/map/DefaultMapControl.java
trunk/src/test/net/sf/gridarta/map/DefaultMapModelTest.java
Modified: trunk/crossfire/src/cfeditor/CrossfireObjectsFactory.java
===================================================================
--- trunk/crossfire/src/cfeditor/CrossfireObjectsFactory.java 2008-08-01 22:46:48 UTC (rev 4682)
+++ trunk/crossfire/src/cfeditor/CrossfireObjectsFactory.java 2008-08-01 22:50:55 UTC (rev 4683)
@@ -151,13 +151,13 @@
/** {@inheritDoc} */
@NotNull
public MapControl<GameObject, MapArchObject, Archetype, CMapViewBasic> newMapControl(@Nullable final List<GameObject> objects, @NotNull final MapArchObject mapArchObject, @NotNull final Component parent) {
- return new DefaultMapControl<GameObject, MapArchObject, Archetype, CMapViewBasic>(this, mainControl, parent, autojoinLists, mapImageCache, objects, mapArchObject, false, GameObjectMatchersInstance.getInstance().getMatcher("exit"), archetypeChooserControl, mapActions);
+ return new DefaultMapControl<GameObject, MapArchObject, Archetype, CMapViewBasic>(this, parent, 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, @NotNull final Component parent) {
- return new DefaultMapControl<GameObject, MapArchObject, Archetype, CMapViewBasic>(this, mainControl, parent, autojoinLists, mapImageCache, objects, mapArchObject, true, GameObjectMatchersInstance.getInstance().getMatcher("exit"), archetypeChooserControl, mapActions);
+ return new DefaultMapControl<GameObject, MapArchObject, Archetype, CMapViewBasic>(this, parent, autojoinLists, mapImageCache, objects, mapArchObject, true, GameObjectMatchersInstance.getInstance().getMatcher("exit"), archetypeChooserControl, mapActions);
}
/** {@inheritDoc} */
Modified: trunk/daimonin/src/daieditor/DaimoninObjectsFactory.java
===================================================================
--- trunk/daimonin/src/daieditor/DaimoninObjectsFactory.java 2008-08-01 22:46:48 UTC (rev 4682)
+++ trunk/daimonin/src/daieditor/DaimoninObjectsFactory.java 2008-08-01 22:50:55 UTC (rev 4683)
@@ -154,13 +154,13 @@
/** {@inheritDoc} */
@NotNull
public MapControl<GameObject, MapArchObject, Archetype, CMapViewBasic> newMapControl(@Nullable final List<GameObject> objects, @NotNull final MapArchObject mapArchObject, @NotNull final Component parent) {
- return new DefaultMapControl<GameObject, MapArchObject, Archetype, CMapViewBasic>(this, mainControl, parent, autojoinLists, mapImageCache, objects, mapArchObject, false, GameObjectMatchersInstance.getInstance().getMatcher("exit"), archetypeChooserControl, mapActions);
+ return new DefaultMapControl<GameObject, MapArchObject, Archetype, CMapViewBasic>(this, parent, 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, @NotNull final Component parent) {
- final DefaultMapControl<GameObject, MapArchObject, Archetype, CMapViewBasic> mapControl = new DefaultMapControl<GameObject, MapArchObject, Archetype, CMapViewBasic>(this, mainControl, parent, autojoinLists, mapImageCache, objects, mapArchObject, true, GameObjectMatchersInstance.getInstance().getMatcher("exit"), archetypeChooserControl, mapActions);
+ final DefaultMapControl<GameObject, MapArchObject, Archetype, CMapViewBasic> mapControl = new DefaultMapControl<GameObject, MapArchObject, Archetype, CMapViewBasic>(this, parent, autojoinLists, mapImageCache, objects, mapArchObject, true, GameObjectMatchersInstance.getInstance().getMatcher("exit"), archetypeChooserControl, mapActions);
mapArchObject.setDifficulty(1);
return mapControl;
}
Modified: trunk/src/app/net/sf/gridarta/io/DefaultMapWriter.java
===================================================================
--- trunk/src/app/net/sf/gridarta/io/DefaultMapWriter.java 2008-08-01 22:46:48 UTC (rev 4682)
+++ trunk/src/app/net/sf/gridarta/io/DefaultMapWriter.java 2008-08-01 22:50:55 UTC (rev 4683)
@@ -26,7 +26,7 @@
import java.io.IOException;
import java.io.OutputStreamWriter;
import java.io.UnsupportedEncodingException;
-import net.sf.gridarta.MainControl;
+import net.sf.gridarta.GridartaObjectsFactory;
import net.sf.gridarta.Size2D;
import net.sf.gridarta.gameobject.Archetype;
import net.sf.gridarta.gameobject.GameObject;
@@ -42,22 +42,24 @@
// myOutput.close() is invoked in this.close()
public final class DefaultMapWriter<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>> implements MapWriter<G, A, R> {
- /** The main control. */
+ /**
+ * The gridarta objects factory instance.
+ */
@NotNull
- private final MainControl<G, A, R, ?> mainControl;
+ private final GridartaObjectsFactory<G, A, R, ?> gridartaObjectsFactory;
/** The reader to read from. */
private final OutputStreamWriter myOutput;
/**
* Open a file for reading it as a map.
- * @param mainControl The main control.
+ * @param gridartaObjectsFactory the gridarta objects factory instance
* @param file File to open.
* @throws FileNotFoundException in case the file couldn't be opened for
* writing
*/
- public DefaultMapWriter(@NotNull final MainControl<G, A, R, ?> mainControl, @NotNull final File file) throws FileNotFoundException {
- this.mainControl = mainControl;
+ public DefaultMapWriter(@NotNull final GridartaObjectsFactory<G, A, R, ?> gridartaObjectsFactory, @NotNull final File file) throws FileNotFoundException {
+ this.gridartaObjectsFactory = gridartaObjectsFactory;
try {
myOutput = new OutputStreamWriter(new FileOutputStream(file), IOUtils.MAP_ENCODING);
} catch (final UnsupportedEncodingException e) {
@@ -70,10 +72,10 @@
public final void encodeMapFile(@NotNull final MapModel<G, A, R> mapModel) throws IOException {
final A mapArch = mapModel.getMapArchObject();
- mainControl.getGridartaObjectsFactory().newMapArchObjectParser().save(myOutput, mapArch);
+ gridartaObjectsFactory.newMapArchObjectParser().save(myOutput, mapArch);
// first, write all one tile parts
- final GameObjectParser<G, A, R> gameObjectParser = mainControl.getGridartaObjectsFactory().newGameObjectParser();
+ final GameObjectParser<G, A, R> gameObjectParser = gridartaObjectsFactory.newGameObjectParser();
final Size2D mapSize = mapArch.getMapSize();
final int width = mapSize.getWidth();
final int height = mapSize.getHeight();
Modified: trunk/src/app/net/sf/gridarta/map/DefaultMapControl.java
===================================================================
--- trunk/src/app/net/sf/gridarta/map/DefaultMapControl.java 2008-08-01 22:46:48 UTC (rev 4682)
+++ trunk/src/app/net/sf/gridarta/map/DefaultMapControl.java 2008-08-01 22:50:55 UTC (rev 4683)
@@ -31,7 +31,6 @@
import net.sf.gridarta.AutojoinLists;
import net.sf.gridarta.CommonConstants;
import net.sf.gridarta.GridartaObjectsFactory;
-import net.sf.gridarta.MainControl;
import net.sf.gridarta.MapActions;
import net.sf.gridarta.MapImageCache;
import net.sf.gridarta.Size2D;
@@ -72,10 +71,6 @@
@NotNull
private final GridartaObjectsFactory<G, A, R, V> gridartaObjectsFactory;
- /** The main control. */
- @NotNull
- private final MainControl<G, A, R, V> mainControl;
-
/**
* The parent component for error messages.
*/
@@ -156,7 +151,6 @@
/**
* Creates a new instance.
* @param gridartaObjectsFactory the gridarta objects factory instance
- * @param mainControl the main control
* @param parent the parent component for error messages
* @param autojoinLists the autojoin lists instance to use
* @param mapImageCache the map image cache instance
@@ -167,9 +161,8 @@
* @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 Component parent, @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) {
+ public DefaultMapControl(@NotNull final GridartaObjectsFactory<G, A, R, V> gridartaObjectsFactory, @NotNull final Component parent, @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.parent = parent;
this.mapImageCache = mapImageCache;
this.isPickmap = isPickmap;
@@ -414,7 +407,7 @@
*/
private boolean encodeMapFile(@NotNull final File file) {
try {
- final MapWriter<G, A, R> mapFileEncoder = new DefaultMapWriter<G, A, R>(mainControl, file);
+ final MapWriter<G, A, R> mapFileEncoder = new DefaultMapWriter<G, A, R>(gridartaObjectsFactory, file);
try {
mapFileEncoder.encodeMapFile(mapModel);
} finally {
Modified: trunk/src/test/net/sf/gridarta/map/DefaultMapModelTest.java
===================================================================
--- trunk/src/test/net/sf/gridarta/map/DefaultMapModelTest.java 2008-08-01 22:46:48 UTC (rev 4682)
+++ trunk/src/test/net/sf/gridarta/map/DefaultMapModelTest.java 2008-08-01 22:50:55 UTC (rev 4683)
@@ -512,7 +512,7 @@
* @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 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, new JPanel(), autojoinLists, mapImageCache, objects, mapArchObject, isPickmap, exitTypeGameObjectMatcher, archetypeChooserControl, mapActions);
+ super(gridartaObjectsFactory, new JPanel(), autojoinLists, mapImageCache, objects, mapArchObject, isPickmap, exitTypeGameObjectMatcher, archetypeChooserControl, mapActions);
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
