[fractal-commits] [7997] trunk/fractaladl/toolchain/ast-core/src: Fix XMLParser.

[matthieu.leclercq@xxxxxx]

Title: [7997] trunk/fractaladl/toolchain/ast-core/src: Fix XMLParser.

Revision

7997

Author

leclercq

Date

2008-06-30 15:45:44 +0200 (Mon, 30 Jun 2008)

Log Message

Fix XMLParser. Add test for xmlContent in XMLParserTest

Modified Paths

• trunk/fractaladl/toolchain/ast-core/src/main/java/org/objectweb/fractal/adl/xml/XMLParser.java
• trunk/fractaladl/toolchain/ast-core/src/test/java/org/objectweb/fractal/adl/xml/XMLParserTest.java
• trunk/fractaladl/toolchain/ast-core/src/test/resources/org/objectweb/fractal/adl/xml/comment.dtd
• trunk/fractaladl/toolchain/ast-core/src/test/resources/org/objectweb/fractal/adl/xml/comment.xml

Diff

Modified: trunk/fractaladl/toolchain/ast-core/src/main/java/org/objectweb/fractal/adl/xml/XMLParser.java (7996 => 7997)

--- trunk/fractaladl/toolchain/ast-core/src/main/java/org/objectweb/fractal/adl/xml/XMLParser.java	2008-06-30 13:21:27 UTC (rev 7996)
+++ trunk/fractaladl/toolchain/ast-core/src/main/java/org/objectweb/fractal/adl/xml/XMLParser.java	2008-06-30 13:45:44 UTC (rev 7997)
@@ -156,6 +156,10 @@
   public void startElement(final String uri, final String localName,
       final String qualifiedName, final Attributes attributes)
       throws SAXException {
+    if (current != null && characters != null) {
+      current.xmlSetContent(characters.toString());
+      characters = null;
+    }
     final XMLNode o = nodeFactory.newXMLNode(systemId, qualifiedName);
     o.astSetSource(file + ":" + locator.getLineNumber());
     o.xmlSetAttributes(attributes);

Modified: trunk/fractaladl/toolchain/ast-core/src/test/java/org/objectweb/fractal/adl/xml/XMLParserTest.java (7996 => 7997)

--- trunk/fractaladl/toolchain/ast-core/src/test/java/org/objectweb/fractal/adl/xml/XMLParserTest.java	2008-06-30 13:21:27 UTC (rev 7996)
+++ trunk/fractaladl/toolchain/ast-core/src/test/java/org/objectweb/fractal/adl/xml/XMLParserTest.java	2008-06-30 13:45:44 UTC (rev 7997)
@@ -68,6 +68,7 @@
     assertTrue(c1 instanceof ExtendedComment);
     assertEquals("bar", c1.getText());
     assertEquals("toto.com", ((ExtendedComment) c1).getHref());
+    assertEquals("fiifuu", ((XMLNode) c1).xmlGetContent());
 
     final Comment c2 = comments[2];
     Assert.assertFalse(c2 instanceof ExtendedComment);

Modified: trunk/fractaladl/toolchain/ast-core/src/test/resources/org/objectweb/fractal/adl/xml/comment.dtd (7996 => 7997)

--- trunk/fractaladl/toolchain/ast-core/src/test/resources/org/objectweb/fractal/adl/xml/comment.dtd	2008-06-30 13:21:27 UTC (rev 7996)
+++ trunk/fractaladl/toolchain/ast-core/src/test/resources/org/objectweb/fractal/adl/xml/comment.dtd	2008-06-30 13:45:44 UTC (rev 7997)
@@ -4,6 +4,7 @@
 
 <?add ast="comment"    itf="org.objectweb.fractal.adl.comments.Comment" ?>
 <?add ast="extcomment" itf="org.objectweb.fractal.adl.comments.ExtendedComment" ?>
+<?add ast="extcomment" itf="org.objectweb.fractal.adl.comments.CommentContainer" ?>
 
 <?map ast="extcomment" type="comment" ?>
 
@@ -15,7 +16,7 @@
   text CDATA #IMPLIED
 >
 
-<!ELEMENT extcomment EMPTY >
+<!ELEMENT extcomment (#PCDATA|comment|extcomment)* >
 <!ATTLIST extcomment
   language CDATA #IMPLIED
   text CDATA #IMPLIED

Modified: trunk/fractaladl/toolchain/ast-core/src/test/resources/org/objectweb/fractal/adl/xml/comment.xml (7996 => 7997)

--- trunk/fractaladl/toolchain/ast-core/src/test/resources/org/objectweb/fractal/adl/xml/comment.xml	2008-06-30 13:21:27 UTC (rev 7996)
+++ trunk/fractaladl/toolchain/ast-core/src/test/resources/org/objectweb/fractal/adl/xml/comment.xml	2008-06-30 13:45:44 UTC (rev 7997)
@@ -4,6 +4,6 @@
 
 <container>
   <comment text="foo" />
-  <extcomment text="bar" href="" />
+  <extcomment text="bar" href="" text="titi"/>fuu</extcomment>
   <comment text="boo" />
 </container>
\ No newline at end of file