From f78a046c172e0bc5b093fe953815d02132ad5f84 Mon Sep 17 00:00:00 2001
From: akirschbaum <akirschbaum@282e977c-c81d-0410-88c4-b93c2d0d6712>
Date: Sun, 12 Jul 2009 14:40:31 +0000
Subject: [PATCH] Add game object attribute normalization to MapNormalizer
 editor script. Now game object attributes are written in canonical order and
 attributes redundant with the archetype are removed.

git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@12059 282e977c-c81d-0410-88c4-b93c2d0d6712
---
 editor/scripts/MapNormalizer | 46 ++++++++++++++++++++++++++++--------
 1 file changed, 36 insertions(+), 10 deletions(-)

diff --git a/editor/scripts/MapNormalizer b/editor/scripts/MapNormalizer
index ff6baf628..90953597c 100644
--- a/editor/scripts/MapNormalizer
+++ b/editor/scripts/MapNormalizer
@@ -3,10 +3,22 @@
   <name>MapNormalizer</name>
   <code><![CDATA[import java.io.File;
 import java.util.Iterator;
+import net.sf.gridarta.gameobject.GameObject;
 import net.sf.gridarta.gui.shrinkmapsizedialog.ShrinkMapSizeUtils;
 import net.sf.gridarta.io.RecursiveFileIterator;
+import net.sf.gridarta.map.mapmodel.MapModel;
+import net.sf.gridarta.map.mapmodel.MapSquare;
 import net.sf.gridarta.utils.CommonConstants;
 
+void normalizeGameObject(GameObject gameObject) {
+    Iterator it = gameObject.iterator();
+    while (it.hasNext()) {
+        normalizeGameObject(it.next());
+    }
+
+    gameObject.setObjectText(gameObject.getArchetype().diffArchText(gameObject.getObjectText(), false));
+}
+
 void normalizeMap(File mapFile, String mapPath) {
     print(mapPath);
 
@@ -17,18 +29,32 @@ void normalizeMap(File mapFile, String mapPath) {
     }
 
     try {
-        if (!mapPath.startsWith("/styles")
-        && !mapPath.startsWith("/editor")) {
-            mapModel = map.getMapModel();
-            mapArchObject = mapModel.getMapArchObject();
-            int shrinkFlags = 0;
-            if (mapArchObject.getTilePath(CommonConstants.NORTH).length() <= 0 && mapArchObject.getTilePath(CommonConstants.SOUTH).length() <= 0) {
-                shrinkFlags |= ShrinkMapSizeUtils.SHRINK_EAST;
+        mapModel = map.getMapModel();
+        mapModel.beginTransaction("Normalize");
+        try {
+            if (!mapPath.startsWith("/styles")
+            && !mapPath.startsWith("/editor/pickmaps")
+            && !mapPath.startsWith("/editor/walls")) {
+                mapArchObject = mapModel.getMapArchObject();
+                int shrinkFlags = 0;
+                if (mapArchObject.getTilePath(CommonConstants.NORTH).length() <= 0 && mapArchObject.getTilePath(CommonConstants.SOUTH).length() <= 0) {
+                    shrinkFlags |= ShrinkMapSizeUtils.SHRINK_EAST;
+                }
+                if (mapArchObject.getTilePath(CommonConstants.EAST).length() <= 0 && mapArchObject.getTilePath(CommonConstants.WEST).length() <= 0) {
+                    shrinkFlags |= ShrinkMapSizeUtils.SHRINK_SOUTH;
+                }
+                ShrinkMapSizeUtils.shrinkMap(mapModel, shrinkFlags);
             }
-            if (mapArchObject.getTilePath(CommonConstants.EAST).length() <= 0 && mapArchObject.getTilePath(CommonConstants.WEST).length() <= 0) {
-                shrinkFlags |= ShrinkMapSizeUtils.SHRINK_SOUTH;
+
+            Iterator it = mapModel.iterator	();
+            while (it.hasNext()) {
+                Iterator it2 = it.next().iterator();
+                while (it2.hasNext()) {
+                    normalizeGameObject(it2.next());
+                }
             }
-            ShrinkMapSizeUtils.shrinkMap(mapModel, shrinkFlags);
+        } finally {
+            mapModel.endTransaction();
         }
 
         if (map.getMapModel().isModified()) {