From d92f623f171f5b1afb636818303d397e2f02ad0d Mon Sep 17 00:00:00 2001
From: Ray Greenwell <ray@threerings.net>
Date: Fri, 5 Apr 2002 01:35:11 +0000
Subject: [PATCH] Moved all validation into the parser.

git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1185 542714f4-19e9-0310-aa3c-eee0fc999fb1
---
 .../miso/tile/FringeConfiguration.java        |  8 +---
 .../tools/xml/FringeConfigurationParser.java  | 47 +++++++++++++++----
 2 files changed, 41 insertions(+), 14 deletions(-)

diff --git a/src/java/com/threerings/miso/tile/FringeConfiguration.java b/src/java/com/threerings/miso/tile/FringeConfiguration.java
index b44ff7083..7b651ed85 100644
--- a/src/java/com/threerings/miso/tile/FringeConfiguration.java
+++ b/src/java/com/threerings/miso/tile/FringeConfiguration.java
@@ -1,5 +1,5 @@
 //
-// $Id: FringeConfiguration.java,v 1.3 2002/04/05 00:34:57 ray Exp $
+// $Id: FringeConfiguration.java,v 1.4 2002/04/05 01:35:11 ray Exp $
 
 package com.threerings.miso.scene;
 
@@ -34,11 +34,7 @@ public class FringeConfiguration implements Serializable
         /** Used when parsing the tilesets definitions. */
         public void addTileset (FringeTileSetRecord record)
         {
-            // don't add it unless we found a valid fringe tileset id for
-            // the name as specified in the xml
-            if (record.fringe_tsid != 0) {
-                tilesets.add(record);
-            }
+            tilesets.add(record);
         }
      }
 
diff --git a/src/java/com/threerings/miso/tile/tools/xml/FringeConfigurationParser.java b/src/java/com/threerings/miso/tile/tools/xml/FringeConfigurationParser.java
index 5e1e56a66..ea3665c88 100644
--- a/src/java/com/threerings/miso/tile/tools/xml/FringeConfigurationParser.java
+++ b/src/java/com/threerings/miso/tile/tools/xml/FringeConfigurationParser.java
@@ -1,5 +1,5 @@
 //
-// $Id: FringeConfigurationParser.java,v 1.2 2002/04/04 04:06:57 ray Exp $
+// $Id: FringeConfigurationParser.java,v 1.3 2002/04/05 01:35:11 ray Exp $
 
 package com.threerings.miso.scene.tools.xml;
 
@@ -10,7 +10,7 @@ import org.apache.commons.digester.Digester;
 import org.apache.commons.digester.Rule;
 
 import com.samskivert.util.StringUtil;
-import com.samskivert.xml.SetPropertyFieldsRule;
+import com.samskivert.xml.ValidatedSetNextRule;
 
 import com.threerings.tools.xml.CompiledConfigParser;
 
@@ -67,9 +67,24 @@ public class FringeConfigurationParser extends CompiledConfigParser
         // create and configure fringe config instances
         prefix += "/base";
         digest.addObjectCreate(prefix, FringeRecord.class.getName());
-        digest.addSetNext(
-            prefix, "addFringeRecord", FringeRecord.class.getName());
-        digest.addRule(prefix, new Rule(digest) {
+
+        // you'd better match parens if you have any hope of wading
+        // in these waters
+        digest.addRule(prefix,
+            new ValidatedSetNextRule(digest, "addFringeRecord",
+                new ValidatedSetNextRule.Validator () {
+                    public boolean isValid (Object target) {
+                        FringeRecord frec = (FringeRecord) target;
+                        if ((frec.base_tsid == 0) ||
+                            (frec.priority <= 0)) {
+                            Log.warning("A FringeRecord was not added " +
+                                "because it was improperly specified.");
+                            return false;
+                        }
+                        return true;
+                    }
+                }) {
+
             // parse the fringe record, converting tileset names to tileset
             // ids
             public void begin (Attributes attrs)
@@ -94,6 +109,9 @@ public class FringeConfigurationParser extends CompiledConfigParser
 
                     } else if ("priority".equals(name)) {
                         frec.priority = Integer.parseInt(value);
+                    } else {
+                        Log.warning("Skipping unknown attribute " +
+                                    "[name=" + name + "].");
                     }
                 }
             }
@@ -102,9 +120,19 @@ public class FringeConfigurationParser extends CompiledConfigParser
         // create the tileset records in each fringe record
         prefix += "/tileset";
         digest.addObjectCreate(prefix, FringeTileSetRecord.class.getName());
-        digest.addSetNext(
-            prefix, "addTileset", FringeTileSetRecord.class.getName());
-        digest.addRule(prefix, new Rule(digest) {
+        digest.addRule(prefix, new ValidatedSetNextRule(digest, "addTileset",
+            new ValidatedSetNextRule.Validator() {
+                public boolean isValid (Object target) {
+                    FringeTileSetRecord ftsr = (FringeTileSetRecord) target;
+                    if (ftsr.fringe_tsid == 0) {
+                        Log.warning("A FringeTileSetRecord was not added " +
+                            "because it was improperly specified.");
+                        return false;
+                    }
+                    return true;
+                }
+            }) {
+                
             // parse the fringe tilesetrecord, converting tileset names to ids
             public void begin (Attributes attrs)
             throws Exception
@@ -128,6 +156,9 @@ public class FringeConfigurationParser extends CompiledConfigParser
 
                     } else if ("mask".equals(name)) {
                         f.mask = Boolean.getBoolean(value);
+                    } else {
+                        Log.warning("Skipping unknown attribute " +
+                                    "[name=" + name + "].");
                     }
                 }
             }