nokogiri 1.11.0.rc4-java → 1.11.5-java

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

@@ -27,67 +27,80 @@ import org.w3c.dom.NodeList;
 /**
  * @author Christian Geuer-Pollmann
  */
-public class HelperNodeList implements NodeList {
+public class HelperNodeList implements NodeList
+{
 
-    /** Field nodes */
-    List<Node> nodes = new ArrayList<Node>();
-    boolean allNodesMustHaveSameParent = false;
+  /** Field nodes */
+  List<Node> nodes = new ArrayList<Node>();
+  boolean allNodesMustHaveSameParent = false;
 
-    /**
-     * 
-     */
-    public HelperNodeList() {
-        this(false);
-    }
+  /**
+   *
+   */
+  public
+  HelperNodeList()
+  {
+    this(false);
+  }
 
 
-    /**
-     * @param allNodesMustHaveSameParent
-     */
-    public HelperNodeList(boolean allNodesMustHaveSameParent) {
-        this.allNodesMustHaveSameParent = allNodesMustHaveSameParent;
-    }
+  /**
+   * @param allNodesMustHaveSameParent
+   */
+  public
+  HelperNodeList(boolean allNodesMustHaveSameParent)
+  {
+    this.allNodesMustHaveSameParent = allNodesMustHaveSameParent;
+  }
 
-    /**
-     * Method item
-     *
-     * @param index
-     * @return node with index i
-     */
-    public Node item(int index) {
-        return nodes.get(index);
-    }
+  /**
+   * Method item
+   *
+   * @param index
+   * @return node with index i
+   */
+  public Node
+  item(int index)
+  {
+    return nodes.get(index);
+  }
 
-    /**
-     * Method getLength
-     *
-     *  @return length of the list
-     */
-    public int getLength() {
-        return nodes.size();
-    }
+  /**
+   * Method getLength
+   *
+   *  @return length of the list
+   */
+  public int
+  getLength()
+  {
+    return nodes.size();
+  }
 
-    /**
-     * Method appendChild
-     *
-     * @param node
-     * @throws IllegalArgumentException
-     */
-    public void appendChild(Node node) throws IllegalArgumentException {
-        if (this.allNodesMustHaveSameParent && this.getLength() > 0
-            && this.item(0).getParentNode() != node.getParentNode()) {
-            throw new IllegalArgumentException("Nodes have not the same Parent");
-        }
-        nodes.add(node);
+  /**
+   * Method appendChild
+   *
+   * @param node
+   * @throws IllegalArgumentException
+   */
+  public void
+  appendChild(Node node) throws IllegalArgumentException
+  {
+    if (this.allNodesMustHaveSameParent && this.getLength() > 0
+        && this.item(0).getParentNode() != node.getParentNode()) {
+      throw new IllegalArgumentException("Nodes have not the same Parent");
     }
+    nodes.add(node);
+  }
 
-    /**
-     * @return the document that contains this nodelist
-     */
-    public Document getOwnerDocument() {
-        if (this.getLength() == 0) {
-            return null;
-        }
-        return XMLUtils.getOwnerDocument(this.item(0));
+  /**
+   * @return the document that contains this nodelist
+   */
+  public Document
+  getOwnerDocument()
+  {
+    if (this.getLength() == 0) {
+      return null;
     }
+    return XMLUtils.getOwnerDocument(this.item(0));
+  }
 }

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

@@ -28,52 +28,59 @@ import org.xml.sax.SAXParseException;
  *
  * @author Christian Geuer-Pollmann
  */
-public class IgnoreAllErrorHandler implements ErrorHandler {
+public class IgnoreAllErrorHandler implements ErrorHandler
+{
 
-    /** Field throwExceptions */
-    private static final boolean warnOnExceptions =
-        System.getProperty("org.apache.xml.security.test.warn.on.exceptions", "false").equals("true");
+  /** Field throwExceptions */
+  private static final boolean warnOnExceptions =
+    System.getProperty("org.apache.xml.security.test.warn.on.exceptions", "false").equals("true");
 
-    /** Field throwExceptions           */
-    private static final boolean throwExceptions = 
-        System.getProperty("org.apache.xml.security.test.throw.exceptions", "false").equals("true");
+  /** Field throwExceptions           */
+  private static final boolean throwExceptions =
+    System.getProperty("org.apache.xml.security.test.throw.exceptions", "false").equals("true");
 
 
-    /** @inheritDoc */
-    public void warning(SAXParseException ex) throws SAXException {
-        if (IgnoreAllErrorHandler.warnOnExceptions) {
-            // TODO
-            // get handler from upper layer
-            //log.warn("", ex);
-        }
-        if (IgnoreAllErrorHandler.throwExceptions) {
-            throw ex;
-        }
+  /** @inheritDoc */
+  public void
+  warning(SAXParseException ex) throws SAXException
+  {
+    if (IgnoreAllErrorHandler.warnOnExceptions) {
+      // TODO
+      // get handler from upper layer
+      //log.warn("", ex);
     }
+    if (IgnoreAllErrorHandler.throwExceptions) {
+      throw ex;
+    }
+  }
 
 
-    /** @inheritDoc */
-    public void error(SAXParseException ex) throws SAXException {
-        if (IgnoreAllErrorHandler.warnOnExceptions) {
-            // TODO
-            // get handler from upper layer
-            //log.error("", ex);
-        }
-        if (IgnoreAllErrorHandler.throwExceptions) {
-            throw ex;
-        }
+  /** @inheritDoc */
+  public void
+  error(SAXParseException ex) throws SAXException
+  {
+    if (IgnoreAllErrorHandler.warnOnExceptions) {
+      // TODO
+      // get handler from upper layer
+      //log.error("", ex);
+    }
+    if (IgnoreAllErrorHandler.throwExceptions) {
+      throw ex;
     }
+  }
 
 
-    /** @inheritDoc */
-    public void fatalError(SAXParseException ex) throws SAXException {
-        if (IgnoreAllErrorHandler.warnOnExceptions) {
-            // TODO
-            // get handler from upper layer
-            //log.warn("", ex);
-        }
-        if (IgnoreAllErrorHandler.throwExceptions) {
-            throw ex;
-        }
+  /** @inheritDoc */
+  public void
+  fatalError(SAXParseException ex) throws SAXException
+  {
+    if (IgnoreAllErrorHandler.warnOnExceptions) {
+      // TODO
+      // get handler from upper layer
+      //log.warn("", ex);
+    }
+    if (IgnoreAllErrorHandler.throwExceptions) {
+      throw ex;
     }
+  }
 }

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

@@ -36,131 +36,146 @@ import org.w3c.dom.Element;
  * @author Christian Geuer-Pollmann
  */
 //public class InclusiveNamespaces extends ElementProxy implements TransformParam {
-public class InclusiveNamespaces extends ElementProxy {
-
-    /** Field _TAG_EC_INCLUSIVENAMESPACES */
-    public static final String _TAG_EC_INCLUSIVENAMESPACES =
-        "InclusiveNamespaces";
-
-    /** Field _ATT_EC_PREFIXLIST */
-    public static final String _ATT_EC_PREFIXLIST = "PrefixList";
-
-    /** Field ExclusiveCanonicalizationNamespace */
-    public static final String ExclusiveCanonicalizationNamespace =
-        "http://www.w3.org/2001/10/xml-exc-c14n#";
-
-    /**
-     * Constructor XPathContainer
-     *
-     * @param doc
-     * @param prefixList
-     */
-    public InclusiveNamespaces(Document doc, String prefixList) {
-        this(doc, InclusiveNamespaces.prefixStr2Set(prefixList));
+public class InclusiveNamespaces extends ElementProxy
+{
+
+  /** Field _TAG_EC_INCLUSIVENAMESPACES */
+  public static final String _TAG_EC_INCLUSIVENAMESPACES =
+    "InclusiveNamespaces";
+
+  /** Field _ATT_EC_PREFIXLIST */
+  public static final String _ATT_EC_PREFIXLIST = "PrefixList";
+
+  /** Field ExclusiveCanonicalizationNamespace */
+  public static final String ExclusiveCanonicalizationNamespace =
+    "http://www.w3.org/2001/10/xml-exc-c14n#";
+
+  /**
+   * Constructor XPathContainer
+   *
+   * @param doc
+   * @param prefixList
+   */
+  public
+  InclusiveNamespaces(Document doc, String prefixList)
+  {
+    this(doc, InclusiveNamespaces.prefixStr2Set(prefixList));
+  }
+
+  /**
+   * Constructor InclusiveNamespaces
+   *
+   * @param doc
+   * @param prefixes
+   */
+  public
+  InclusiveNamespaces(Document doc, Set<String> prefixes)
+  {
+    super(doc);
+
+    SortedSet<String> prefixList;
+    if (prefixes instanceof SortedSet<?>) {
+      prefixList = (SortedSet<String>)prefixes;
+    } else {
+      prefixList = new TreeSet<String>(prefixes);
     }
 
-    /**
-     * Constructor InclusiveNamespaces
-     *
-     * @param doc
-     * @param prefixes
-     */
-    public InclusiveNamespaces(Document doc, Set<String> prefixes) {
-        super(doc);
-
-        SortedSet<String> prefixList;
-        if (prefixes instanceof SortedSet<?>) {
-            prefixList = (SortedSet<String>)prefixes;
-        } else {
-            prefixList = new TreeSet<String>(prefixes);
-        }
-
-        StringBuilder sb = new StringBuilder(prefixList.size() * 8);
-        for (String prefix : prefixList) {
-            if (prefix.equals("xmlns")) {
-                sb.append("#default ");
-            } else {
-                sb.append(prefix).append(' ');
-            }
-        }
-        int last = sb.length() - 1;
-        while (last >= 0 && sb.charAt(last) == ' ') sb.setLength(last--); // trim
-        
-        this.constructionElement.setAttributeNS(null, InclusiveNamespaces._ATT_EC_PREFIXLIST, sb.toString());
+    StringBuilder sb = new StringBuilder(prefixList.size() * 8);
+    for (String prefix : prefixList) {
+      if (prefix.equals("xmlns")) {
+        sb.append("#default ");
+      } else {
+        sb.append(prefix).append(' ');
+      }
     }
-
-    /**
-     * Constructor InclusiveNamespaces
-     *
-     * @param element
-     * @param BaseURI
-     * @throws XMLSecurityException
-     */
-    public InclusiveNamespaces(Element element, String BaseURI)
-        throws CanonicalizationException {
-        super(element, BaseURI);
+    int last = sb.length() - 1;
+    while (last >= 0 && sb.charAt(last) == ' ') { sb.setLength(last--); } // trim
+
+    this.constructionElement.setAttributeNS(null, InclusiveNamespaces._ATT_EC_PREFIXLIST, sb.toString());
+  }
+
+  /**
+   * Constructor InclusiveNamespaces
+   *
+   * @param element
+   * @param BaseURI
+   * @throws XMLSecurityException
+   */
+  public
+  InclusiveNamespaces(Element element, String BaseURI)
+  throws CanonicalizationException
+  {
+    super(element, BaseURI);
+  }
+
+  /**
+   * Method getInclusiveNamespaces
+   *
+   * @return The Inclusive Namespace string
+   */
+  public String
+  getInclusiveNamespaces()
+  {
+    return this.constructionElement.getAttributeNS(null, InclusiveNamespaces._ATT_EC_PREFIXLIST);
+  }
+
+  /**
+   * Decodes the <code>inclusiveNamespaces</code> String and returns all
+   * selected namespace prefixes as a Set. The <code>#default</code>
+   * namespace token is represented as an empty namespace prefix
+   * (<code>"xmlns"</code>).
+   * <BR/>
+   * The String <code>inclusiveNamespaces=" xenc    ds #default"</code>
+   * is returned as a Set containing the following Strings:
+   * <UL>
+   * <LI><code>xmlns</code></LI>
+   * <LI><code>xenc</code></LI>
+   * <LI><code>ds</code></LI>
+   * </UL>
+   *
+   * @param inclusiveNamespaces
+   * @return A set to string
+   */
+  public static SortedSet<String>
+  prefixStr2Set(String inclusiveNamespaces)
+  {
+    SortedSet<String> prefixes = new TreeSet<String>();
+
+    if ((inclusiveNamespaces == null) || (inclusiveNamespaces.length() == 0)) {
+      return prefixes;
     }
 
-    /**
-     * Method getInclusiveNamespaces
-     *
-     * @return The Inclusive Namespace string
-     */
-    public String getInclusiveNamespaces() {
-        return this.constructionElement.getAttributeNS(null, InclusiveNamespaces._ATT_EC_PREFIXLIST);
-    }
-    
-    /**
-     * Decodes the <code>inclusiveNamespaces</code> String and returns all
-     * selected namespace prefixes as a Set. The <code>#default</code>
-     * namespace token is represented as an empty namespace prefix
-     * (<code>"xmlns"</code>).
-     * <BR/>
-     * The String <code>inclusiveNamespaces=" xenc    ds #default"</code>
-     * is returned as a Set containing the following Strings:
-     * <UL>
-     * <LI><code>xmlns</code></LI>
-     * <LI><code>xenc</code></LI>
-     * <LI><code>ds</code></LI>
-     * </UL>
-     *
-     * @param inclusiveNamespaces
-     * @return A set to string
-     */
-    public static SortedSet<String> prefixStr2Set(String inclusiveNamespaces) {
-        SortedSet<String> prefixes = new TreeSet<String>();
-
-        if ((inclusiveNamespaces == null) || (inclusiveNamespaces.length() == 0)) {
-            return prefixes;
-        }
-
-        String[] tokens = inclusiveNamespaces.split("\\s");
-        for (String prefix : tokens) {
-            if (prefix.equals("#default")) {
-                prefixes.add("xmlns");
-            } else {
-                prefixes.add(prefix);
-            }
-        }
-
-        return prefixes;
+    String[] tokens = inclusiveNamespaces.split("\\s");
+    for (String prefix : tokens) {
+      if (prefix.equals("#default")) {
+        prefixes.add("xmlns");
+      } else {
+        prefixes.add(prefix);
+      }
     }
 
-    /**
-     * Method getBaseNamespace
-     *
-     * @inheritDoc
-     */
-    public String getBaseNamespace() {
-        return InclusiveNamespaces.ExclusiveCanonicalizationNamespace;
-    }
-
-    /**
-     * Method getBaseLocalName
-     *
-     * @inheritDoc
-     */
-    public String getBaseLocalName() {
-        return InclusiveNamespaces._TAG_EC_INCLUSIVENAMESPACES;
-    }
+    return prefixes;
+  }
+
+  /**
+   * Method getBaseNamespace
+   *
+   * @inheritDoc
+   */
+  public String
+  getBaseNamespace()
+  {
+    return InclusiveNamespaces.ExclusiveCanonicalizationNamespace;
+  }
+
+  /**
+   * Method getBaseLocalName
+   *
+   * @inheritDoc
+   */
+  public String
+  getBaseLocalName()
+  {
+    return InclusiveNamespaces._TAG_EC_INCLUSIVENAMESPACES;
+  }
 }