Menu
▾
▴
[Gridarta-commit] SF.net SVN: gridarta:[4845] trunk
|
From: <aki...@us...> - 2008-08-15 18:36:56
|
Revision: 4845
http://gridarta.svn.sourceforge.net/gridarta/?rev=4845&view=rev
Author: akirschbaum
Date: 2008-08-15 18:37:00 +0000 (Fri, 15 Aug 2008)
Log Message:
-----------
Remove MainControl.validateMap().
Modified Paths:
--------------
trunk/crossfire/src/cfeditor/CMainControl.java
trunk/daimonin/src/daieditor/CMainControl.java
trunk/src/app/net/sf/gridarta/MainControl.java
trunk/src/app/net/sf/gridarta/gui/MainActions.java
trunk/src/app/net/sf/gridarta/map/AutoValidator.java
trunk/src/app/net/sf/gridarta/map/AutoValidatorProcessor.java
trunk/src/test/net/sf/gridarta/map/DefaultMapModelTest.java
Modified: trunk/crossfire/src/cfeditor/CMainControl.java
===================================================================
--- trunk/crossfire/src/cfeditor/CMainControl.java 2008-08-15 18:29:21 UTC (rev 4844)
+++ trunk/crossfire/src/cfeditor/CMainControl.java 2008-08-15 18:37:00 UTC (rev 4845)
@@ -104,7 +104,6 @@
import net.sf.gridarta.map.AutoValidator;
import net.sf.gridarta.map.InsertionMode;
import net.sf.gridarta.map.MapControl;
-import net.sf.gridarta.map.MapModel;
import net.sf.gridarta.map.validation.DelegatingMapValidator;
import net.sf.gridarta.map.validation.checks.AttributeRangeChecker;
import net.sf.gridarta.map.validation.checks.ConnectedInsideContainerChecker;
@@ -246,7 +245,8 @@
final SelectedSquareView<GameObject, MapArchObject, Archetype, CMapViewBasic> selectedSquareView = selectedSquareControl.getSelectedSquareView();
new MapCursorControl<GameObject, MapArchObject, Archetype, CMapViewBasic>("cfeditor", this, gameObjectAttributesDialogFactory, mapManager, mapViewManager, selectedSquareControl, selectedSquareView);
replaceDialogManager.setObjectChooser(objectChooser);
- mainActions = new MainActions<GameObject, MapArchObject, Archetype, CMapViewBasic>(replaceDialogManager, this, editTypes, archetypeSet, copyBuffer, animationObjects, ACTION_FACTORY, faceObjects, objectChooser, mapManager, mapViewManager);
+ validators = createMapValidators();
+ mainActions = new MainActions<GameObject, MapArchObject, Archetype, CMapViewBasic>(replaceDialogManager, this, validators, editTypes, archetypeSet, copyBuffer, animationObjects, ACTION_FACTORY, faceObjects, objectChooser, mapManager, mapViewManager);
GameObject.setArchetypeSet(archetypeSet, SystemIcons.getNofaceTileIcon());
gameObjectAttributesDialogFactory.setParent(mainView);
new About("cfeditor", mainView);
@@ -379,8 +379,7 @@
}
}
recentManager.initRecent();
- validators = createMapValidators();
- new AutoValidator<GameObject, MapArchObject, Archetype, CMapViewBasic>(this, mapManager, PREFS_VALIDATOR_AUTO_DEFAULT);
+ new AutoValidator<GameObject, MapArchObject, Archetype, CMapViewBasic>(validators, mapManager, PREFS_VALIDATOR_AUTO_DEFAULT);
fileControl = new FileControl(globalSettings, archetypeSet, mapPreviewAccessory, mapManager, mainView, mapFileFilter, pythonFileFilter, newMapDialogFactory);
}
@@ -451,11 +450,6 @@
return mapValidators;
}
- /** {@inheritDoc} */
- public void validateMap(final MapModel<GameObject, MapArchObject, Archetype> map) {
- validators.validateAll(map);
- }
-
/** View Treasure Lists. */
@ActionMethod
public void viewTreasurelists() {
Modified: trunk/daimonin/src/daieditor/CMainControl.java
===================================================================
--- trunk/daimonin/src/daieditor/CMainControl.java 2008-08-15 18:29:21 UTC (rev 4844)
+++ trunk/daimonin/src/daieditor/CMainControl.java 2008-08-15 18:37:00 UTC (rev 4845)
@@ -303,7 +303,8 @@
final SelectedSquareView<GameObject, MapArchObject, Archetype, CMapViewBasic> selectedSquareView = selectedSquareControl.getSelectedSquareView();
new MapCursorControl<GameObject, MapArchObject, Archetype, CMapViewBasic>("daieditor", this, gameObjectAttributesDialogFactory, mapManager, mapViewManager, selectedSquareControl, selectedSquareView);
replaceDialogManager.setObjectChooser(objectChooser);
- mainActions = new MainActions<GameObject, MapArchObject, Archetype, CMapViewBasic>(replaceDialogManager, this, editTypes, archetypeSet, copyBuffer, animationObjects, ACTION_FACTORY, faceObjects, objectChooser, mapManager, mapViewManager);
+ validators = createMapValidators();
+ mainActions = new MainActions<GameObject, MapArchObject, Archetype, CMapViewBasic>(replaceDialogManager, this, validators, editTypes, archetypeSet, copyBuffer, animationObjects, ACTION_FACTORY, faceObjects, objectChooser, mapManager, mapViewManager);
GameObject.setAnimationObjects(animationObjects, SystemIcons.getNofaceTileIcon());
gameObjectAttributesDialogFactory.setParent(mainView);
new About("daieditor", mainView);
@@ -451,8 +452,7 @@
}
}
recentManager.initRecent();
- validators = createMapValidators();
- new AutoValidator<GameObject, MapArchObject, Archetype, CMapViewBasic>(this, mapManager, PREFS_VALIDATOR_AUTO_DEFAULT);
+ new AutoValidator<GameObject, MapArchObject, Archetype, CMapViewBasic>(validators, mapManager, PREFS_VALIDATOR_AUTO_DEFAULT);
fileControl = new FileControl(globalSettings, archetypeSet, mapPreviewAccessory, mapManager, mainView, mapFileFilter, luaFileFilter, newMapDialogFactory);
}
@@ -571,11 +571,6 @@
controlServer.showDialog(mainView);
}
- /** {@inheritDoc} */
- public void validateMap(final MapModel<GameObject, MapArchObject, Archetype> map) {
- validators.validateAll(map);
- }
-
/** Control the client. */
@ActionMethod
public void controlClient() {
Modified: trunk/src/app/net/sf/gridarta/MainControl.java
===================================================================
--- trunk/src/app/net/sf/gridarta/MainControl.java 2008-08-15 18:29:21 UTC (rev 4844)
+++ trunk/src/app/net/sf/gridarta/MainControl.java 2008-08-15 18:37:00 UTC (rev 4845)
@@ -27,7 +27,6 @@
import net.sf.gridarta.gui.objectchooser.ObjectChooser;
import net.sf.gridarta.map.MapArchObject;
import net.sf.gridarta.map.MapControl;
-import net.sf.gridarta.map.MapModel;
import net.sf.japi.swing.ActionMethod;
import org.jetbrains.annotations.NotNull;
@@ -85,12 +84,6 @@
/** Exits from the program. */
void doExit();
- /**
- * Check a map.
- * @param map the map to check
- */
- void validateMap(final MapModel<G, A, R> map);
-
/** Invoked when the user wants to reload the images. */
void reloadFaces();
Modified: trunk/src/app/net/sf/gridarta/gui/MainActions.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/MainActions.java 2008-08-15 18:29:21 UTC (rev 4844)
+++ trunk/src/app/net/sf/gridarta/gui/MainActions.java 2008-08-15 18:37:00 UTC (rev 4845)
@@ -53,6 +53,7 @@
import net.sf.gridarta.map.MapModel;
import net.sf.gridarta.map.MapModelEvent;
import net.sf.gridarta.map.MapModelListener;
+import net.sf.gridarta.map.validation.DelegatingMapValidator;
import net.sf.japi.swing.ActionFactory;
import net.sf.japi.swing.ActionMethod;
import net.sf.japi.swing.misc.Progress;
@@ -75,6 +76,10 @@
/** The MainControl. */
private final MainControl<G, A, R, V> mainControl;
+ /** The map validators. */
+ @NotNull
+ private final DelegatingMapValidator<G, A, R> validators;
+
/** The edit types instance. */
@NotNull
private final EditTypes<G, A, R, V> editTypes;
@@ -304,6 +309,7 @@
* Create a new instance.
* @param replaceDialogManager the replace dialog manager to use
* @param mainControl the MainControl
+ * @param validators the map validators
* @param editTypes the edit types instance
* @param archetypeSet the archetype set
* @param copyBuffer the copy buffer instance
@@ -314,9 +320,10 @@
* @param mapManager the map manager instance
* @param mapViewManager the map view manager instance
*/
- public MainActions(@NotNull final ReplaceDialogManager<G, A, R, V> replaceDialogManager, @NotNull final MainControl<G, A, R, V> mainControl, @NotNull final EditTypes<G, A, R, V> editTypes, @NotNull final ArchetypeSet<G, A, R> archetypeSet, @NotNull final CopyBuffer<G, A, R, V> copyBuffer, @NotNull final AnimationObjects<?> animationObjects, @NotNull final ActionFactory actionFactory, @NotNull final FaceObjects faceObjects, @NotNull final ObjectChooser<G, A, R> objectChooser, @NotNull final MapManager<G, A, R, V> mapManager, @NotNull final MapViewManager<G, A, R, V> mapViewManager) {
+ public MainActions(@NotNull final ReplaceDialogManager<G, A, R, V> replaceDialogManager, @NotNull final MainControl<G, A, R, V> mainControl, @NotNull final DelegatingMapValidator<G, A, R> validators, @NotNull final EditTypes<G, A, R, V> editTypes, @NotNull final ArchetypeSet<G, A, R> archetypeSet, @NotNull final CopyBuffer<G, A, R, V> copyBuffer, @NotNull final AnimationObjects<?> animationObjects, @NotNull final ActionFactory actionFactory, @NotNull final FaceObjects faceObjects, @NotNull final ObjectChooser<G, A, R> objectChooser, @NotNull final MapManager<G, A, R, V> mapManager, @NotNull final MapViewManager<G, A, R, V> mapViewManager) {
this.replaceDialogManager = replaceDialogManager;
this.mainControl = mainControl;
+ this.validators = validators;
this.editTypes = editTypes;
this.archetypeSet = archetypeSet;
this.copyBuffer = copyBuffer;
@@ -644,7 +651,7 @@
public void validateMap() {
final MapModel<G, A, R> mapModel = getValidateMapEnabled();
if (mapModel != null) {
- mainControl.validateMap(mapModel);
+ validators.validateAll(mapModel);
}
}
Modified: trunk/src/app/net/sf/gridarta/map/AutoValidator.java
===================================================================
--- trunk/src/app/net/sf/gridarta/map/AutoValidator.java 2008-08-15 18:29:21 UTC (rev 4844)
+++ trunk/src/app/net/sf/gridarta/map/AutoValidator.java 2008-08-15 18:37:00 UTC (rev 4845)
@@ -30,6 +30,7 @@
import net.sf.gridarta.gameobject.Archetype;
import net.sf.gridarta.gameobject.GameObject;
import net.sf.gridarta.gui.map.MapViewBasic;
+import net.sf.gridarta.map.validation.DelegatingMapValidator;
import org.jetbrains.annotations.NotNull;
/**
@@ -141,17 +142,17 @@
/**
* Create a new instance.
- * @param mainControl The main control.
+ * @param validators the map validators
* @param mapManager the map manager to use
* @param autoDefault Whether the auto-validator is enabled by default.
*/
- public AutoValidator(@NotNull final MainControl<G, A, R, V> mainControl, @NotNull final MapManager<G, A, R, V>mapManager, final boolean autoDefault) {
+ public AutoValidator(@NotNull final DelegatingMapValidator<G, A, R> validators, @NotNull final MapManager<G, A, R, V>mapManager, final boolean autoDefault) {
setDefaultPreferencesValue(autoDefault);
wasEnabled = isEnabled(); // call to isEnabled() must not happen before setDefaultPreferencesValue()
prefs.addPreferenceChangeListener(preferenceChangeListener);
- autoValidatorProcessor = new AutoValidatorProcessor<G, A, R, V>(mainControl, mapManager);
+ autoValidatorProcessor = new AutoValidatorProcessor<G, A, R, V>(validators, mapManager);
mapManager.addMapManagerListener(mapManagerListener);
autoValidatorProcessor.start();
Modified: trunk/src/app/net/sf/gridarta/map/AutoValidatorProcessor.java
===================================================================
--- trunk/src/app/net/sf/gridarta/map/AutoValidatorProcessor.java 2008-08-15 18:29:21 UTC (rev 4844)
+++ trunk/src/app/net/sf/gridarta/map/AutoValidatorProcessor.java 2008-08-15 18:37:00 UTC (rev 4845)
@@ -23,11 +23,11 @@
import java.lang.reflect.InvocationTargetException;
import java.util.IdentityHashMap;
import java.util.Map;
-import net.sf.gridarta.MainControl;
import net.sf.gridarta.MapManager;
import net.sf.gridarta.gameobject.Archetype;
import net.sf.gridarta.gameobject.GameObject;
import net.sf.gridarta.gui.map.MapViewBasic;
+import net.sf.gridarta.map.validation.DelegatingMapValidator;
import org.jetbrains.annotations.NotNull;
/**
@@ -43,7 +43,7 @@
/** The main control. */
@NotNull
- private final MainControl<G, A, R, V> mainControl;
+ private final DelegatingMapValidator<G, A, R> validators;
/**
* The map manager to use.
@@ -79,7 +79,7 @@
synchronized (changedMapModels) {
for (final MapModel<G, A, R> mapModel : changedMapModels.keySet()) {
- mainControl.validateMap(mapModel);
+ validators.validateAll(mapModel);
}
changedMapModels.clear();
}
@@ -89,11 +89,11 @@
/**
* Create a new instance.
- * @param mainControl The main control.
+ * @param validators The main control.
* @param mapManager the map manager to use
*/
- public AutoValidatorProcessor(@NotNull final MainControl<G, A, R, V> mainControl, @NotNull final MapManager<G, A, R, V> mapManager) {
- this.mainControl = mainControl;
+ public AutoValidatorProcessor(@NotNull final DelegatingMapValidator<G, A, R> validators, @NotNull final MapManager<G, A, R, V> mapManager) {
+ this.validators = validators;
this.mapManager = mapManager;
}
Modified: trunk/src/test/net/sf/gridarta/map/DefaultMapModelTest.java
===================================================================
--- trunk/src/test/net/sf/gridarta/map/DefaultMapModelTest.java 2008-08-15 18:29:21 UTC (rev 4844)
+++ trunk/src/test/net/sf/gridarta/map/DefaultMapModelTest.java 2008-08-15 18:37:00 UTC (rev 4845)
@@ -446,11 +446,6 @@
}
/** {@inheritDoc} */
- public void validateMap(final MapModel<TestGameObject, TestMapArchObject, TestArchetype> map) {
- throw new AssertionError();
- }
-
- /** {@inheritDoc} */
public void reloadFaces() {
throw new AssertionError();
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
