You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@abdera.apache.org by jm...@apache.org on 2007/10/12 23:02:08 UTC
svn commit: r584269 - in /incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax: FOMDocument.java FOMElement.java

Author: jmsnell
Date: Fri Oct 12 14:02:06 2007
New Revision: 584269

URL: http://svn.apache.org/viewvc?rev=584269&view=rev
Log:
As it turns out, Axiom has a method already for ensuring that the element is fully parsed; we do not need to toString, just call build()

Modified:
    incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMDocument.java
    incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMElement.java

Modified: incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMDocument.java
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMDocument.java?rev=584269&r1=584268&r2=584269&view=diff
==============================================================================
--- incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMDocument.java (original)
+++ incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMDocument.java Fri Oct 12 14:02:06 2007
@@ -29,6 +29,8 @@
 import javax.xml.stream.XMLStreamException;
 
 import org.apache.abdera.factory.Factory;
+import org.apache.abdera.i18n.iri.IRI;
+import org.apache.abdera.i18n.lang.Lang;
 import org.apache.abdera.model.Document;
 import org.apache.abdera.model.Element;
 import org.apache.abdera.model.ElementWrapper;
@@ -37,8 +39,6 @@
 import org.apache.abdera.util.XmlUtil.XMLVersion;
 import org.apache.abdera.writer.Writer;
 import org.apache.abdera.writer.WriterOptions;
-import org.apache.abdera.i18n.iri.IRI;
-import org.apache.abdera.i18n.lang.Lang;
 import org.apache.axiom.om.OMComment;
 import org.apache.axiom.om.OMDocType;
 import org.apache.axiom.om.OMDocument;
@@ -351,6 +351,6 @@
    * to be modified.
    */
   public void complete() {
-    if (!isComplete() && getRoot() != null) getRoot().toString();
+    if (!isComplete() && getRoot() != null) getRoot().complete();
   }
 }

Modified: incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMElement.java
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMElement.java?rev=584269&r1=584268&r2=584269&view=diff
==============================================================================
--- incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMElement.java (original)
+++ incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMElement.java Fri Oct 12 14:02:06 2007
@@ -34,9 +34,10 @@
 import javax.activation.MimeType;
 import javax.xml.namespace.QName;
 import javax.xml.stream.XMLStreamException;
-//import javax.xml.stream.XMLStreamWriter;
 
 import org.apache.abdera.factory.Factory;
+import org.apache.abdera.i18n.iri.IRI;
+import org.apache.abdera.i18n.lang.Lang;
 import org.apache.abdera.model.Base;
 import org.apache.abdera.model.Content;
 import org.apache.abdera.model.Div;
@@ -55,8 +56,6 @@
 import org.apache.abdera.util.URIHelper;
 import org.apache.abdera.writer.Writer;
 import org.apache.abdera.writer.WriterOptions;
-import org.apache.abdera.i18n.iri.IRI;
-import org.apache.abdera.i18n.lang.Lang;
 import org.apache.axiom.om.OMAttribute;
 import org.apache.axiom.om.OMComment;
 import org.apache.axiom.om.OMContainer;
@@ -811,6 +810,6 @@
    * that particular element has been completely parsed.
    */
   public void complete() {
-    if (!isComplete()) toString();
+    super.build();
   }
 }