nokogiri 1.11.7-java → 1.12.0.rc1-java

data/ext/java/nokogiri/internals/c14n/XMLUtils.java

@@ -195,43 +195,43 @@ public class XMLUtils
     final String namespaceNs = Constants.NamespaceSpecNS;
     do {
       switch (node.getNodeType()) {
-      case Node.ELEMENT_NODE :
-        Element element = (Element) node;
-        if (!element.hasChildNodes()) {
-          break;
-        }
-        if (element.hasAttributes()) {
-          NamedNodeMap attributes = element.getAttributes();
-          int attributesLength = attributes.getLength();
-
-          for (Node child = element.getFirstChild(); child != null;
-               child = child.getNextSibling()) {
+        case Node.ELEMENT_NODE :
+          Element element = (Element) node;
+          if (!element.hasChildNodes()) {
+            break;
+          }
+          if (element.hasAttributes()) {
+            NamedNodeMap attributes = element.getAttributes();
+            int attributesLength = attributes.getLength();
 
-            if (child.getNodeType() != Node.ELEMENT_NODE) {
-              continue;
-            }
-            Element childElement = (Element) child;
+            for (Node child = element.getFirstChild(); child != null;
+                 child = child.getNextSibling()) {
 
-            for (int i = 0; i < attributesLength; i++) {
-              Attr currentAttr = (Attr) attributes.item(i);
-              if (!namespaceNs.equals(currentAttr.getNamespaceURI())) {
+              if (child.getNodeType() != Node.ELEMENT_NODE) {
                 continue;
               }
-              if (childElement.hasAttributeNS(namespaceNs,
-                                              currentAttr.getLocalName())) {
-                continue;
+              Element childElement = (Element) child;
+
+              for (int i = 0; i < attributesLength; i++) {
+                Attr currentAttr = (Attr) attributes.item(i);
+                if (!namespaceNs.equals(currentAttr.getNamespaceURI())) {
+                  continue;
+                }
+                if (childElement.hasAttributeNS(namespaceNs,
+                                                currentAttr.getLocalName())) {
+                  continue;
+                }
+                childElement.setAttributeNS(namespaceNs,
+                                            currentAttr.getName(),
+                                            currentAttr.getNodeValue());
               }
-              childElement.setAttributeNS(namespaceNs,
-                                          currentAttr.getName(),
-                                          currentAttr.getNodeValue());
             }
           }
-        }
-      case Node.ENTITY_REFERENCE_NODE :
-      case Node.DOCUMENT_NODE :
-        parent = node;
-        sibling = node.getFirstChild();
-        break;
+        case Node.ENTITY_REFERENCE_NODE :
+        case Node.DOCUMENT_NODE :
+          parent = node;
+          sibling = node.getFirstChild();
+          break;
       }
       while ((sibling == null) && (parent != null)) {
         sibling = parent.getNextSibling();

data/ext/java/nokogiri/internals/dom2dtm/DOM2DTM.java

@@ -885,26 +885,26 @@ public class DOM2DTM extends DTMDefaultBaseIterators
   {
 
     switch (node.getNodeType()) {
-    case Node.DOCUMENT_FRAGMENT_NODE :
-    case Node.DOCUMENT_NODE :
-    case Node.ELEMENT_NODE : {
-      for (Node child = node.getFirstChild(); null != child;
-           child = child.getNextSibling()) {
-        getNodeData(child, buf);
+      case Node.DOCUMENT_FRAGMENT_NODE :
+      case Node.DOCUMENT_NODE :
+      case Node.ELEMENT_NODE : {
+        for (Node child = node.getFirstChild(); null != child;
+             child = child.getNextSibling()) {
+          getNodeData(child, buf);
+        }
       }
-    }
-    break;
-    case Node.TEXT_NODE :
-    case Node.CDATA_SECTION_NODE :
-    case Node.ATTRIBUTE_NODE :	// Never a child but might be our starting node
-      buf.append(node.getNodeValue());
-      break;
-    case Node.PROCESSING_INSTRUCTION_NODE :
-      // warning(XPATHErrorResources.WG_PARSING_AND_PREPARING);
-      break;
-    default :
-      // ignore
       break;
+      case Node.TEXT_NODE :
+      case Node.CDATA_SECTION_NODE :
+      case Node.ATTRIBUTE_NODE :	// Never a child but might be our starting node
+        buf.append(node.getNodeValue());
+        break;
+      case Node.PROCESSING_INSTRUCTION_NODE :
+        // warning(XPATHErrorResources.WG_PARSING_AND_PREPARING);
+        break;
+      default :
+        // ignore
+        break;
     }
   }
 
@@ -943,30 +943,30 @@ public class DOM2DTM extends DTMDefaultBaseIterators
     short type = getNodeType(nodeHandle);
 
     switch (type) {
-    case DTM.NAMESPACE_NODE : {
-      Node node = getNode(nodeHandle);
-
-      // assume not null.
-      name = node.getNodeName();
-      if (name.startsWith("xmlns:")) {
-        name = QName.getLocalPart(name);
-      } else if (name.equals("xmlns")) {
-        name = "";
+      case DTM.NAMESPACE_NODE : {
+        Node node = getNode(nodeHandle);
+
+        // assume not null.
+        name = node.getNodeName();
+        if (name.startsWith("xmlns:")) {
+          name = QName.getLocalPart(name);
+        } else if (name.equals("xmlns")) {
+          name = "";
+        }
       }
-    }
-    break;
-    case DTM.ATTRIBUTE_NODE :
-    case DTM.ELEMENT_NODE :
-    case DTM.ENTITY_REFERENCE_NODE :
-    case DTM.PROCESSING_INSTRUCTION_NODE : {
-      Node node = getNode(nodeHandle);
-
-      // assume not null.
-      name = node.getNodeName();
-    }
-    break;
-    default :
-      name = "";
+      break;
+      case DTM.ATTRIBUTE_NODE :
+      case DTM.ELEMENT_NODE :
+      case DTM.ENTITY_REFERENCE_NODE :
+      case DTM.PROCESSING_INSTRUCTION_NODE : {
+        Node node = getNode(nodeHandle);
+
+        // assume not null.
+        name = node.getNodeName();
+      }
+      break;
+      default :
+        name = "";
     }
 
     return name;
@@ -1056,29 +1056,29 @@ public class DOM2DTM extends DTMDefaultBaseIterators
     short type = getNodeType(nodeHandle);
 
     switch (type) {
-    case DTM.NAMESPACE_NODE : {
-      Node node = getNode(nodeHandle);
+      case DTM.NAMESPACE_NODE : {
+        Node node = getNode(nodeHandle);
 
-      // assume not null.
-      String qname = node.getNodeName();
-      int index = qname.indexOf(':');
+        // assume not null.
+        String qname = node.getNodeName();
+        int index = qname.indexOf(':');
 
-      prefix = (index < 0) ? "" : qname.substring(index + 1);
-    }
-    break;
-    case DTM.ATTRIBUTE_NODE :
-    case DTM.ELEMENT_NODE : {
-      Node node = getNode(nodeHandle);
+        prefix = (index < 0) ? "" : qname.substring(index + 1);
+      }
+      break;
+      case DTM.ATTRIBUTE_NODE :
+      case DTM.ELEMENT_NODE : {
+        Node node = getNode(nodeHandle);
 
-      // assume not null.
-      String qname = node.getNodeName();
-      int index = qname.indexOf(':');
+        // assume not null.
+        String qname = node.getNodeName();
+        int index = qname.indexOf(':');
 
-      prefix = (index < 0) ? "" : qname.substring(0, index);
-    }
-    break;
-    default :
-      prefix = "";
+        prefix = (index < 0) ? "" : qname.substring(0, index);
+      }
+      break;
+      default :
+        prefix = "";
     }
 
     return prefix;
@@ -1616,38 +1616,38 @@ public class DOM2DTM extends DTMDefaultBaseIterators
   {
 
     switch (node.getNodeType()) {
-    case Node.DOCUMENT_FRAGMENT_NODE :
-    case Node.DOCUMENT_NODE :
-    case Node.ELEMENT_NODE : {
-      for (Node child = node.getFirstChild(); null != child;
-           child = child.getNextSibling()) {
-        dispatchNodeData(child, ch, depth + 1);
-      }
-    }
-    break;
-    case Node.PROCESSING_INSTRUCTION_NODE : // %REVIEW%
-    case Node.COMMENT_NODE :
-      if (0 != depth) {
-        break;
-      }
-    // NOTE: Because this operation works in the DOM space, it does _not_ attempt
-    // to perform Text Coalition. That should only be done in DTM space.
-    case Node.TEXT_NODE :
-    case Node.CDATA_SECTION_NODE :
-    case Node.ATTRIBUTE_NODE :
-      String str = node.getNodeValue();
-      if (ch instanceof org.apache.xml.dtm.ref.dom2dtm.DOM2DTM.CharacterNodeHandler) {
-        ((org.apache.xml.dtm.ref.dom2dtm.DOM2DTM.CharacterNodeHandler)ch).characters(node);
-      } else {
-        ch.characters(str.toCharArray(), 0, str.length());
+      case Node.DOCUMENT_FRAGMENT_NODE :
+      case Node.DOCUMENT_NODE :
+      case Node.ELEMENT_NODE : {
+        for (Node child = node.getFirstChild(); null != child;
+             child = child.getNextSibling()) {
+          dispatchNodeData(child, ch, depth + 1);
+        }
       }
       break;
+      case Node.PROCESSING_INSTRUCTION_NODE : // %REVIEW%
+      case Node.COMMENT_NODE :
+        if (0 != depth) {
+          break;
+        }
+      // NOTE: Because this operation works in the DOM space, it does _not_ attempt
+      // to perform Text Coalition. That should only be done in DTM space.
+      case Node.TEXT_NODE :
+      case Node.CDATA_SECTION_NODE :
+      case Node.ATTRIBUTE_NODE :
+        String str = node.getNodeValue();
+        if (ch instanceof org.apache.xml.dtm.ref.dom2dtm.DOM2DTM.CharacterNodeHandler) {
+          ((org.apache.xml.dtm.ref.dom2dtm.DOM2DTM.CharacterNodeHandler)ch).characters(node);
+        } else {
+          ch.characters(str.toCharArray(), 0, str.length());
+        }
+        break;
 //    /* case Node.PROCESSING_INSTRUCTION_NODE :
 //      // warning(XPATHErrorResources.WG_PARSING_AND_PREPARING);
 //      break; */
-    default :
-      // ignore
-      break;
+      default :
+        // ignore
+        break;
     }
   }
 

data/ext/java/nokogiri/internals/dom2dtm/DOM2DTMdefaultNamespaceDeclarationNode.java

@@ -354,81 +354,81 @@ public class DOM2DTMdefaultNamespaceDeclarationNode implements Attr, TypeInfo
   {
     short type = this.getNodeType();
     switch (type) {
-    case Node.ELEMENT_NODE : {
-
-      String namespace = this.getNamespaceURI();
-      String prefix = this.getPrefix();
-      if (namespace != null) {
-        // REVISIT: is it possible that prefix is empty string?
-        if (specifiedPrefix == null && prefix == specifiedPrefix) {
-          // looking for default namespace
-          return namespace;
-        } else if (prefix != null && prefix.equals(specifiedPrefix)) {
-          // non default namespace
-          return namespace;
+      case Node.ELEMENT_NODE : {
+
+        String namespace = this.getNamespaceURI();
+        String prefix = this.getPrefix();
+        if (namespace != null) {
+          // REVISIT: is it possible that prefix is empty string?
+          if (specifiedPrefix == null && prefix == specifiedPrefix) {
+            // looking for default namespace
+            return namespace;
+          } else if (prefix != null && prefix.equals(specifiedPrefix)) {
+            // non default namespace
+            return namespace;
+          }
         }
-      }
-      if (this.hasAttributes()) {
-        NamedNodeMap map = this.getAttributes();
-        int length = map.getLength();
-        for (int i = 0; i < length; i++) {
-          Node attr = map.item(i);
-          String attrPrefix = attr.getPrefix();
-          String value = attr.getNodeValue();
-          namespace = attr.getNamespaceURI();
-          if (namespace != null && namespace.equals("http://www.w3.org/2000/xmlns/")) {
-            // at this point we are dealing with DOM Level 2 nodes only
-            if (specifiedPrefix == null &&
-                attr.getNodeName().equals("xmlns")) {
-              // default namespace
-              return value;
-            } else if (attrPrefix != null &&
-                       attrPrefix.equals("xmlns") &&
-                       attr.getLocalName().equals(specifiedPrefix)) {
-              // non default namespace
-              return value;
+        if (this.hasAttributes()) {
+          NamedNodeMap map = this.getAttributes();
+          int length = map.getLength();
+          for (int i = 0; i < length; i++) {
+            Node attr = map.item(i);
+            String attrPrefix = attr.getPrefix();
+            String value = attr.getNodeValue();
+            namespace = attr.getNamespaceURI();
+            if (namespace != null && namespace.equals("http://www.w3.org/2000/xmlns/")) {
+              // at this point we are dealing with DOM Level 2 nodes only
+              if (specifiedPrefix == null &&
+                  attr.getNodeName().equals("xmlns")) {
+                // default namespace
+                return value;
+              } else if (attrPrefix != null &&
+                         attrPrefix.equals("xmlns") &&
+                         attr.getLocalName().equals(specifiedPrefix)) {
+                // non default namespace
+                return value;
+              }
             }
           }
         }
-      }
-      /*
-      NodeImpl ancestor = (NodeImpl)getElementAncestor(this);
-      if (ancestor != null) {
-          return ancestor.lookupNamespaceURI(specifiedPrefix);
-      }
-      */
+        /*
+        NodeImpl ancestor = (NodeImpl)getElementAncestor(this);
+        if (ancestor != null) {
+            return ancestor.lookupNamespaceURI(specifiedPrefix);
+        }
+        */
 
-      return null;
+        return null;
 
 
-    }
-    /*
-            case Node.DOCUMENT_NODE : {
-                    return((NodeImpl)((Document)this).getDocumentElement()).lookupNamespaceURI(specifiedPrefix) ;
-                }
-    */
-    case Node.ENTITY_NODE :
-    case Node.NOTATION_NODE:
-    case Node.DOCUMENT_FRAGMENT_NODE:
-    case Node.DOCUMENT_TYPE_NODE:
-      // type is unknown
-      return null;
-    case Node.ATTRIBUTE_NODE: {
-      if (this.getOwnerElement().getNodeType() == Node.ELEMENT_NODE) {
-        return getOwnerElement().lookupNamespaceURI(specifiedPrefix);
-
       }
-      return null;
-    }
-    default: {
       /*
-           NodeImpl ancestor = (NodeImpl)getElementAncestor(this);
-           if (ancestor != null) {
-               return ancestor.lookupNamespaceURI(specifiedPrefix);
-           }
-        */
-      return null;
-    }
+              case Node.DOCUMENT_NODE : {
+                      return((NodeImpl)((Document)this).getDocumentElement()).lookupNamespaceURI(specifiedPrefix) ;
+                  }
+      */
+      case Node.ENTITY_NODE :
+      case Node.NOTATION_NODE:
+      case Node.DOCUMENT_FRAGMENT_NODE:
+      case Node.DOCUMENT_TYPE_NODE:
+        // type is unknown
+        return null;
+      case Node.ATTRIBUTE_NODE: {
+        if (this.getOwnerElement().getNodeType() == Node.ELEMENT_NODE) {
+          return getOwnerElement().lookupNamespaceURI(specifiedPrefix);
+
+        }
+        return null;
+      }
+      default: {
+        /*
+             NodeImpl ancestor = (NodeImpl)getElementAncestor(this);
+             if (ancestor != null) {
+                 return ancestor.lookupNamespaceURI(specifiedPrefix);
+             }
+          */
+        return null;
+      }
 
     }
   }
@@ -531,39 +531,39 @@ public class DOM2DTMdefaultNamespaceDeclarationNode implements Attr, TypeInfo
     short type = this.getNodeType();
 
     switch (type) {
-    /*
-            case Node.ELEMENT_NODE: {
+      /*
+              case Node.ELEMENT_NODE: {
 
-                    String namespace = this.getNamespaceURI(); // to flip out children
-                    return lookupNamespacePrefix(namespaceURI, (ElementImpl)this);
-                }
+                      String namespace = this.getNamespaceURI(); // to flip out children
+                      return lookupNamespacePrefix(namespaceURI, (ElementImpl)this);
+                  }
 
-            case Node.DOCUMENT_NODE:{
-                    return((NodeImpl)((Document)this).getDocumentElement()).lookupPrefix(namespaceURI);
-                }
-    */
-    case Node.ENTITY_NODE :
-    case Node.NOTATION_NODE:
-    case Node.DOCUMENT_FRAGMENT_NODE:
-    case Node.DOCUMENT_TYPE_NODE:
-      // type is unknown
-      return null;
-    case Node.ATTRIBUTE_NODE: {
-      if (this.getOwnerElement().getNodeType() == Node.ELEMENT_NODE) {
-        return getOwnerElement().lookupPrefix(namespaceURI);
+              case Node.DOCUMENT_NODE:{
+                      return((NodeImpl)((Document)this).getDocumentElement()).lookupPrefix(namespaceURI);
+                  }
+      */
+      case Node.ENTITY_NODE :
+      case Node.NOTATION_NODE:
+      case Node.DOCUMENT_FRAGMENT_NODE:
+      case Node.DOCUMENT_TYPE_NODE:
+        // type is unknown
+        return null;
+      case Node.ATTRIBUTE_NODE: {
+        if (this.getOwnerElement().getNodeType() == Node.ELEMENT_NODE) {
+          return getOwnerElement().lookupPrefix(namespaceURI);
 
+        }
+        return null;
+      }
+      default: {
+        /*
+                        NodeImpl ancestor = (NodeImpl)getElementAncestor(this);
+                        if (ancestor != null) {
+                            return ancestor.lookupPrefix(namespaceURI);
+                        }
+        */
+        return null;
       }
-      return null;
-    }
-    default: {
-      /*
-                      NodeImpl ancestor = (NodeImpl)getElementAncestor(this);
-                      if (ancestor != null) {
-                          return ancestor.lookupPrefix(namespaceURI);
-                      }
-      */
-      return null;
-    }
     }
   }