Thread: [Gridarta-commit] SF.net SVN: gridarta:[7988] trunk (Page 51)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 7988
          http://gridarta.svn.sourceforge.net/gridarta/?rev=7988&view=rev
Author:   akirschbaum
Date:     2010-05-24 19:23:19 +0000 (Mon, 24 May 2010)

Log Message:
-----------
Cleanup parser for/document <ignorelists> elements within types.xml.

Modified Paths:
--------------
    trunk/resource/system/dtd/types.dtd
    trunk/src/app/net/sf/gridarta/model/archetypetype/ArchetypeTypeSetParser.java

Modified: trunk/resource/system/dtd/types.dtd
===================================================================

--- trunk/resource/system/dtd/types.dtd	2010-05-24 19:08:48 UTC (rev 7987)
+++ trunk/resource/system/dtd/types.dtd	2010-05-24 19:23:19 UTC (rev 7988)
@@ -72,7 +72,7 @@
     encoding    CDATA #IMPLIED
 >
 
-<!ELEMENT ignore_list (attribute* | EMPTY)>
+<!ELEMENT ignore_list (attribute*)>
 <!ATTLIST ignore_list
     name        CDATA #REQUIRED
 >

Modified: trunk/src/app/net/sf/gridarta/model/archetypetype/ArchetypeTypeSetParser.java
===================================================================
--- trunk/src/app/net/sf/gridarta/model/archetypetype/ArchetypeTypeSetParser.java	2010-05-24 19:08:48 UTC (rev 7987)
+++ trunk/src/app/net/sf/gridarta/model/archetypetype/ArchetypeTypeSetParser.java	2010-05-24 19:23:19 UTC (rev 7988)
@@ -33,6 +33,7 @@
 import net.sf.gridarta.model.errorview.ErrorViewCollector;
 import net.sf.gridarta.model.gameobject.GameObject;
 import net.sf.gridarta.model.map.maparchobject.MapArchObject;
+import net.sf.gridarta.utils.SyntaxErrorException;
 import net.sf.japi.xml.NodeListIterator;
 import org.apache.log4j.Category;
 import org.apache.log4j.Logger;
@@ -324,25 +325,29 @@
         final Iterator<Element> it = new NodeListIterator<Element>(xpath, element, "ignore_list|ignorelists/ignore_list");
         while (it.hasNext()) {
             final Element elem = it.next();
-            if (elem.getAttribute("name") == null) {
-                errorViewCollector.addWarning(ErrorViewCategory.TYPES_ENTRY_INVALID, "cannot load ignore_list element without 'name'.");
-            } else {
-                final String name = elem.getAttribute("name").trim();
-                final List<String> content = new ArrayList<String>();
-                final Iterator<Element> it2 = new NodeListIterator<Element>(elem, ArchetypeTypeParser.XML_ATTRIBUTE);
-                while (it2.hasNext()) {
-                    final Element el2 = it2.next();
-                    final Attr a = el2.getAttributeNode(ArchetypeAttributeParser.XML_KEY_ARCH);
-                    if (a != null) {
-                        content.add(a.getValue().trim());
-                    } else {
-                        errorViewCollector.addWarning(ErrorViewCategory.TYPES_ENTRY_INVALID, name + ": " + ArchetypeTypeParser.XML_ATTRIBUTE + " missing '" + ArchetypeAttributeParser.XML_KEY_ARCH + "'.");
-                    }
+            final String name = elem.getAttribute("name");
+            if (ignoreListTable.containsKey(name)) {
+                errorViewCollector.addWarning(ErrorViewCategory.TYPES_ENTRY_INVALID, name + ": duplicate name");
+            }
+
+            final List<String> content = new ArrayList<String>();
+            final Iterator<Element> it2 = new NodeListIterator<Element>(elem, "attribute");
+            while (it2.hasNext()) {
+                final Element el2 = it2.next();
+                final Attr a = el2.getAttributeNode("arch");
+                if (a != null) {
+                    content.add(a.getValue());
+                } else {
+                    errorViewCollector.addWarning(ErrorViewCategory.TYPES_ENTRY_INVALID, name + ": attribute missing 'arch'.");
                 }
-                if (!content.isEmpty()) {
-                    ignoreListTable.put(name, content);
+
+                try {
+                    rejectAttributes(el2, "type", "arch_begin", "arch_end", "editor", "value", "min", "max", "check_min", "check_max", "length", "true", "false", "marker");
+                } catch (final SyntaxErrorException ex) {
+                    errorViewCollector.addWarning(ErrorViewCategory.TYPES_ENTRY_INVALID, name + ": " + ex.getMessage() + ".");
                 }
             }
+            ignoreListTable.put(name, content);
         }
         return ignoreListTable;
     }
@@ -380,4 +385,18 @@
         }
     }
 
+    /**
+     * Makes sure an {@link Element} does not define attributes.
+     * @param element the element to check
+     * @param attributes the attributes to check for
+     * @throws SyntaxErrorException if an attribute was found
+     */
+    private static void rejectAttributes(@NotNull final Element element, @NotNull final String... attributes) throws SyntaxErrorException {
+        for (final String attribute : attributes) {
+            if (element.hasAttribute(attribute)) {
+                throw new SyntaxErrorException("unexpected attribute '" + attribute + "'");
+            }
+        }
+    }
+
 } // class ArchetypeTypeSetParser


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




Thread: [Gridarta-commit] SF.net SVN: gridarta:[7988] trunk (Page 51)

gridarta-commit