You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ws.apache.org by ve...@apache.org on 2016/02/28 11:26:08 UTC
svn commit: r1732714 - in /webservices/axiom/trunk:
aspects/fom-aspects/src/main/java/org/apache/axiom/fom/impl/mixin/
implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/
Author: veithen
Date: Sun Feb 28 10:26:08 2016
New Revision: 1732714
URL: http://svn.apache.org/viewvc?rev=1732714&view=rev
Log:
Code simplification.
Removed:
webservices/axiom/trunk/aspects/fom-aspects/src/main/java/org/apache/axiom/fom/impl/mixin/AbderaElementMixin.aj
Modified:
webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMContent.java
webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMDiv.java
webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMElement.java
webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMText.java
Modified: webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMContent.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMContent.java?rev=1732714&r1=1732713&r2=1732714&view=diff
==============================================================================
--- webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMContent.java (original)
+++ webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMContent.java Sun Feb 28 10:26:08 2016
@@ -37,6 +37,7 @@ import org.apache.abdera.util.Constants;
import org.apache.axiom.attachments.ByteArrayDataSource;
import org.apache.axiom.fom.AbderaContent;
import org.apache.axiom.fom.AbderaElement;
+import org.apache.axiom.fom.FOMSemantics;
import org.apache.axiom.fom.IRIUtil;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMNode;
@@ -108,7 +109,7 @@ public class FOMContent extends FOMExten
removeChildren();
_addChild(el);
} else {
- _removeAllChildren();
+ coreRemoveChildren(FOMSemantics.INSTANCE);
}
return this;
}
@@ -176,7 +177,7 @@ public class FOMContent extends FOMExten
} catch (Exception e) {
}
}
- _removeAllChildren();
+ coreRemoveChildren(FOMSemantics.INSTANCE);
addChild(getOMFactory().createOMText(dataHandler, true));
return this;
}
@@ -214,7 +215,7 @@ public class FOMContent extends FOMExten
}
getOMFactory().createOMText(this, value);
} else
- _removeAllChildren();
+ coreRemoveChildren(FOMSemantics.INSTANCE);
return (T)this;
}
@@ -229,10 +230,10 @@ public class FOMContent extends FOMExten
if (value != null) {
Type type = getContentType();
if (Type.TEXT.equals(type)) {
- _removeAllChildren();
+ coreRemoveChildren(FOMSemantics.INSTANCE);
setText(type, value);
} else if (Type.HTML.equals(type)) {
- _removeAllChildren();
+ coreRemoveChildren(FOMSemantics.INSTANCE);
setText(type, value);
} else if (Type.XHTML.equals(type)) {
IRI baseUri = null;
@@ -261,7 +262,7 @@ public class FOMContent extends FOMExten
} catch (Exception e) {
}
} else if (Type.MEDIA.equals(type)) {
- _removeAllChildren();
+ coreRemoveChildren(FOMSemantics.INSTANCE);
setText(type, value);
try {
if (getMimeType() == null)
@@ -270,7 +271,7 @@ public class FOMContent extends FOMExten
}
}
} else {
- _removeAllChildren();
+ coreRemoveChildren(FOMSemantics.INSTANCE);
}
return this;
}
Modified: webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMDiv.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMDiv.java?rev=1732714&r1=1732713&r2=1732714&view=diff
==============================================================================
--- webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMDiv.java (original)
+++ webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMDiv.java Sun Feb 28 10:26:08 2016
@@ -31,6 +31,7 @@ import javax.xml.stream.XMLStreamWriter;
import org.apache.abdera.i18n.iri.IRI;
import org.apache.abdera.model.Div;
import org.apache.axiom.fom.AbderaDiv;
+import org.apache.axiom.fom.FOMSemantics;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMNode;
@@ -81,7 +82,7 @@ public class FOMDiv extends FOMExtensibl
}
public void setValue(String value) {
- _removeAllChildren();
+ coreRemoveChildren(FOMSemantics.INSTANCE);
if (value != null) {
IRI baseUri = null;
value = "<div xmlns=\"" + XHTML_NS + "\">" + value + "</div>";
Modified: webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMElement.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMElement.java?rev=1732714&r1=1732713&r2=1732714&view=diff
==============================================================================
--- webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMElement.java (original)
+++ webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMElement.java Sun Feb 28 10:26:08 2016
@@ -381,7 +381,7 @@ public class FOMElement extends FOMChild
}
getOMFactory().createOMText(this, text);
} else
- _removeAllChildren();
+ coreRemoveChildren(FOMSemantics.INSTANCE);
// return (T)this;
}
@@ -648,7 +648,7 @@ public class FOMElement extends FOMChild
}
public <T extends Element> T setText(DataHandler handler) {
- _removeAllChildren();
+ coreRemoveChildren(FOMSemantics.INSTANCE);
addChild(getOMFactory().createOMText(handler, true));
return (T)this;
}
Modified: webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMText.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMText.java?rev=1732714&r1=1732713&r2=1732714&view=diff
==============================================================================
--- webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMText.java (original)
+++ webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMText.java Sun Feb 28 10:26:08 2016
@@ -29,6 +29,7 @@ import org.apache.abdera.model.Text;
import org.apache.abdera.util.Constants;
import org.apache.axiom.fom.AbderaDiv;
import org.apache.axiom.fom.AbderaText;
+import org.apache.axiom.fom.FOMSemantics;
import org.apache.axiom.fom.IRIUtil;
import org.apache.axiom.om.OMNode;
@@ -74,7 +75,7 @@ public class FOMText extends FOMElement
removeChildren();
_addChild((AbderaDiv)value);
} else
- _removeAllChildren();
+ coreRemoveChildren(FOMSemantics.INSTANCE);
return this;
}
@@ -109,7 +110,7 @@ public class FOMText extends FOMElement
}
getOMFactory().createOMText(this, value);
} else
- _removeAllChildren();
+ coreRemoveChildren(FOMSemantics.INSTANCE);
return (T)this;
}
@@ -133,7 +134,7 @@ public class FOMText extends FOMElement
setValueElement((Div)element);
}
} else
- _removeAllChildren();
+ coreRemoveChildren(FOMSemantics.INSTANCE);
return this;
}