abdera-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From veit...@apache.org
Subject svn commit: r1374815 - in /abdera/java/trunk: ./ parser/src/main/java/org/apache/abdera/parser/stax/
Date Sun, 19 Aug 2012 18:37:51 GMT
Author: veithen
Date: Sun Aug 19 18:37:50 2012
New Revision: 1374815

URL: http://svn.apache.org/viewvc?rev=1374815&view=rev
Log:
Upgraded Axiom to 1.2.14-SNAPSHOT.

Modified:
    abdera/java/trunk/   (props changed)
    abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMBuilder.java
    abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMComment.java
    abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMDocument.java
    abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMElement.java
    abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMFactory.java
    abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMProcessingInstruction.java
    abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMTextValue.java
    abdera/java/trunk/pom.xml

Propchange: abdera/java/trunk/
------------------------------------------------------------------------------
    svn:mergeinfo = /abdera/java/branches/axiom-upgrade:1371877-1374810

Modified: abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMBuilder.java
URL: http://svn.apache.org/viewvc/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMBuilder.java?rev=1374815&r1=1374814&r2=1374815&view=diff
==============================================================================
--- abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMBuilder.java (original)
+++ abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMBuilder.java Sun
Aug 19 18:37:50 2012
@@ -57,26 +57,6 @@ public class FOMBuilder extends StAXOMBu
         return parserOptions;
     }
 
-    @Override
-    protected OMNode createOMElement() throws OMException {
-        OMElement node;
-        String elementName = parser.getLocalName();
-        if (lastNode == null) {
-            node = constructNode(null, elementName);
-        } else if (lastNode.isComplete()) {
-            node = constructNode((OMContainer)lastNode.getParent(), elementName);
-            ((OMNodeEx)lastNode).setNextOMSibling(node);
-            ((OMNodeEx)node).setPreviousOMSibling(lastNode);
-        } else {
-            OMElement e = (OMElement)lastNode;
-            node = constructNode((OMElement)lastNode, elementName);
-            ((OMContainerEx)e).setFirstChild(node);
-        }
-        this.processNamespaceData(node);
-        processAttributes(node);
-        return node;
-    }
-
     protected Text.Type getTextType() {
         Text.Type ttype = Text.Type.TEXT;
         String type = parser.getAttributeValue(null, LN_TYPE);
@@ -117,6 +97,7 @@ public class FOMBuilder extends StAXOMBu
         }
     }
 
