Author: veithen
Date: Mon Aug 13 08:50:41 2012
New Revision: 1372321
URL: http://svn.apache.org/viewvc?rev=1372321&view=rev
Log:
Some more unfinished code.
Modified:
abdera/java/branches/axiom-upgrade/parser/src/main/java/org/apache/abdera/parser/stax/FOMComment.java
abdera/java/branches/axiom-upgrade/parser/src/main/java/org/apache/abdera/parser/stax/FOMDocument.java
abdera/java/branches/axiom-upgrade/parser/src/main/java/org/apache/abdera/parser/stax/FOMFactory.java
abdera/java/branches/axiom-upgrade/parser/src/main/java/org/apache/abdera/parser/stax/FOMProcessingInstruction.java
abdera/java/branches/axiom-upgrade/parser/src/main/java/org/apache/abdera/parser/stax/FOMTextValue.java
Modified:
abdera/java/branches/axiom-upgrade/parser/src/main/java/org/apache/abdera/parser/stax/FOMComment.java
URL:
http://svn.apache.org/viewvc/abdera/java/branches/axiom-upgrade/parser/src/main/java/org/apache/abdera/parser/stax/FOMComment.java?rev=1372321&r1=1372320&r2=1372321&view=diff
==============================================================================
---
abdera/java/branches/axiom-upgrade/parser/src/main/java/org/apache/abdera/parser/stax/FOMComment.java
(original)
+++
abdera/java/branches/axiom-upgrade/parser/src/main/java/org/apache/abdera/parser/stax/FOMComment.java
Mon Aug 13 08:50:41 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/branches/axiom-upgrade/parser/src/main/java/org/apache/abdera/parser/stax/FOMDocument.java
URL:
http://svn.apache.org/viewvc/abdera/java/branches/axiom-upgrade/parser/src/main/java/org/apache/abdera/parser/stax/FOMDocument.java?rev=1372321&r1=1372320&r2=1372321&view=diff
==============================================================================
---
abdera/java/branches/axiom-upgrade/parser/src/main/java/org/apache/abdera/parser/stax/FOMDocument.java
(original)
+++
abdera/java/branches/axiom-upgrade/parser/src/main/java/org/apache/abdera/parser/stax/FOMDocument.java
Mon Aug 13 08:50:41 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/branches/axiom-upgrade/parser/src/main/java/org/apache/abdera/parser/stax/FOMFactory.java
URL:
http://svn.apache.org/viewvc/abdera/java/branches/axiom-upgrade/parser/src/main/java/org/apache/abdera/parser/stax/FOMFactory.java?rev=1372321&r1=1372320&r2=1372321&view=diff
==============================================================================
---
abdera/java/branches/axiom-upgrade/parser/src/main/java/org/apache/abdera/parser/stax/FOMFactory.java
(original)
+++
abdera/java/branches/axiom-upgrade/parser/src/main/java/org/apache/abdera/parser/stax/FOMFactory.java
Mon Aug 13 08:50:41 2012
@@ -726,7 +726,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
@@ -746,7 +746,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
@@ -765,11 +765,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);
}
@@ -781,12 +776,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/branches/axiom-upgrade/parser/src/main/java/org/apache/abdera/parser/stax/FOMProcessingInstruction.java
URL:
http://svn.apache.org/viewvc/abdera/java/branches/axiom-upgrade/parser/src/main/java/org/apache/abdera/parser/stax/FOMProcessingInstruction.java?rev=1372321&r1=1372320&r2=1372321&view=diff
==============================================================================
---
abdera/java/branches/axiom-upgrade/parser/src/main/java/org/apache/abdera/parser/stax/FOMProcessingInstruction.java
(original)
+++
abdera/java/branches/axiom-upgrade/parser/src/main/java/org/apache/abdera/parser/stax/FOMProcessingInstruction.java
Mon Aug 13 08:50:41 2012
@@ -28,9 +28,9 @@ import org.apache.axiom.om.impl.llom.OMP
@SuppressWarnings("unchecked")
public class FOMProcessingInstruction extends OMProcessingInstructionImpl
implements ProcessingInstruction {
- public FOMProcessingInstruction(OMContainer parentNode, String target,
String value,
+ public FOMProcessingInstruction(OMContainer parent, String target, String
value,
OMFactory factory, boolean fromBuilder) {
- super(parentNode, target, value, factory, fromBuilder);
+ super(parent, target, value, factory, fromBuilder);
}
public <T extends Base> T getParentElement() {
Modified:
abdera/java/branches/axiom-upgrade/parser/src/main/java/org/apache/abdera/parser/stax/FOMTextValue.java
URL:
http://svn.apache.org/viewvc/abdera/java/branches/axiom-upgrade/parser/src/main/java/org/apache/abdera/parser/stax/FOMTextValue.java?rev=1372321&r1=1372320&r2=1372321&view=diff
==============================================================================
---
abdera/java/branches/axiom-upgrade/parser/src/main/java/org/apache/abdera/parser/stax/FOMTextValue.java
(original)
+++
abdera/java/branches/axiom-upgrade/parser/src/main/java/org/apache/abdera/parser/stax/FOMTextValue.java
Mon Aug 13 08:50:41 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);
}
