svn commit: r1727755 - in /webservices/axiom/trunk: aspects/fom-aspects/src/main/java/org/apache/axiom/fom/ implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/

[ve...@apache.org]

Author: veithen
Date: Sat Jan 30 20:29:40 2016
New Revision: 1727755

URL: http://svn.apache.org/viewvc?rev=1727755&view=rev
Log:
Add changes missing in r1727743.

Removed:
    webservices/axiom/trunk/aspects/fom-aspects/src/main/java/org/apache/axiom/fom/FOMExceptionTranslator.java
Modified:
    webservices/axiom/trunk/aspects/fom-aspects/src/main/java/org/apache/axiom/fom/CategoryContainerMixin.aj
    webservices/axiom/trunk/aspects/fom-aspects/src/main/java/org/apache/axiom/fom/FOMSemantics.java
    webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMElement.java

Modified: webservices/axiom/trunk/aspects/fom-aspects/src/main/java/org/apache/axiom/fom/CategoryContainerMixin.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/fom-aspects/src/main/java/org/apache/axiom/fom/CategoryContainerMixin.aj?rev=1727755&r1=1727754&r2=1727755&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/fom-aspects/src/main/java/org/apache/axiom/fom/CategoryContainerMixin.aj (original)
+++ webservices/axiom/trunk/aspects/fom-aspects/src/main/java/org/apache/axiom/fom/CategoryContainerMixin.aj Sat Jan 30 20:29:40 2016
@@ -55,6 +55,6 @@ public aspect CategoryContainerMixin {
         // TODO: we should probably set detachPolicy to null
         return new FOMList<Category>(coreGetElements(
                 Axis.CHILDREN, AbderaCategory.class, CATEGORY_BY_SCHEME, null, scheme,
-                FOMExceptionTranslator.INSTANCE, FOMSemantics.INSTANCE));
+                FOMSemantics.INSTANCE));
     }
 }

Modified: webservices/axiom/trunk/aspects/fom-aspects/src/main/java/org/apache/axiom/fom/FOMSemantics.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/fom-aspects/src/main/java/org/apache/axiom/fom/FOMSemantics.java?rev=1727755&r1=1727754&r2=1727755&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/fom-aspects/src/main/java/org/apache/axiom/fom/FOMSemantics.java (original)
+++ webservices/axiom/trunk/aspects/fom-aspects/src/main/java/org/apache/axiom/fom/FOMSemantics.java Sat Jan 30 20:29:40 2016
@@ -19,6 +19,7 @@
 package org.apache.axiom.fom;
 
 import org.apache.axiom.core.AttributeMatcher;
+import org.apache.axiom.core.CoreModelException;
 import org.apache.axiom.core.DetachPolicy;
 import org.apache.axiom.core.NSAwareAttributeMatcher;
 import org.apache.axiom.core.NodeType;
@@ -43,4 +44,8 @@ public final class FOMSemantics implemen
     }
 
     public static final AttributeMatcher ATTRIBUTE_MATCHER = new NSAwareAttributeMatcher(INSTANCE, false, false);
+
+    public RuntimeException toUncheckedException(CoreModelException ex) {
+        return new RuntimeException(ex);
+    }
 }

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=1727755&r1=1727754&r2=1727755&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 Sat Jan 30 20:29:40 2016
@@ -60,7 +60,6 @@ import org.apache.axiom.core.CoreChildNo
 import org.apache.axiom.core.CoreNSAwareElement;
 import org.apache.axiom.core.ElementMatcher;
 import org.apache.axiom.fom.AbderaElement;
-import org.apache.axiom.fom.FOMExceptionTranslator;
 import org.apache.axiom.fom.FOMList;
 import org.apache.axiom.fom.FOMSemantics;
 import org.apache.axiom.fom.IRIUtil;
@@ -225,8 +224,7 @@ public class FOMElement extends FOMChild
 
     public final Iterator<AbderaElement> _getChildrenWithName(QName qname) {
         return coreGetElements(Axis.CHILDREN, AbderaElement.class, ElementMatcher.BY_QNAME,
-                qname.getNamespaceURI(), qname.getLocalPart(), FOMExceptionTranslator.INSTANCE,
-                FOMSemantics.INSTANCE);
+                qname.getNamespaceURI(), qname.getLocalPart(), FOMSemantics.INSTANCE);
     }
 
     public <E extends Element> List<E> _getChildrenAsSet(QName qname) {