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/07 11:43:10 UTC
svn commit: r1728944 - in /webservices/axiom/trunk:
aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/builder/
aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/
axiom-api/src/main/java/org/apache/axiom/om/ src/site/markdow...
Author: veithen
Date: Sun Feb 7 10:43:09 2016
New Revision: 1728944
URL: http://svn.apache.org/viewvc?rev=1728944&view=rev
Log:
Don't store line number information in elements.
Modified:
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/builder/StAXOMBuilder.java
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomElementSupport.aj
webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/om/OMElement.java
webservices/axiom/trunk/src/site/markdown/release-notes/1.3.0.md
Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/builder/StAXOMBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/builder/StAXOMBuilder.java?rev=1728944&r1=1728943&r2=1728944&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/builder/StAXOMBuilder.java (original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/builder/StAXOMBuilder.java Sun Feb 7 10:43:09 2016
@@ -46,7 +46,6 @@ import javax.xml.stream.XMLStreamConstan
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
import javax.xml.namespace.QName;
-import javax.xml.stream.Location;
import java.io.Closeable;
@@ -604,10 +603,6 @@ public class StAXOMBuilder extends Abstr
parser.isAttributeSpecified(i));
}
handler.attributesCompleted();
- Location location = parser.getLocation();
- if (location != null) {
- newElement.setLineNumber(location.getLineNumber());
- }
}
}
Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomElementSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomElementSupport.aj?rev=1728944&r1=1728943&r2=1728944&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomElementSupport.aj (original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomElementSupport.aj Sun Feb 7 10:43:09 2016
@@ -78,8 +78,6 @@ import org.apache.commons.logging.LogFac
public aspect AxiomElementSupport {
private static final Log log = LogFactory.getLog(AxiomElementSupport.class);
- private int AxiomElement.lineNumber;
-
public final void AxiomElement.initName(String localName, OMNamespace ns, boolean generateNSDecl) {
internalSetLocalName(localName);
internalSetNamespace(generateNSDecl ? NSUtil.handleNamespace(this, ns, false, true) : ns);
@@ -591,10 +589,9 @@ public aspect AxiomElementSupport {
}
public final void AxiomElement.setLineNumber(int lineNumber) {
- this.lineNumber = lineNumber;
}
public final int AxiomElement.getLineNumber() {
- return lineNumber;
+ return 0;
}
}
Modified: webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/om/OMElement.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/om/OMElement.java?rev=1728944&r1=1728943&r2=1728944&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/om/OMElement.java (original)
+++ webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/om/OMElement.java Sun Feb 7 10:43:09 2016
@@ -576,8 +576,14 @@ public interface OMElement extends OMNod
*/
OMElement cloneOMElement();
+ /**
+ * @deprecated
+ */
void setLineNumber(int lineNumber);
+ /**
+ * @deprecated
+ */
int getLineNumber();
/**
Modified: webservices/axiom/trunk/src/site/markdown/release-notes/1.3.0.md
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/src/site/markdown/release-notes/1.3.0.md?rev=1728944&r1=1728943&r2=1728944&view=diff
==============================================================================
--- webservices/axiom/trunk/src/site/markdown/release-notes/1.3.0.md (original)
+++ webservices/axiom/trunk/src/site/markdown/release-notes/1.3.0.md Sun Feb 7 10:43:09 2016
@@ -51,3 +51,6 @@ Changes in this release
is no longer supported. In Axiom 1.3.0 the QName matching is always strict.
[AXIOM-11]: https://issues.apache.org/jira/browse/AXIOM-11
+
+* Elements no longer store line number information, and the corresponding
+ methods on the `OMElement` interface have been deprecated.