You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@groovy.apache.org by pa...@apache.org on 2019/05/16 10:12:38 UTC

[groovy] 11/25: Split history main/java/groovy/util/slurpersupport to main/java/groovy/xml - resolve conflict and keep both files

This is an automated email from the ASF dual-hosted git repository.

paulk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git

commit ff5a54bd8a63e2838a14c7dab4040a183ba90731
Merge: 22d5509 9f8431b
Author: Paul King <pa...@asert.com.au>
AuthorDate: Thu May 16 18:27:18 2019 +1000

    Split history main/java/groovy/util/slurpersupport to main/java/groovy/xml - resolve conflict and keep both files

 .../java/groovy/xml/slurpersupport/Attribute.java  | 142 +++++
 .../java/groovy/xml/slurpersupport/Attributes.java | 139 ++++
 .../xml/slurpersupport/FilteredAttributes.java     |  59 ++
 .../xml/slurpersupport/FilteredNodeChildren.java   |  64 ++
 .../groovy/xml/slurpersupport/GPathResult.java     | 710 +++++++++++++++++++++
 .../xml/slurpersupport/NamespaceAwareHashMap.java  |  78 +++
 .../java/groovy/xml/slurpersupport/NoChildren.java | 166 +++++
 .../main/java/groovy/xml/slurpersupport/Node.java  | 338 ++++++++++
 .../java/groovy/xml/slurpersupport/NodeChild.java  | 159 +++++
 .../groovy/xml/slurpersupport/NodeChildren.java    | 234 +++++++
 .../groovy/xml/slurpersupport/NodeIterator.java    |  59 ++
 .../groovy/xml/slurpersupport/NodeParents.java     |  55 ++
 .../groovy/xml/slurpersupport/ReplacementNode.java |  46 ++
 .../java/groovy/xml/slurpersupport/package.html    |  28 +
 14 files changed, 2277 insertions(+)