+    @Override
     protected OMElement constructNode(OMContainer parent, String name) {
         OMElement element = null;
         if (!indoc) {

Modified: abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMComment.java
URL: http://svn.apache.org/viewvc/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMComment.java?rev=1374815&r1=1374814&r2=1374815&view=diff
==============================================================================
--- abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMComment.java (original)
+++ abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMComment.java Sun
Aug 19 18:37:50 2012
@@ -28,12 +28,9 @@ import org.apache.axiom.om.impl.llom.OMC
 @SuppressWarnings("unchecked")
 public class FOMComment extends OMCommentImpl implements Comment {
 
-    public FOMComment(OMContainer parent, OMFactory factory) {
-        super(parent, factory);
-    }
-
-    public FOMComment(OMContainer parent, String value, OMFactory factory) {
-        super(parent, value, factory);
+    public FOMComment(OMContainer parent, String contentText,
+            OMFactory factory, boolean fromBuilder) {
+        super(parent, contentText, factory, fromBuilder);
     }
 
     public String getText() {

Modified: abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMDocument.java
URL: http://svn.apache.org/viewvc/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMDocument.java?rev=1374815&r1=1374814&r2=1374815&view=diff
==============================================================================
--- abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMDocument.java
(original)
+++ abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMDocument.java
Sun Aug 19 18:37:50 2012
@@ -70,14 +70,6 @@ public class FOMDocument<T extends Eleme
         super(new FOMFactory());
     }
 
-    protected FOMDocument(OMElement documentElement, OMXMLParserWrapper parserWrapper, OMFactory
factory) {
-        super(documentElement, parserWrapper, factory);
-    }
-
-    protected FOMDocument(OMElement documentElement, OMXMLParserWrapper parserWrapper) {
-        super(documentElement, parserWrapper, new FOMFactory());
-    }
-
     protected FOMDocument(OMFactory factory) {
         super(factory);
     }

Modified: abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMElement.java
URL: http://svn.apache.org/viewvc/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMElement.java?rev=1374815&r1=1374814&r2=1374815&view=diff
==============================================================================
--- abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMElement.java (original)
+++ abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMElement.java Sun
Aug 19 18:37:50 2012
@@ -77,15 +77,15 @@ public class FOMElement extends OMElemen
     private static final long serialVersionUID = 8024257594220911953L;
 
     protected FOMElement(String name, OMNamespace namespace, OMContainer parent, OMFactory
factory) throws OMException {
-        super(name, namespace, parent, factory);
+        super(parent, name, namespace, null, factory, true);
     }
 
     protected FOMElement(QName qname, OMContainer parent, OMFactory factory) throws OMException
{
-        super(qname.getLocalPart(), getOrCreateNamespace(qname, parent, factory), parent,
factory);
+        super(parent, qname.getLocalPart(), getOrCreateNamespace(qname, parent, factory),
null, factory, true);
     }
 
     protected FOMElement(String localName, OMContainer parent, OMFactory factory, OMXMLParserWrapper
builder) {
-        super(localName, null, parent, builder, factory);
+        super(parent, localName, null, builder, factory, false);
     }
 
     private static OMNamespace getOrCreateNamespace(QName qname, OMContainer parent, OMFactory
factory) {

Modified: abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMFactory.java
URL: http://svn.apache.org/viewvc/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMFactory.java?rev=1374815&r1=1374814&r2=1374815&view=diff
==============================================================================
--- abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMFactory.java (original)
+++ abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMFactory.java Sun
Aug 19 18:37:50 2012
@@ -639,7 +639,7 @@ public class FOMFactory extends OMLinked
 
     @Override
     public OMText createOMText(Object arg0, boolean arg1) {
-        return new FOMTextValue(arg0, arg1, this);
+        return new FOMTextValue(null, arg0, arg1, this, false);
     }
 
     @Override
@@ -659,7 +659,7 @@ public class FOMFactory extends OMLinked
 
     @Override
     public OMText createOMText(OMContainer arg0, String arg1, int arg2) {
-        return new FOMTextValue(arg0, arg1, arg2, this);
+        return new FOMTextValue(arg0, arg1, arg2, this, false);
     }
 
     @Override
@@ -678,11 +678,6 @@ public class FOMFactory extends OMLinked
     }
 
     @Override
-    public OMText createOMText(String arg0, OMContainer arg1, OMXMLParserWrapper arg2) {
-        return new FOMTextValue(arg0, arg1, arg2, this);
-    }
-
-    @Override
     public OMText createOMText(String arg0, String arg1, boolean arg2) {
         return new FOMTextValue(arg0, arg1, arg2, this);
     }
@@ -694,12 +689,12 @@ public class FOMFactory extends OMLinked
 
     @Override
     public OMComment createOMComment(OMContainer arg0, String arg1) {
-        return new FOMComment(arg0, arg1, this);
+        return new FOMComment(arg0, arg1, this, false);
     }
 
     @Override
     public OMProcessingInstruction createOMProcessingInstruction(OMContainer arg0, String
arg1, String arg2) {
-        return new FOMProcessingInstruction(arg0, arg1, arg2, this);
+        return new FOMProcessingInstruction(arg0, arg1, arg2, this, false);
     }
 
 }

Modified: abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMProcessingInstruction.java
URL: http://svn.apache.org/viewvc/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMProcessingInstruction.java?rev=1374815&r1=1374814&r2=1374815&view=diff
==============================================================================
--- abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMProcessingInstruction.java
(original)
+++ abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMProcessingInstruction.java
Sun Aug 19 18:37:50 2012
@@ -28,12 +28,9 @@ import org.apache.axiom.om.impl.llom.OMP
 @SuppressWarnings("unchecked")
 public class FOMProcessingInstruction extends OMProcessingInstructionImpl implements ProcessingInstruction
{
 
-    public FOMProcessingInstruction(OMContainer parent, OMFactory factory) {
-        super(parent, factory);
-    }
-
-    public FOMProcessingInstruction(OMContainer parent, String target, String value, OMFactory
factory) {
-        super(parent, target, value, factory);
+    public FOMProcessingInstruction(OMContainer parent, String target, String value,
+            OMFactory factory, boolean fromBuilder) {
+        super(parent, target, value, factory, fromBuilder);
     }
 
     public <T extends Base> T getParentElement() {

Modified: abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMTextValue.java
URL: http://svn.apache.org/viewvc/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMTextValue.java?rev=1374815&r1=1374814&r2=1374815&view=diff
==============================================================================
--- abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMTextValue.java
(original)
+++ abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMTextValue.java
Sun Aug 19 18:37:50 2012
@@ -26,14 +26,14 @@ import org.apache.abdera.model.Element;
 import org.apache.abdera.model.TextValue;
 import org.apache.axiom.om.OMContainer;
 import org.apache.axiom.om.OMFactory;
-import org.apache.axiom.om.OMXMLParserWrapper;
 import org.apache.axiom.om.impl.llom.OMTextImpl;
 
 @SuppressWarnings("unchecked")
 public class FOMTextValue extends OMTextImpl implements TextValue {
 
-    public FOMTextValue(Object dataHandler, boolean optimize, OMFactory factory) {
-        super(dataHandler, optimize, factory);
+    public FOMTextValue(OMContainer parent, Object dataHandler,
+            boolean optimize, OMFactory factory, boolean fromBuilder) {
+        super(parent, dataHandler, optimize, factory, fromBuilder);
     }
 
     public FOMTextValue(Object dataHandler, OMFactory factory) {
@@ -52,8 +52,9 @@ public class FOMTextValue extends OMText
         super(parent, text, factory);
     }
 
-    public FOMTextValue(OMContainer parent, String text, int nodeType, OMFactory factory)
{
-        super(parent, text, nodeType, factory);
+    public FOMTextValue(OMContainer parent, String text, int nodeType,
+            OMFactory factory, boolean fromBuilder) {
+        super(parent, text, nodeType, factory, fromBuilder);
     }
 
     public FOMTextValue(OMContainer parent, String text, OMFactory factory) {
@@ -68,10 +69,6 @@ public class FOMTextValue extends OMText
         super(text, nodeType, factory);
     }
 
-    public FOMTextValue(String contentID, OMContainer parent, OMXMLParserWrapper builder,
OMFactory factory) {
-        super(contentID, parent, builder, factory);
-    }
-
     public FOMTextValue(String text, OMFactory factory) {
         super(text, factory);
     }

Modified: abdera/java/trunk/pom.xml
URL: http://svn.apache.org/viewvc/abdera/java/trunk/pom.xml?rev=1374815&r1=1374814&r2=1374815&view=diff
==============================================================================
--- abdera/java/trunk/pom.xml (original)
+++ abdera/java/trunk/pom.xml Sun Aug 19 18:37:50 2012
@@ -380,13 +380,13 @@
       <dependency>
         <groupId>org.apache.ws.commons.axiom</groupId>
         <artifactId>axiom-api</artifactId>
-        <version>1.2.12</version>  
+        <version>1.2.14-SNAPSHOT</version>  
       </dependency>
 
       <dependency>
         <groupId>org.apache.ws.commons.axiom</groupId>
         <artifactId>axiom-impl</artifactId>
-        <version>1.2.12</version>  
+        <version>1.2.14-SNAPSHOT</version>  
 
       <exclusions>
         <exclusion>



Mime
View raw message