abdera-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From veit...@apache.org
Subject svn commit: r1371964 - in /abdera/java/branches/axiom-upgrade: ./ dependencies/i18n/src/main/java/org/apache/abdera/i18n/text/io/ parser/src/main/java/org/apache/abdera/parser/stax/ parser/src/main/java/org/apache/abdera/parser/stax/util/ server/src/ma...
Date Sat, 11 Aug 2012 14:44:34 GMT
Author: veithen
Date: Sat Aug 11 14:44:34 2012
New Revision: 1371964

URL: http://svn.apache.org/viewvc?rev=1371964&view=rev
Log:
Merged latest changes from trunk.

Modified:
    abdera/java/branches/axiom-upgrade/   (props changed)
    abdera/java/branches/axiom-upgrade/dependencies/i18n/src/main/java/org/apache/abdera/i18n/text/io/CompressionUtil.java
  (props changed)
    abdera/java/branches/axiom-upgrade/parser/src/main/java/org/apache/abdera/parser/stax/FOMBuilder.java
    abdera/java/branches/axiom-upgrade/parser/src/main/java/org/apache/abdera/parser/stax/util/FOMHelper.java
    abdera/java/branches/axiom-upgrade/server/src/main/java/org/apache/abdera/protocol/server/filters/OpenSearchFilter.java
  (props changed)

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

Propchange: abdera/java/branches/axiom-upgrade/dependencies/i18n/src/main/java/org/apache/abdera/i18n/text/io/CompressionUtil.java
------------------------------------------------------------------------------
  Merged /incubator/abdera/java/trunk/dependencies/i18n/src/main/java/org/apache/abdera/i18n/text/io/CompressionUtil.java:r414893-723327
  Merged /abdera/java/trunk/dependencies/i18n/src/main/java/org/apache/abdera/i18n/text/io/CompressionUtil.java:r1371877-1371962

Modified: abdera/java/branches/axiom-upgrade/parser/src/main/java/org/apache/abdera/parser/stax/FOMBuilder.java
URL: http://svn.apache.org/viewvc/abdera/java/branches/axiom-upgrade/parser/src/main/java/org/apache/abdera/parser/stax/FOMBuilder.java?rev=1371964&r1=1371963&r2=1371964&view=diff
==============================================================================
--- abdera/java/branches/axiom-upgrade/parser/src/main/java/org/apache/abdera/parser/stax/FOMBuilder.java
(original)
+++ abdera/java/branches/axiom-upgrade/parser/src/main/java/org/apache/abdera/parser/stax/FOMBuilder.java
Sat Aug 11 14:44:34 2012
@@ -52,7 +52,6 @@ public class FOMBuilder extends StAXOMBu
     private final FOMFactory fomfactory;
     private final ParserOptions parserOptions;
     private boolean indoc = false;
-    private int depth = 0;
     private int depthInSkipElement = 0;
     private boolean ignoreWhitespace = false;
     private boolean ignoreComments = false;
@@ -82,22 +81,21 @@ public class FOMBuilder extends StAXOMBu
 
     @Override
     protected OMNode createOMElement() throws OMException {
-        depth++;
         OMElement node;
         String elementName = parser.getLocalName();
         if (lastNode == null) {
             node = constructNode(null, elementName);
         } else if (lastNode.isComplete()) {
             node = constructNode((OMContainer)lastNode.getParent(), elementName);
-            if (node != null) {
-                ((OMNodeEx)lastNode).setNextOMSibling(node);
-                ((OMNodeEx)node).setPreviousOMSibling(lastNode);
-            }
+            ((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;
     }
 
@@ -267,10 +265,6 @@ public class FOMBuilder extends StAXOMBu
         if (element == null) {
             element = new FOMElement(qname, parent, fomfactory, this);
         }
-        if (element != null) {
-            this.processNamespaceData(element);
-            processAttributes(element);
-        }
         return element;
     }
 
@@ -298,20 +292,6 @@ public class FOMBuilder extends StAXOMBu
         }
     }
 
-    @Override
-    protected void endElement() {
-        if (lastNode != null && lastNode.isComplete()) {
-            OMElement parent = (OMElement)lastNode.getParent();
-            ((OMNodeEx)parent).setComplete(true);
-            lastNode = parent;
-        } else {
-            OMNode e = lastNode;
-            if (e != null)
-                ((OMNodeEx)e).setComplete(true);
-        }
-        depth--;
-    }
-
     public <T extends Element> Document<T> getFomDocument() {
         while (!indoc && !done) {
             next();

Modified: abdera/java/branches/axiom-upgrade/parser/src/main/java/org/apache/abdera/parser/stax/util/FOMHelper.java
URL: http://svn.apache.org/viewvc/abdera/java/branches/axiom-upgrade/parser/src/main/java/org/apache/abdera/parser/stax/util/FOMHelper.java?rev=1371964&r1=1371963&r2=1371964&view=diff
==============================================================================
--- abdera/java/branches/axiom-upgrade/parser/src/main/java/org/apache/abdera/parser/stax/util/FOMHelper.java
(original)
+++ abdera/java/branches/axiom-upgrade/parser/src/main/java/org/apache/abdera/parser/stax/util/FOMHelper.java
Sat Aug 11 14:44:34 2012
@@ -25,7 +25,7 @@ import org.apache.abdera.model.Category;
 import org.apache.abdera.model.Element;
 import org.apache.abdera.model.Link;
 import org.apache.abdera.util.Constants;
-import org.apache.axiom.om.util.UUIDGenerator;
+import org.apache.axiom.util.UIDGenerator;
 
 @SuppressWarnings("unchecked")
 public class FOMHelper implements Constants {
@@ -50,6 +50,6 @@ public class FOMHelper implements Consta
     }
 
     public static String generateUuid() {
-        return UUIDGenerator.getUUID();
+        return UIDGenerator.generateURNString();
     }
 }

Propchange: abdera/java/branches/axiom-upgrade/server/src/main/java/org/apache/abdera/protocol/server/filters/OpenSearchFilter.java
------------------------------------------------------------------------------
  Merged /abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/filters/OpenSearchFilter.java:r1371877-1371962
  Merged /incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/filters/OpenSearchFilter.java:r414893-671524



Mime
View raw message