[groovy] 15/23: don't use deprecated version of class

[pa...@apache.org]

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 1b68852ab70ca7aa419815dc43fc575e1b1957dc
Author: Paul King <pa...@asert.com.au>
AuthorDate: Thu Sep 19 18:16:41 2019 +1000

    don't use deprecated version of class
---
 .../groovy-test/src/main/java/groovy/test/AllTestSuite.java       | 2 +-
 .../groovy-test/src/main/java/groovy/test/GroovyTestSuite.java    | 2 +-
 .../src/test/groovy/groovy/test/AllTestSuiteTest.groovy           | 2 +-
 .../groovy-xml/src/main/java/groovy/xml/dom/DOMCategory.java      | 8 ++++----
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/subprojects/groovy-test/src/main/java/groovy/test/AllTestSuite.java b/subprojects/groovy-test/src/main/java/groovy/test/AllTestSuite.java
index dc816bc..26f718b 100644
--- a/subprojects/groovy-test/src/main/java/groovy/test/AllTestSuite.java
+++ b/subprojects/groovy-test/src/main/java/groovy/test/AllTestSuite.java
@@ -45,7 +45,7 @@ import java.util.logging.Logger;
  * <p>
  * When setting the log level of this class to FINEST, all file loading will be logged.
  * <p>
- * See also groovy.util.AllTestSuiteTest.groovy
+ * See also groovy.test.AllTestSuiteTest.groovy
  */
 public class AllTestSuite extends TestSuite {
 
diff --git a/subprojects/groovy-test/src/main/java/groovy/test/GroovyTestSuite.java b/subprojects/groovy-test/src/main/java/groovy/test/GroovyTestSuite.java
index 24b2535..0dbe3c3 100644
--- a/subprojects/groovy-test/src/main/java/groovy/test/GroovyTestSuite.java
+++ b/subprojects/groovy-test/src/main/java/groovy/test/GroovyTestSuite.java
@@ -37,7 +37,7 @@ import java.security.PrivilegedAction;
  * You can specify the GroovyUnitTest to run by running this class as an application
  * and specifying the script to run on the command line.
  * <code>
- * java groovy.util.GroovyTestSuite src/test/Foo.groovy
+ * java groovy.test.GroovyTestSuite src/test/Foo.groovy
  * </code>
  * Or to run the test suite as a unit test suite in an IDE you can use
  * the 'test' system property to define the test script to run.
diff --git a/subprojects/groovy-test/src/test/groovy/groovy/test/AllTestSuiteTest.groovy b/subprojects/groovy-test/src/test/groovy/groovy/test/AllTestSuiteTest.groovy
index 1ee15b0..b428468 100644
--- a/subprojects/groovy-test/src/test/groovy/groovy/test/AllTestSuiteTest.groovy
+++ b/subprojects/groovy-test/src/test/groovy/groovy/test/AllTestSuiteTest.groovy
@@ -21,7 +21,7 @@ package groovy.test
 import java.util.logging.Level
 
 /**
- * Testing groovy.util.AllTestSuite.
+ * Testing groovy.test.AllTestSuite.
  * The suite() method must properly collect Test files under the given dir and pattern,
  * add found files to the log,
  * produce a proper TestSuite,
diff --git a/subprojects/groovy-xml/src/main/java/groovy/xml/dom/DOMCategory.java b/subprojects/groovy-xml/src/main/java/groovy/xml/dom/DOMCategory.java
index 365f21a..88798ed 100644
--- a/subprojects/groovy-xml/src/main/java/groovy/xml/dom/DOMCategory.java
+++ b/subprojects/groovy-xml/src/main/java/groovy/xml/dom/DOMCategory.java
@@ -23,8 +23,8 @@ import groovy.lang.GroovyRuntimeException;
 import groovy.lang.IntRange;
 import groovy.xml.DOMBuilder;
 import groovy.namespace.QName;
+import org.apache.groovy.xml.extensions.XmlExtensions;
 import org.codehaus.groovy.runtime.InvokerHelper;
-import org.codehaus.groovy.runtime.XmlGroovyMethods;
 import org.w3c.dom.Attr;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
@@ -281,7 +281,7 @@ public class DOMCategory {
 
     public static List<Node> list(NodeList self) {
         List<Node> answer = new ArrayList<Node>();
-        Iterator<Node> it = XmlGroovyMethods.iterator(self);
+        Iterator<Node> it = XmlExtensions.iterator(self);
         while (it.hasNext()) {
             answer.add(it.next());
         }
@@ -381,7 +381,7 @@ public class DOMCategory {
         Node beforeNode = self.getNextSibling();
         DOMBuilder b = new DOMBuilder(self.getOwnerDocument());
         Element newNodes = (Element) b.invokeMethod("rootNode", c);
-        Iterator<Node> iter = XmlGroovyMethods.iterator(children(newNodes));
+        Iterator<Node> iter = XmlExtensions.iterator(children(newNodes));
         while (iter.hasNext()) {
             parent.insertBefore(iter.next(), beforeNode);
         }
@@ -507,7 +507,7 @@ public class DOMCategory {
     private static String toString(NodeList self) {
         StringBuilder sb = new StringBuilder();
         sb.append("[");
-        Iterator it = XmlGroovyMethods.iterator(self);
+        Iterator it = XmlExtensions.iterator(self);
         while (it.hasNext()) {
             if (sb.length() > 1) sb.append(", ");
             sb.append(it.next().toString());