Menu
▾
▴
[Gridarta-commit] SF.net SVN: gridarta:[9023] trunk/src
|
From: <aki...@us...> - 2011-10-15 19:58:59
|
Revision: 9023
http://gridarta.svn.sourceforge.net/gridarta/?rev=9023&view=rev
Author: akirschbaum
Date: 2011-10-15 19:58:52 +0000 (Sat, 15 Oct 2011)
Log Message:
-----------
Move MapGrid creation out of AbstractMapViewBasic.
Modified Paths:
--------------
trunk/src/app/net/sf/gridarta/gui/map/mapview/AbstractMapViewBasic.java
trunk/src/app/net/sf/gridarta/gui/map/mapview/DefaultMapViewBasic.java
trunk/src/app/net/sf/gridarta/gui/map/mapview/DefaultMapViewFactory.java
trunk/src/test/net/sf/gridarta/gui/map/mapview/TestMapViewBasic.java
trunk/src/test/net/sf/gridarta/gui/map/mapview/TestMapViewFactory.java
trunk/src/test/net/sf/gridarta/gui/map/test/TestMapControlCreatorUtils.java
Modified: trunk/src/app/net/sf/gridarta/gui/map/mapview/AbstractMapViewBasic.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/map/mapview/AbstractMapViewBasic.java 2011-10-15 19:50:20 UTC (rev 9022)
+++ trunk/src/app/net/sf/gridarta/gui/map/mapview/AbstractMapViewBasic.java 2011-10-15 19:58:52 UTC (rev 9023)
@@ -50,8 +50,8 @@
* Creates a new instance.
* @param mapModel the map model to use
*/
- protected AbstractMapViewBasic(@NotNull final MapModel<G, A, R> mapModel) {
- mapGrid = new MapGrid(mapModel.getMapArchObject().getMapSize());
+ protected AbstractMapViewBasic(@NotNull final MapModel<G, A, R> mapModel, @NotNull final MapGrid mapGrid) {
+ this.mapGrid = mapGrid;
mapCursor = new MapCursor(mapGrid);
}
Modified: trunk/src/app/net/sf/gridarta/gui/map/mapview/DefaultMapViewBasic.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/map/mapview/DefaultMapViewBasic.java 2011-10-15 19:50:20 UTC (rev 9022)
+++ trunk/src/app/net/sf/gridarta/gui/map/mapview/DefaultMapViewBasic.java 2011-10-15 19:58:52 UTC (rev 9023)
@@ -159,8 +159,8 @@
* @param yScrollDistance the y distance when scrolling
* @param rendererFactory the renderer factory to use
*/
- public DefaultMapViewBasic(@NotNull final MapModel<G, A, R> mapModel, final boolean isPickmap, @Nullable final Point initial, final int xScrollDistance, final int yScrollDistance, @NotNull final RendererFactory<G, A, R> rendererFactory) {
- super(mapModel);
+ public DefaultMapViewBasic(@NotNull final MapModel<G, A, R> mapModel, final boolean isPickmap, @Nullable final Point initial, final int xScrollDistance, final int yScrollDistance, @NotNull final RendererFactory<G, A, R> rendererFactory, @NotNull final MapGrid mapGrid) {
+ super(mapModel, mapGrid);
this.mapModel = mapModel;
scrollPane = new JScrollPane(ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_AS_NEEDED);
if (isPickmap) {
Modified: trunk/src/app/net/sf/gridarta/gui/map/mapview/DefaultMapViewFactory.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/map/mapview/DefaultMapViewFactory.java 2011-10-15 19:50:20 UTC (rev 9022)
+++ trunk/src/app/net/sf/gridarta/gui/map/mapview/DefaultMapViewFactory.java 2011-10-15 19:58:52 UTC (rev 9023)
@@ -26,6 +26,8 @@
import net.sf.gridarta.model.io.PathManager;
import net.sf.gridarta.model.maparchobject.MapArchObject;
import net.sf.gridarta.model.mapcontrol.MapControl;
+import net.sf.gridarta.model.mapgrid.MapGrid;
+import net.sf.gridarta.model.mapmodel.MapModel;
import net.sf.japi.swing.action.ActionBuilder;
import net.sf.japi.swing.action.ActionBuilderFactory;
import org.jetbrains.annotations.NotNull;
@@ -84,7 +86,8 @@
@NotNull
@Override
public MapView<G, A, R> newMapView(@NotNull final MapControl<G, A, R> mapControl, @Nullable final Point viewPosition, final int viewCounter) {
- final MapView<G, A, R> mapView = new DefaultMapView<G, A, R>(mapControl, viewCounter, new DefaultMapViewBasic<G, A, R>(mapControl.getMapModel(), mapControl.isPickmap(), viewPosition, xScrollDistance, yScrollDistance, rendererFactory), pathManager);
+ final MapModel<G,A,R> mapModel = mapControl.getMapModel();
+ final MapView<G, A, R> mapView = new DefaultMapView<G, A, R>(mapControl, viewCounter, new DefaultMapViewBasic<G, A, R>(mapModel, mapControl.isPickmap(), viewPosition, xScrollDistance, yScrollDistance, rendererFactory, new MapGrid(mapModel.getMapArchObject().getMapSize())), pathManager);
mapView.getInternalFrame().setJMenuBar(ACTION_BUILDER.createMenuBar(false, "mapwindow"));
return mapView;
}
Modified: trunk/src/test/net/sf/gridarta/gui/map/mapview/TestMapViewBasic.java
===================================================================
--- trunk/src/test/net/sf/gridarta/gui/map/mapview/TestMapViewBasic.java 2011-10-15 19:50:20 UTC (rev 9022)
+++ trunk/src/test/net/sf/gridarta/gui/map/mapview/TestMapViewBasic.java 2011-10-15 19:58:52 UTC (rev 9023)
@@ -24,6 +24,7 @@
import net.sf.gridarta.model.archetype.TestArchetype;
import net.sf.gridarta.model.gameobject.TestGameObject;
import net.sf.gridarta.model.maparchobject.TestMapArchObject;
+import net.sf.gridarta.model.mapgrid.MapGrid;
import net.sf.gridarta.model.mapmodel.MapModel;
import org.jetbrains.annotations.NotNull;
@@ -37,8 +38,8 @@
* Creates a new instance.
* @param mapModel the map model to use
*/
- public TestMapViewBasic(@NotNull final MapModel<TestGameObject, TestMapArchObject, TestArchetype> mapModel) {
- super(mapModel);
+ public TestMapViewBasic(@NotNull final MapModel<TestGameObject, TestMapArchObject, TestArchetype> mapModel, @NotNull final MapGrid mapGrid) {
+ super(mapModel, mapGrid);
}
/**
Modified: trunk/src/test/net/sf/gridarta/gui/map/mapview/TestMapViewFactory.java
===================================================================
--- trunk/src/test/net/sf/gridarta/gui/map/mapview/TestMapViewFactory.java 2011-10-15 19:50:20 UTC (rev 9022)
+++ trunk/src/test/net/sf/gridarta/gui/map/mapview/TestMapViewFactory.java 2011-10-15 19:58:52 UTC (rev 9023)
@@ -24,6 +24,8 @@
import net.sf.gridarta.model.gameobject.TestGameObject;
import net.sf.gridarta.model.maparchobject.TestMapArchObject;
import net.sf.gridarta.model.mapcontrol.MapControl;
+import net.sf.gridarta.model.mapgrid.MapGrid;
+import net.sf.gridarta.model.mapmodel.MapModel;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -39,7 +41,8 @@
@NotNull
@Override
public MapView<TestGameObject, TestMapArchObject, TestArchetype> newMapView(@NotNull final MapControl<TestGameObject, TestMapArchObject, TestArchetype> mapControl, @Nullable final Point viewPosition, final int viewCounter) {
- final MapViewBasic<TestGameObject, TestMapArchObject, TestArchetype> mapViewBasic = new TestMapViewBasic(mapControl.getMapModel());
+ final MapModel<TestGameObject,TestMapArchObject,TestArchetype> mapModel = mapControl.getMapModel();
+ final MapViewBasic<TestGameObject, TestMapArchObject, TestArchetype> mapViewBasic = new TestMapViewBasic(mapModel, new MapGrid(mapModel.getMapArchObject().getMapSize()));
return new TestMapView(mapControl, mapViewBasic);
}
Modified: trunk/src/test/net/sf/gridarta/gui/map/test/TestMapControlCreatorUtils.java
===================================================================
--- trunk/src/test/net/sf/gridarta/gui/map/test/TestMapControlCreatorUtils.java 2011-10-15 19:50:20 UTC (rev 9022)
+++ trunk/src/test/net/sf/gridarta/gui/map/test/TestMapControlCreatorUtils.java 2011-10-15 19:58:52 UTC (rev 9023)
@@ -39,6 +39,8 @@
import net.sf.gridarta.model.maparchobject.TestMapArchObject;
import net.sf.gridarta.model.mapcontrol.MapControl;
import net.sf.gridarta.model.mapcontrol.TestMapControlCreator;
+import net.sf.gridarta.model.mapgrid.MapGrid;
+import net.sf.gridarta.model.mapmodel.MapModel;
import net.sf.gridarta.model.mapmodel.TestMapModelCreator;
import org.jetbrains.annotations.NotNull;
@@ -61,7 +63,8 @@
*/
@NotNull
public static MapView<TestGameObject, TestMapArchObject, TestArchetype> newMapView(@NotNull final MapControl<TestGameObject, TestMapArchObject, TestArchetype> mapControl) {
- final MapViewBasic<TestGameObject, TestMapArchObject, TestArchetype> mapViewBasic = new TestMapViewBasic(mapControl.getMapModel());
+ final MapModel<TestGameObject,TestMapArchObject,TestArchetype> mapModel = mapControl.getMapModel();
+ final MapViewBasic<TestGameObject, TestMapArchObject, TestArchetype> mapViewBasic = new TestMapViewBasic(mapModel, new MapGrid(mapModel.getMapArchObject().getMapSize()));
return new TestMapView(mapControl, mapViewBasic);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
