[Gridarta-commit] SF.net SVN: gridarta:[4844] trunk

[<aki...@us...>]

Revision: 4844
          http://gridarta.svn.sourceforge.net/gridarta/?rev=4844&view=rev
Author:   akirschbaum
Date:     2008-08-15 18:29:21 +0000 (Fri, 15 Aug 2008)

Log Message:
-----------
Move code from CMainControl to DelegatingMapValidator.

Modified Paths:
--------------
    trunk/crossfire/src/cfeditor/CMainControl.java
    trunk/daimonin/src/daieditor/CMainControl.java
    trunk/src/app/net/sf/gridarta/map/validation/DelegatingMapValidator.java

Modified: trunk/crossfire/src/cfeditor/CMainControl.java
===================================================================
--- trunk/crossfire/src/cfeditor/CMainControl.java	2008-08-15 18:25:08 UTC (rev 4843)
+++ trunk/crossfire/src/cfeditor/CMainControl.java	2008-08-15 18:29:21 UTC (rev 4844)
@@ -105,9 +105,7 @@
 import net.sf.gridarta.map.InsertionMode;
 import net.sf.gridarta.map.MapControl;
 import net.sf.gridarta.map.MapModel;
-import net.sf.gridarta.map.validation.DefaultErrorCollector;
 import net.sf.gridarta.map.validation.DelegatingMapValidator;
-import net.sf.gridarta.map.validation.ErrorCollector;
 import net.sf.gridarta.map.validation.checks.AttributeRangeChecker;
 import net.sf.gridarta.map.validation.checks.ConnectedInsideContainerChecker;
 import net.sf.gridarta.map.validation.checks.ConnectedPickableChecker;
@@ -455,9 +453,7 @@
 
     /** {@inheritDoc} */
     public void validateMap(final MapModel<GameObject, MapArchObject, Archetype> map) {
-        final ErrorCollector<GameObject, MapArchObject, Archetype> errorCollector = new DefaultErrorCollector<GameObject, MapArchObject, Archetype>();
-        validators.validateAll(map, errorCollector);
-        map.setErrors(errorCollector);
+        validators.validateAll(map);
     }
 
     /** View Treasure Lists. */

Modified: trunk/daimonin/src/daieditor/CMainControl.java
===================================================================
--- trunk/daimonin/src/daieditor/CMainControl.java	2008-08-15 18:25:08 UTC (rev 4843)
+++ trunk/daimonin/src/daieditor/CMainControl.java	2008-08-15 18:29:21 UTC (rev 4844)
@@ -115,9 +115,7 @@
 import net.sf.gridarta.map.MapControl;
 import net.sf.gridarta.map.MapModel;
 import net.sf.gridarta.map.MapSquare;
-import net.sf.gridarta.map.validation.DefaultErrorCollector;
 import net.sf.gridarta.map.validation.DelegatingMapValidator;
-import net.sf.gridarta.map.validation.ErrorCollector;
 import net.sf.gridarta.map.validation.checks.BlockedMobOrSpawnPointChecker;
 import net.sf.gridarta.map.validation.checks.BlockedSpawnPointChecker;
 import net.sf.gridarta.map.validation.checks.BlockedSquareChecker;
@@ -575,9 +573,7 @@
 
     /** {@inheritDoc} */
     public void validateMap(final MapModel<GameObject, MapArchObject, Archetype> map) {
-        final ErrorCollector<GameObject, MapArchObject, Archetype> errorCollector = new DefaultErrorCollector<GameObject, MapArchObject, Archetype>();
-        validators.validateAll(map, errorCollector);
-        map.setErrors(errorCollector);
+        validators.validateAll(map);
     }
 
     /** Control the client. */

Modified: trunk/src/app/net/sf/gridarta/map/validation/DelegatingMapValidator.java
===================================================================
--- trunk/src/app/net/sf/gridarta/map/validation/DelegatingMapValidator.java	2008-08-15 18:25:08 UTC (rev 4843)
+++ trunk/src/app/net/sf/gridarta/map/validation/DelegatingMapValidator.java	2008-08-15 18:29:21 UTC (rev 4844)
@@ -27,6 +27,7 @@
 import net.sf.gridarta.map.MapArchObject;
 import net.sf.gridarta.map.MapModel;
 import net.sf.gridarta.map.MapSquare;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * A Map Validator that delegates to other MapValidators.
@@ -56,9 +57,9 @@
     /**
      * Perform all validations on a map.
      * @param mapModel map to validate
-     * @param errorCollector collector to report errors to
      */
-    public void validateAll(final MapModel<G, A, R> mapModel, final ErrorCollector<G, A, R> errorCollector) {
+    public void validateAll(@NotNull final MapModel<G, A, R> mapModel) {
+        final ErrorCollector<G, A, R> errorCollector = new DefaultErrorCollector<G, A, R>();
         validate(mapModel, errorCollector);
         for (final MapSquare<G, A, R> mapSquare : mapModel) {
             validate(mapSquare, errorCollector);
@@ -69,6 +70,7 @@
                 }
             }
         }
+        mapModel.setErrors(errorCollector);
     }
 
     /** {@inheritDoc} */


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.