Menu
▾
▴
[Gridarta-commit] SF.net SVN: gridarta:[4680] trunk
|
From: <aki...@us...> - 2008-08-01 22:41:26
|
Revision: 4680
http://gridarta.svn.sourceforge.net/gridarta/?rev=4680&view=rev
Author: akirschbaum
Date: 2008-08-01 22:41:33 +0000 (Fri, 01 Aug 2008)
Log Message:
-----------
Remove calls to MainControl.getGridartaObjectsFactory().
Modified Paths:
--------------
trunk/crossfire/src/cfeditor/CMainControl.java
trunk/daimonin/src/daieditor/CMainControl.java
trunk/src/app/net/sf/gridarta/gui/newmap/NewMapDialog.java
trunk/src/app/net/sf/gridarta/gui/newmap/NewMapDialogFactory.java
Modified: trunk/crossfire/src/cfeditor/CMainControl.java
===================================================================
--- trunk/crossfire/src/cfeditor/CMainControl.java 2008-08-01 22:37:10 UTC (rev 4679)
+++ trunk/crossfire/src/cfeditor/CMainControl.java 2008-08-01 22:41:33 UTC (rev 4680)
@@ -239,7 +239,7 @@
final MapManagerActions<GameObject, MapArchObject, Archetype, CMapViewBasic> mapManagerActions = new MapManagerActions<GameObject, MapArchObject, Archetype, CMapViewBasic>(mapManager);
PathManager.setGlobalSettings(globalSettings);
final ArchetypeChooserControl<GameObject, MapArchObject, Archetype, CMapViewBasic> archetypeChooserControl = new ArchetypeChooserControl<GameObject, MapArchObject, Archetype, CMapViewBasic>(this, archetypeSet, false);
- newMapDialogFactory = new NewMapDialogFactory<GameObject, MapArchObject, Archetype, CMapViewBasic>(this, IGUIConstants.DEF_MAPSIZE, IGUIConstants.DEF_MAPSIZE, 0, false, false, IGUIConstants.DEF_PICKMAP_WIDTH, IGUIConstants.DEF_PICKMAP_HEIGHT);
+ newMapDialogFactory = new NewMapDialogFactory<GameObject, MapArchObject, Archetype, CMapViewBasic>(this, gridartaObjectsFactory, IGUIConstants.DEF_MAPSIZE, IGUIConstants.DEF_MAPSIZE, 0, false, false, IGUIConstants.DEF_PICKMAP_WIDTH, IGUIConstants.DEF_PICKMAP_HEIGHT);
pickmapChooserControl = new PickmapChooserControl<GameObject, MapArchObject, Archetype, CMapViewBasic>(newMapDialogFactory, this, new File(globalSettings.getMapDir(), IGUIConstants.PICKMAP_DIR), mapManager);
newMapDialogFactory.setPickmapChooserControl(pickmapChooserControl);
archetypeTypeSet = new ArchetypeTypeSet<GameObject, MapArchObject, Archetype>();
Modified: trunk/daimonin/src/daieditor/CMainControl.java
===================================================================
--- trunk/daimonin/src/daieditor/CMainControl.java 2008-08-01 22:37:10 UTC (rev 4679)
+++ trunk/daimonin/src/daieditor/CMainControl.java 2008-08-01 22:41:33 UTC (rev 4680)
@@ -297,7 +297,7 @@
final MapManagerActions<GameObject, MapArchObject, Archetype, CMapViewBasic> mapManagerActions = new MapManagerActions<GameObject, MapArchObject, Archetype, CMapViewBasic>(mapManager);
PathManager.setGlobalSettings(globalSettings);
final ArchetypeChooserControl<GameObject, MapArchObject, Archetype, CMapViewBasic> archetypeChooserControl = new ArchetypeChooserControl<GameObject, MapArchObject, Archetype, CMapViewBasic>(this, archetypeSet, true);
- newMapDialogFactory = new NewMapDialogFactory<GameObject, MapArchObject, Archetype, CMapViewBasic>(this, IGUIConstants.DEF_MAPSIZE, IGUIConstants.DEF_MAPSIZE, IGUIConstants.DEF_MAPDIFFICULTY, true, true, IGUIConstants.DEF_PICKMAP_WIDTH, IGUIConstants.DEF_PICKMAP_HEIGHT);
+ newMapDialogFactory = new NewMapDialogFactory<GameObject, MapArchObject, Archetype, CMapViewBasic>(this, gridartaObjectsFactory, IGUIConstants.DEF_MAPSIZE, IGUIConstants.DEF_MAPSIZE, IGUIConstants.DEF_MAPDIFFICULTY, true, true, IGUIConstants.DEF_PICKMAP_WIDTH, IGUIConstants.DEF_PICKMAP_HEIGHT);
pickmapChooserControl = new PickmapChooserControl<GameObject, MapArchObject, Archetype, CMapViewBasic>(newMapDialogFactory, this, new File(globalSettings.getArchDefaultFolder(), IGUIConstants.PICKMAP_DIR), mapManager);
newMapDialogFactory.setPickmapChooserControl(pickmapChooserControl);
archetypeTypeSet = new ArchetypeTypeSet<GameObject, MapArchObject, Archetype>();
Modified: trunk/src/app/net/sf/gridarta/gui/newmap/NewMapDialog.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/newmap/NewMapDialog.java 2008-08-01 22:37:10 UTC (rev 4679)
+++ trunk/src/app/net/sf/gridarta/gui/newmap/NewMapDialog.java 2008-08-01 22:41:33 UTC (rev 4680)
@@ -27,12 +27,14 @@
import javax.swing.JPanel;
import javax.swing.JTextField;
import net.sf.gridarta.CommonConstants;
+import net.sf.gridarta.GridartaObjectsFactory;
import net.sf.gridarta.MainControl;
import net.sf.gridarta.gameobject.Archetype;
import net.sf.gridarta.gameobject.GameObject;
import net.sf.gridarta.gui.map.MapViewBasic;
import net.sf.gridarta.map.MapArchObject;
import net.sf.japi.swing.ActionFactory;
+import org.jetbrains.annotations.NotNull;
/**
* Dialog to create a new map file.
@@ -58,6 +60,12 @@
/** The controller of this new level dialog view. */
private final MainControl<G, A, R, V> mainControl;
+ /**
+ * The gridarta objects factory instance.
+ */
+ @NotNull
+ private final GridartaObjectsFactory<G, A, R, V> gridartaObjectsFactory;
+
/** Desired filename for new map, null if not specified. */
private final String filename;
@@ -79,6 +87,7 @@
/**
* Creates a "new map" dialog.
* @param mainControl the controller of this dialog.
+ * @param gridartaObjectsFactory the gridarta objects factory instance
* @param parentComponent the parent component of this dialog
* @param filename desired filename for new map, null if not specified
* @param showMapSizeDefault Whether to show the "mapSizeDefault" checkbox.
@@ -87,9 +96,10 @@
* @param defaultHeight The default height for new maps.
* @param defaultDifficulty The default difficulty for new maps.
*/
- public NewMapDialog(final MainControl<G, A, R, V> mainControl, final Component parentComponent, final String filename, final boolean showMapSizeDefault, final boolean showMapDifficulty, final int defaultWidth, final int defaultHeight, final int defaultDifficulty) {
+ public NewMapDialog(final MainControl<G, A, R, V> mainControl, @NotNull final GridartaObjectsFactory<G, A, R, V> gridartaObjectsFactory, final Component parentComponent, final String filename, final boolean showMapSizeDefault, final boolean showMapDifficulty, final int defaultWidth, final int defaultHeight, final int defaultDifficulty) {
super(showMapSizeDefault, prefs.getInt(DEFAULT_LEVEL_WIDTH_KEY, defaultWidth), prefs.getInt(DEFAULT_LEVEL_HEIGHT_KEY, defaultHeight));
this.mainControl = mainControl;
+ this.gridartaObjectsFactory = gridartaObjectsFactory;
this.filename = filename;
this.showMapDifficulty = showMapDifficulty;
this.defaultDifficulty = defaultDifficulty;
@@ -125,7 +135,7 @@
@Override
protected boolean createNew() {
// Create a new level from scratch
- final A mapArchObject = mainControl.getGridartaObjectsFactory().newMapArchObject(true);
+ final A mapArchObject = gridartaObjectsFactory.newMapArchObject(true);
if (!setMapSize(mapArchObject)) {
return false;
Modified: trunk/src/app/net/sf/gridarta/gui/newmap/NewMapDialogFactory.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/newmap/NewMapDialogFactory.java 2008-08-01 22:37:10 UTC (rev 4679)
+++ trunk/src/app/net/sf/gridarta/gui/newmap/NewMapDialogFactory.java 2008-08-01 22:41:33 UTC (rev 4680)
@@ -19,6 +19,7 @@
package net.sf.gridarta.gui.newmap;
+import net.sf.gridarta.GridartaObjectsFactory;
import net.sf.gridarta.MainControl;
import net.sf.gridarta.gameobject.Archetype;
import net.sf.gridarta.gameobject.GameObject;
@@ -40,6 +41,12 @@
@NotNull
private final MainControl<G, A, R, V> mainControl;
+ /**
+ * The gridarta objects factory instance.
+ */
+ @NotNull
+ private final GridartaObjectsFactory<G, A, R, V> gridartaObjectsFactory;
+
/** The default width for new maps. */
private final int defaultMapWidth;
@@ -68,6 +75,7 @@
/**
* Creates a new instance.
* @param mainControl the main control instance
+ * @param gridartaObjectsFactory the gridarta objects factory instance
* @param defaultMapWidth the default width for new maps
* @param defaultMapHeight the default height for new maps
* @param defaultMapDifficulty the default difficulty for new maps
@@ -76,8 +84,9 @@
* @param defaultPickmapWidth the default width for new pickmaps
* @param defaultPickmapHeight the default height for new pickmaps
*/
- public NewMapDialogFactory(@NotNull final MainControl<G, A, R, V> mainControl, final int defaultMapWidth, final int defaultMapHeight, final int defaultMapDifficulty, final boolean showMapDifficulty, final boolean showMapSizeDefault, final int defaultPickmapWidth, final int defaultPickmapHeight) {
+ public NewMapDialogFactory(@NotNull final MainControl<G, A, R, V> mainControl, @NotNull final GridartaObjectsFactory<G, A, R, V> gridartaObjectsFactory, final int defaultMapWidth, final int defaultMapHeight, final int defaultMapDifficulty, final boolean showMapDifficulty, final boolean showMapSizeDefault, final int defaultPickmapWidth, final int defaultPickmapHeight) {
this.mainControl = mainControl;
+ this.gridartaObjectsFactory = gridartaObjectsFactory;
this.defaultMapWidth = defaultMapWidth;
this.defaultMapHeight = defaultMapHeight;
this.defaultMapDifficulty = defaultMapDifficulty;
@@ -97,7 +106,7 @@
* unknown
*/
public void showNewMapDialog(final String filename) {
- new NewMapDialog<G, A, R, V>(mainControl, mainControl.getMainView(), filename, showMapSizeDefault, showMapDifficulty, defaultMapWidth, defaultMapHeight, defaultMapDifficulty);
+ new NewMapDialog<G, A, R, V>(mainControl, gridartaObjectsFactory, mainControl.getMainView(), filename, showMapSizeDefault, showMapDifficulty, defaultMapWidth, defaultMapHeight, defaultMapDifficulty);
}
/** Shows a dialog for creating a new pickmap. */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
