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/15 14:31:11 UTC
[groovy] branch master updated (7d4e69d -> 4540b1e)
This is an automated email from the ASF dual-hosted git repository.
paulk pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git.
from 7d4e69d GROOVY-8647: Split package renaming (groovy-console update startup scripts)
new cacf58d Split history main/groovy/groovy/util/FileNameFinder.groovy to main/groovy/groovy/ant - rename source-file to temp
new ca374bf Split history main/groovy/groovy/util/FileNameFinder.groovy to main/groovy/groovy/ant - rename file to target-name
new 008848a Split history main/groovy/groovy/util/FileNameFinder.groovy to main/groovy/groovy/ant - resolve conflict and keep both files
new f648f1f Split history main/groovy/groovy/util/FileNameFinder.groovy to main/groovy/groovy/ant - restore name of source-file
new c4652f8 Split history main/java/groovy/util/AntBuilder.java to main/java/groovy/ant - rename source-file to temp
new f757c5d Split history main/java/groovy/util/AntBuilder.java to main/java/groovy/ant - rename file to target-name
new 572eaf1 Split history main/java/groovy/util/AntBuilder.java to main/java/groovy/ant - resolve conflict and keep both files
new 7df547f Split history main/java/groovy/util/AntBuilder.java to main/java/groovy/ant - restore name of source-file
new 45df810 Split history main/resources/org/codehaus/groovy/antlib.xml to main/resources/groovy/ant - rename source-file to temp
new 3b0199f Split history main/resources/org/codehaus/groovy/antlib.xml to main/resources/groovy/ant - rename file to target-name
new e8d7f94 Split history main/resources/org/codehaus/groovy/antlib.xml to main/resources/groovy/ant - resolve conflict and keep both files
new 60cd00d Split history main/resources/org/codehaus/groovy/antlib.xml to main/resources/groovy/ant - restore name of source-file
new 2cbcfc8 Split history main/java/org/codehaus/groovy/runtime/SwingGroovyMethods.java to main/java/org/apache/groovy/swing/extensions - rename source-file to temp
new 39de5e7 Split history main/java/org/codehaus/groovy/runtime/SwingGroovyMethods.java to main/java/org/apache/groovy/swing/extensions - rename file to target-name
new fd1757d Split history main/java/org/codehaus/groovy/runtime/SwingGroovyMethods.java to main/java/org/apache/groovy/swing/extensions - resolve conflict and keep both files
new a7078f3 Split history main/java/org/codehaus/groovy/runtime/SwingGroovyMethods.java to main/java/org/apache/groovy/swing/extensions - restore name of source-file
new 6f2a368 GROOVY-8647: Split package renaming (groovy-swing)
new d8eeaff GROOVY-8647: Split package renaming (groovy-test)
new 4540b1e GROOVY-8647: Split package renaming (groovy-ant)
The 19 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../groovy/{util => ant}/FileNameFinder.groovy | 2 +-
.../main/groovy/groovy/util/FileNameFinder.groovy | 3 +
.../main/java/groovy/{util => ant}/AntBuilder.java | 3 +-
.../src/main/java/groovy/util/AntBuilder.java | 2 +
.../main/java/org/codehaus/groovy/ant/Groovy.java | 2 +-
.../main/java/org/codehaus/groovy/ant/Groovyc.java | 2 +-
.../{org/codehaus/groovy => groovy/ant}/antlib.xml | 0
.../spec/test/builder/AntBuilderSpecTest.groovy | 2 +-
subprojects/groovy-swing/build.gradle | 2 +-
.../groovy/swing/extensions/SwingExtensions.java} | 5 +-
.../groovy/runtime/SwingGroovyMethods.java | 72 ++++++++++++++++++++++
.../groovy/util/JavadocAssertionTestSuite.groovy | 2 +-
.../test/{transform => }/NotYetImplemented.java | 2 +-
.../src/main/java/groovy/util/AllTestSuite.java | 2 +-
.../NotYetImplementedASTTransformation.java | 2 +-
.../NotYetImplementedTransformTest.groovy | 12 ++--
16 files changed, 97 insertions(+), 18 deletions(-)
copy subprojects/groovy-ant/src/main/groovy/groovy/{util => ant}/FileNameFinder.groovy (98%)
copy subprojects/groovy-ant/src/main/java/groovy/{util => ant}/AntBuilder.java (99%)
copy subprojects/groovy-ant/src/main/resources/{org/codehaus/groovy => groovy/ant}/antlib.xml (100%)
copy subprojects/groovy-swing/src/main/java/org/{codehaus/groovy/runtime/SwingGroovyMethods.java => apache/groovy/swing/extensions/SwingExtensions.java} (99%)
rename subprojects/groovy-test/src/main/java/groovy/test/{transform => }/NotYetImplemented.java (98%)
[groovy] 13/19: Split history
main/java/org/codehaus/groovy/runtime/SwingGroovyMethods.java to
main/java/org/apache/groovy/swing/extensions - rename file to target-name
Posted by 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 39de5e70ad9a37762713b864a476c965ef0e405d
Author: Paul King <pa...@asert.com.au>
AuthorDate: Wed May 15 23:17:37 2019 +1000
Split history main/java/org/codehaus/groovy/runtime/SwingGroovyMethods.java to main/java/org/apache/groovy/swing/extensions - rename file to target-name
---
.../runtime => apache/groovy/swing/extensions}/SwingGroovyMethods.java | 0
.../src/main/java/groovy/test/{transform => }/NotYetImplemented.java | 0
2 files changed, 0 insertions(+), 0 deletions(-)
diff --git a/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/runtime/SwingGroovyMethods.java b/subprojects/groovy-swing/src/main/java/org/apache/groovy/swing/extensions/SwingGroovyMethods.java
similarity index 100%
rename from subprojects/groovy-swing/src/main/java/org/codehaus/groovy/runtime/SwingGroovyMethods.java
rename to subprojects/groovy-swing/src/main/java/org/apache/groovy/swing/extensions/SwingGroovyMethods.java
diff --git a/subprojects/groovy-test/src/main/java/groovy/test/transform/NotYetImplemented.java b/subprojects/groovy-test/src/main/java/groovy/test/NotYetImplemented.java
similarity index 100%
rename from subprojects/groovy-test/src/main/java/groovy/test/transform/NotYetImplemented.java
rename to subprojects/groovy-test/src/main/java/groovy/test/NotYetImplemented.java
[groovy] 15/19: Split history
main/java/org/codehaus/groovy/runtime/SwingGroovyMethods.java to
main/java/org/apache/groovy/swing/extensions - resolve conflict and keep
both files
Posted by 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 fd1757d267e2a5a235ec7c27b221de42c447264b
Merge: 2cbcfc8 39de5e7
Author: Paul King <pa...@asert.com.au>
AuthorDate: Wed May 15 23:17:39 2019 +1000
Split history main/java/org/codehaus/groovy/runtime/SwingGroovyMethods.java to main/java/org/apache/groovy/swing/extensions - resolve conflict and keep both files
.../swing/extensions/SwingGroovyMethods.java | 1062 ++++++++++++++++++++
.../test/{transform => }/NotYetImplemented.java | 0
2 files changed, 1062 insertions(+)
[groovy] 10/19: Split history
main/resources/org/codehaus/groovy/antlib.xml to main/resources/groovy/ant
- rename source-file to temp
Posted by 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 45df8109366fae6f4844e841df67712bd25234eb
Author: Paul King <pa...@asert.com.au>
AuthorDate: Wed May 15 20:12:34 2019 +1000
Split history main/resources/org/codehaus/groovy/antlib.xml to main/resources/groovy/ant - rename source-file to temp
---
.../src/{main/resources/org/codehaus/groovy/antlib.xml => temp} | 0
1 file changed, 0 insertions(+), 0 deletions(-)
diff --git a/subprojects/groovy-ant/src/main/resources/org/codehaus/groovy/antlib.xml b/subprojects/groovy-ant/src/temp
similarity index 100%
rename from subprojects/groovy-ant/src/main/resources/org/codehaus/groovy/antlib.xml
rename to subprojects/groovy-ant/src/temp
[groovy] 16/19: Split history
main/java/org/codehaus/groovy/runtime/SwingGroovyMethods.java to
main/java/org/apache/groovy/swing/extensions - restore name of source-file
Posted by 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 a7078f339b67601cd1ac927fe27d0fbd6cc8f1e0
Author: Paul King <pa...@asert.com.au>
AuthorDate: Wed May 15 23:17:39 2019 +1000
Split history main/java/org/codehaus/groovy/runtime/SwingGroovyMethods.java to main/java/org/apache/groovy/swing/extensions - restore name of source-file
---
.../java/org/codehaus/groovy/runtime/SwingGroovyMethods.java} | 0
1 file changed, 0 insertions(+), 0 deletions(-)
diff --git a/subprojects/groovy-swing/src/temp b/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/runtime/SwingGroovyMethods.java
similarity index 100%
rename from subprojects/groovy-swing/src/temp
rename to subprojects/groovy-swing/src/main/java/org/codehaus/groovy/runtime/SwingGroovyMethods.java
[groovy] 11/19: Split history
main/resources/org/codehaus/groovy/antlib.xml to main/resources/groovy/ant
- resolve conflict and keep both files
Posted by 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 e8d7f94740c0cc207b188348c9d7d6345d758301
Merge: 45df810 3b0199f
Author: Paul King <pa...@asert.com.au>
AuthorDate: Wed May 15 20:12:34 2019 +1000
Split history main/resources/org/codehaus/groovy/antlib.xml to main/resources/groovy/ant - resolve conflict and keep both files
.../src/main/resources/groovy/ant/antlib.xml | 32 ++++++++++++++++++++++
1 file changed, 32 insertions(+)
[groovy] 05/19: Split history main/java/groovy/util/AntBuilder.java
to main/java/groovy/ant - rename file to target-name
Posted by 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 f757c5dd85ad270201554f253deea34a40cb87b3
Author: Paul King <pa...@asert.com.au>
AuthorDate: Wed May 15 19:54:15 2019 +1000
Split history main/java/groovy/util/AntBuilder.java to main/java/groovy/ant - rename file to target-name
---
subprojects/groovy-ant/src/main/java/groovy/{util => ant}/AntBuilder.java | 0
1 file changed, 0 insertions(+), 0 deletions(-)
diff --git a/subprojects/groovy-ant/src/main/java/groovy/util/AntBuilder.java b/subprojects/groovy-ant/src/main/java/groovy/ant/AntBuilder.java
similarity index 100%
rename from subprojects/groovy-ant/src/main/java/groovy/util/AntBuilder.java
rename to subprojects/groovy-ant/src/main/java/groovy/ant/AntBuilder.java
[groovy] 08/19: Split history main/java/groovy/util/AntBuilder.java
to main/java/groovy/ant - restore name of source-file
Posted by 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 7df547f935e6e2b552a27235fdde3547d608f450
Author: Paul King <pa...@asert.com.au>
AuthorDate: Wed May 15 19:54:16 2019 +1000
Split history main/java/groovy/util/AntBuilder.java to main/java/groovy/ant - restore name of source-file
---
.../groovy-ant/src/{temp => main/java/groovy/util/AntBuilder.java} | 0
1 file changed, 0 insertions(+), 0 deletions(-)
diff --git a/subprojects/groovy-ant/src/temp b/subprojects/groovy-ant/src/main/java/groovy/util/AntBuilder.java
similarity index 100%
rename from subprojects/groovy-ant/src/temp
rename to subprojects/groovy-ant/src/main/java/groovy/util/AntBuilder.java
[groovy] 07/19: Split history main/java/groovy/util/AntBuilder.java
to main/java/groovy/ant - resolve conflict and keep both files
Posted by 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 572eaf158526afb5f8d1f82218368b51ad79390a
Merge: c4652f8 f757c5d
Author: Paul King <pa...@asert.com.au>
AuthorDate: Wed May 15 19:54:16 2019 +1000
Split history main/java/groovy/util/AntBuilder.java to main/java/groovy/ant - resolve conflict and keep both files
.../src/main/java/groovy/ant/AntBuilder.java | 512 +++++++++++++++++++++
1 file changed, 512 insertions(+)
[groovy] 17/19: GROOVY-8647: Split package renaming (groovy-swing)
Posted by 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 6f2a368ae02ee65005e4dd25e94242919007e66e
Author: Paul King <pa...@asert.com.au>
AuthorDate: Wed May 15 23:33:52 2019 +1000
GROOVY-8647: Split package renaming (groovy-swing)
---
subprojects/groovy-swing/build.gradle | 2 +-
...wingGroovyMethods.java => SwingExtensions.java} | 5 +-
.../groovy/runtime/SwingGroovyMethods.java | 72 ++++++++++++++++++++++
3 files changed, 76 insertions(+), 3 deletions(-)
diff --git a/subprojects/groovy-swing/build.gradle b/subprojects/groovy-swing/build.gradle
index bb5c689..4f58517 100644
--- a/subprojects/groovy-swing/build.gradle
+++ b/subprojects/groovy-swing/build.gradle
@@ -22,7 +22,7 @@ dependencies {
testCompile project(':groovy-test')
}
task moduleDescriptor(type: org.codehaus.groovy.gradle.WriteExtensionDescriptorTask) {
- extensionClasses = 'org.codehaus.groovy.runtime.SwingGroovyMethods'
+ extensionClasses = 'org.apache.groovy.swing.extensions.SwingExtensions'
}
compileJava.dependsOn moduleDescriptor
diff --git a/subprojects/groovy-swing/src/main/java/org/apache/groovy/swing/extensions/SwingGroovyMethods.java b/subprojects/groovy-swing/src/main/java/org/apache/groovy/swing/extensions/SwingExtensions.java
similarity index 99%
rename from subprojects/groovy-swing/src/main/java/org/apache/groovy/swing/extensions/SwingGroovyMethods.java
rename to subprojects/groovy-swing/src/main/java/org/apache/groovy/swing/extensions/SwingExtensions.java
index e0aa6bf..2a4da3d 100644
--- a/subprojects/groovy-swing/src/main/java/org/apache/groovy/swing/extensions/SwingGroovyMethods.java
+++ b/subprojects/groovy-swing/src/main/java/org/apache/groovy/swing/extensions/SwingExtensions.java
@@ -16,9 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.codehaus.groovy.runtime;
+package org.apache.groovy.swing.extensions;
import groovy.lang.GString;
+import org.codehaus.groovy.runtime.DefaultGroovyMethods;
import org.codehaus.groovy.runtime.typehandling.ShortTypeHandling;
import javax.swing.*;
@@ -39,7 +40,7 @@ import java.util.Iterator;
* the normal JDK Swing classes when inside the Groovy environment.
* Static methods are used with the first parameter the destination class.
*/
-public class SwingGroovyMethods {
+public class SwingExtensions {
/**
* Provide the standard Groovy <code>size()</code> method for <code>Container</code>.
diff --git a/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/runtime/SwingGroovyMethods.java b/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/runtime/SwingGroovyMethods.java
index e0aa6bf..28d2f92 100644
--- a/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/runtime/SwingGroovyMethods.java
+++ b/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/runtime/SwingGroovyMethods.java
@@ -39,6 +39,7 @@ import java.util.Iterator;
* the normal JDK Swing classes when inside the Groovy environment.
* Static methods are used with the first parameter the destination class.
*/
+@Deprecated
public class SwingGroovyMethods {
/**
@@ -48,6 +49,7 @@ public class SwingGroovyMethods {
* @return the component count of the container
* @since 1.6.4
*/
+ @Deprecated
public static int size(Container self) {
return self.getComponentCount();
}
@@ -60,6 +62,7 @@ public class SwingGroovyMethods {
* @return the component at the given index
* @since 1.6.4
*/
+ @Deprecated
public static Component getAt(Container self, int index) {
return self.getComponent(index);
}
@@ -73,6 +76,7 @@ public class SwingGroovyMethods {
* @return same container, after the value was added to it.
* @since 1.6.4
*/
+ @Deprecated
public static Container leftShift(Container self, Component c) {
self.add(c);
return self;
@@ -85,6 +89,7 @@ public class SwingGroovyMethods {
* @return an Iterator for a Container
* @since 1.6.4
*/
+ @Deprecated
public static Iterator<Component> iterator(Container self) {
return DefaultGroovyMethods.iterator(self.getComponents());
}
@@ -95,6 +100,7 @@ public class SwingGroovyMethods {
* @param self a Container
* @since 1.6.4
*/
+ @Deprecated
public static void clear(Container self) {
self.removeAll();
}
@@ -106,6 +112,7 @@ public class SwingGroovyMethods {
* @return the button count of the buttonGroup
* @since 1.6.4
*/
+ @Deprecated
public static int size(ButtonGroup self) {
return self.getButtonCount();
}
@@ -118,6 +125,7 @@ public class SwingGroovyMethods {
* @return the button at the given index
* @since 1.6.4
*/
+ @Deprecated
public static AbstractButton getAt(ButtonGroup self, int index) {
int size = self.getButtonCount();
if (index < 0 || index >= size) return null;
@@ -138,6 +146,7 @@ public class SwingGroovyMethods {
* @return same buttonGroup, after the value was added to it.
* @since 1.6.4
*/
+ @Deprecated
public static ButtonGroup leftShift(ButtonGroup self, AbstractButton b) {
self.add(b);
return self;
@@ -150,6 +159,7 @@ public class SwingGroovyMethods {
* @return an Iterator for a ButtonGroup
* @since 1.6.4
*/
+ @Deprecated
public static Iterator<AbstractButton> iterator(ButtonGroup self) {
return DefaultGroovyMethods.iterator(self.getElements());
}
@@ -161,6 +171,7 @@ public class SwingGroovyMethods {
* @return the size of the ListModel
* @since 1.6.4
*/
+ @Deprecated
public static int size(ListModel self) {
return self.getSize();
}
@@ -173,6 +184,7 @@ public class SwingGroovyMethods {
* @return the element at the given index
* @since 1.6.4
*/
+ @Deprecated
public static Object getAt(ListModel self, int index) {
return self.getElementAt(index);
}
@@ -184,6 +196,7 @@ public class SwingGroovyMethods {
* @return an Iterator for a ListModel
* @since 1.6.4
*/
+ @Deprecated
public static Iterator iterator(final ListModel self) {
return new Iterator() {
private int index = 0;
@@ -211,6 +224,7 @@ public class SwingGroovyMethods {
* @return same listModel, after the value was added to it.
* @since 1.6.4
*/
+ @Deprecated
public static DefaultListModel leftShift(DefaultListModel self, Object e) {
self.addElement(e);
return self;
@@ -227,6 +241,7 @@ public class SwingGroovyMethods {
* @param e the element to insert at the given index
* @since 1.6.4
*/
+ @Deprecated
public static void putAt(DefaultListModel self, int index, Object e) {
self.set(index, e);
}
@@ -237,6 +252,7 @@ public class SwingGroovyMethods {
* @param self a DefaultListModel
* @since 1.6.4
*/
+ @Deprecated
public static void clear(DefaultListModel self) {
self.removeAllElements();
}
@@ -248,6 +264,7 @@ public class SwingGroovyMethods {
* @return an Iterator for a DefaultListModel
* @since 1.6.4
*/
+ @Deprecated
public static Iterator iterator(final DefaultListModel self) {
return new Iterator() {
private int index = 0;
@@ -273,6 +290,7 @@ public class SwingGroovyMethods {
* @return the item count of the comboBox
* @since 1.6.4
*/
+ @Deprecated
public static int size(JComboBox self) {
return self.getItemCount();
}
@@ -285,6 +303,7 @@ public class SwingGroovyMethods {
* @return the tem at the given index
* @since 1.6.4
*/
+ @Deprecated
public static Object getAt(JComboBox self, int index) {
return self.getItemAt(index);
}
@@ -298,6 +317,7 @@ public class SwingGroovyMethods {
* @return same comboBox, after the value was added to it.
* @since 1.6.4
*/
+ @Deprecated
public static JComboBox leftShift(JComboBox self, Object i) {
self.addItem(i);
return self;
@@ -309,6 +329,7 @@ public class SwingGroovyMethods {
* @param self a JComboBox
* @since 1.6.4
*/
+ @Deprecated
public static void clear(JComboBox self) {
self.removeAllItems();
}
@@ -320,6 +341,7 @@ public class SwingGroovyMethods {
* @return an Iterator for a ComboBox
* @since 1.6.4
*/
+ @Deprecated
public static Iterator iterator(JComboBox self) {
return iterator(self.getModel());
}
@@ -333,6 +355,7 @@ public class SwingGroovyMethods {
* @return same model, after the value was added to it.
* @since 1.6.4
*/
+ @Deprecated
public static MutableComboBoxModel leftShift(MutableComboBoxModel self, Object i) {
self.addElement(i);
return self;
@@ -349,6 +372,7 @@ public class SwingGroovyMethods {
* @param i the item to insert at the given index
* @since 1.6.4
*/
+ @Deprecated
public static void putAt(MutableComboBoxModel self, int index, Object i) {
self.insertElementAt(i, index);
}
@@ -360,6 +384,7 @@ public class SwingGroovyMethods {
* @return an Iterator for a MutableComboBoxModel
* @since 1.6.4
*/
+ @Deprecated
public static Iterator iterator(final MutableComboBoxModel self) {
return new Iterator() {
private int index = 0;
@@ -384,6 +409,7 @@ public class SwingGroovyMethods {
* @param self a DefaultComboBoxModel
* @since 1.7.3
*/
+ @Deprecated
public static void clear(DefaultComboBoxModel self) {
self.removeAllElements();
}
@@ -395,6 +421,7 @@ public class SwingGroovyMethods {
* @return the row count of the TableModel
* @since 1.6.4
*/
+ @Deprecated
public static int size(TableModel self) {
return self.getRowCount();
}
@@ -407,6 +434,7 @@ public class SwingGroovyMethods {
* @return the row at the given index
* @since 1.6.4
*/
+ @Deprecated
public static Object[] getAt(TableModel self, int index) {
int cols = self.getColumnCount();
Object[] rowData = new Object[cols];
@@ -423,6 +451,7 @@ public class SwingGroovyMethods {
* @return an Iterator for a TableModel
* @since 1.6.4
*/
+ @Deprecated
public static Iterator iterator(final TableModel self) {
return new Iterator() {
private int row = 0;
@@ -459,6 +488,7 @@ public class SwingGroovyMethods {
* @return same model, after the value was added to it.
* @since 1.6.4
*/
+ @Deprecated
public static DefaultTableModel leftShift(DefaultTableModel self, Object row) {
if (row == null) {
// adds an empty row
@@ -483,6 +513,7 @@ public class SwingGroovyMethods {
* @param row the row to insert at the given index
* @since 1.6.4
*/
+ @Deprecated
public static void putAt(DefaultTableModel self, int index, Object row) {
if (row == null) {
// adds an empty row
@@ -509,6 +540,7 @@ public class SwingGroovyMethods {
* @return an Iterator for a DefaultTableModel
* @since 1.6.4
*/
+ @Deprecated
public static Iterator iterator(final DefaultTableModel self) {
return new Iterator() {
private int row = 0;
@@ -540,6 +572,7 @@ public class SwingGroovyMethods {
* @return the column count of the TableColumnModel
* @since 1.6.4
*/
+ @Deprecated
public static int size(TableColumnModel self) {
return self.getColumnCount();
}
@@ -552,6 +585,7 @@ public class SwingGroovyMethods {
* @return the column at the given index
* @since 1.6.4
*/
+ @Deprecated
public static TableColumn getAt(TableColumnModel self, int index) {
return self.getColumn(index);
}
@@ -563,6 +597,7 @@ public class SwingGroovyMethods {
* @return an Iterator for a TableColumnModel
* @since 1.6.4
*/
+ @Deprecated
public static Iterator<TableColumn> iterator(final TableColumnModel self) {
return new Iterator<TableColumn>() {
private int index = 0;
@@ -590,6 +625,7 @@ public class SwingGroovyMethods {
* @return same model, after the value was added to it.
* @since 1.6.4
*/
+ @Deprecated
public static TableColumnModel leftShift(TableColumnModel self, TableColumn column) {
self.addColumn(column);
return self;
@@ -602,6 +638,7 @@ public class SwingGroovyMethods {
* @return the path count of the treePath
* @since 1.6.4
*/
+ @Deprecated
public static int size(TreePath self) {
return self.getPathCount();
}
@@ -614,6 +651,7 @@ public class SwingGroovyMethods {
* @return the path at the given index
* @since 1.6.4
*/
+ @Deprecated
public static Object getAt(TreePath self, int index) {
return self.getPath()[index];
}
@@ -628,6 +666,7 @@ public class SwingGroovyMethods {
* @return same treePath, after the value was added to it.
* @since 1.6.4
*/
+ @Deprecated
public static TreePath leftShift(TreePath self, Object p) {
return self.pathByAddingChild(p);
}
@@ -639,6 +678,7 @@ public class SwingGroovyMethods {
* @return an Iterator for a TreePath
* @since 1.6.4
*/
+ @Deprecated
public static Iterator iterator(TreePath self) {
return DefaultGroovyMethods.iterator(self.getPath());
}
@@ -650,6 +690,7 @@ public class SwingGroovyMethods {
* @return the child count of the treeNode
* @since 1.6.4
*/
+ @Deprecated
public static int size(TreeNode self) {
return self.getChildCount();
}
@@ -662,6 +703,7 @@ public class SwingGroovyMethods {
* @return the child node at the given index
* @since 1.6.4
*/
+ @Deprecated
public static TreeNode getAt(TreeNode self, int index) {
return self.getChildAt(index);
}
@@ -674,6 +716,7 @@ public class SwingGroovyMethods {
* @since 1.6.4
*/
@SuppressWarnings("unchecked")
+ @Deprecated
public static Iterator<TreeNode> iterator(TreeNode self) {
return (Iterator<TreeNode>) DefaultGroovyMethods.iterator(self.children());
}
@@ -687,6 +730,7 @@ public class SwingGroovyMethods {
* @return same treeNode, after the value was added to it.
* @since 1.6.4
*/
+ @Deprecated
public static MutableTreeNode leftShift(MutableTreeNode self, MutableTreeNode node) {
self.insert(node, self.getChildCount());
return self;
@@ -703,6 +747,7 @@ public class SwingGroovyMethods {
* @param node the node to insert at the given index
* @since 1.6.4
*/
+ @Deprecated
public static void putAt(MutableTreeNode self, int index, MutableTreeNode node) {
self.insert(node, index);
}
@@ -716,6 +761,7 @@ public class SwingGroovyMethods {
* @return same treeNode, after the value was added to it.
* @since 1.6.4
*/
+ @Deprecated
public static DefaultMutableTreeNode leftShift(DefaultMutableTreeNode self, DefaultMutableTreeNode node) {
self.add(node);
return self;
@@ -728,6 +774,7 @@ public class SwingGroovyMethods {
* @param self a DefaultMutableTreeNode
* @since 1.6.4
*/
+ @Deprecated
public static void clear(DefaultMutableTreeNode self) {
self.removeAllChildren();
}
@@ -739,6 +786,7 @@ public class SwingGroovyMethods {
* @return the menu component count of the menu
* @since 1.6.4
*/
+ @Deprecated
public static int size(JMenu self) {
return self.getMenuComponentCount();
}
@@ -751,6 +799,7 @@ public class SwingGroovyMethods {
* @return the menu component at the given index
* @since 1.6.4
*/
+ @Deprecated
public static Component getAt(JMenu self, int index) {
return self.getMenuComponent(index);
}
@@ -764,6 +813,7 @@ public class SwingGroovyMethods {
* @return same menu, after the value was added to it.
* @since 1.6.4
*/
+ @Deprecated
public static JMenu leftShift(JMenu self, Action action) {
self.add(action);
return self;
@@ -778,6 +828,7 @@ public class SwingGroovyMethods {
* @return same menu, after the value was added to it.
* @since 1.6.4
*/
+ @Deprecated
public static JMenu leftShift(JMenu self, Component component) {
self.add(component);
return self;
@@ -792,6 +843,7 @@ public class SwingGroovyMethods {
* @return same menu, after the value was added to it.
* @since 1.6.4
*/
+ @Deprecated
public static JMenu leftShift(JMenu self, JMenuItem item) {
self.add(item);
return self;
@@ -806,6 +858,7 @@ public class SwingGroovyMethods {
* @return same menu, after the value was added to it.
* @since 1.6.4
*/
+ @Deprecated
public static JMenu leftShift(JMenu self, String str) {
self.add(str);
return self;
@@ -820,6 +873,7 @@ public class SwingGroovyMethods {
* @return same menu, after the value was added to it.
* @since 1.6.4
*/
+ @Deprecated
public static JMenu leftShift(JMenu self, GString gstr) {
self.add(gstr.toString());
return self;
@@ -832,6 +886,7 @@ public class SwingGroovyMethods {
* @return an Iterator for a JMenu
* @since 1.6.4
*/
+ @Deprecated
public static Iterator/*<MenuElement>*/ iterator(JMenu self) {
return DefaultGroovyMethods.iterator(self.getMenuComponents());
}
@@ -843,6 +898,7 @@ public class SwingGroovyMethods {
* @return the menu count of the menuBar
* @since 1.6.4
*/
+ @Deprecated
public static int size(JMenuBar self) {
return self.getMenuCount();
}
@@ -855,6 +911,7 @@ public class SwingGroovyMethods {
* @return the menu at the given index
* @since 1.6.4
*/
+ @Deprecated
public static JMenu getAt(JMenuBar self, int index) {
return self.getMenu(index);
}
@@ -868,6 +925,7 @@ public class SwingGroovyMethods {
* @return same menuBar, after the value was added to it.
* @since 1.6.4
*/
+ @Deprecated
public static JMenuBar leftShift(JMenuBar self, JMenu menu) {
self.add(menu);
return self;
@@ -880,6 +938,7 @@ public class SwingGroovyMethods {
* @return an Iterator for a JMenuBar
* @since 1.6.4
*/
+ @Deprecated
public static Iterator/*<JMenu>*/ iterator(JMenuBar self) {
return DefaultGroovyMethods.iterator(self.getSubElements());
}
@@ -893,6 +952,7 @@ public class SwingGroovyMethods {
* @return same popupMenu, after the value was added to it.
* @since 1.6.4
*/
+ @Deprecated
public static JPopupMenu leftShift(JPopupMenu self, Action action) {
self.add(action);
return self;
@@ -907,6 +967,7 @@ public class SwingGroovyMethods {
* @return same popupMenu, after the value was added to it.
* @since 1.6.4
*/
+ @Deprecated
public static JPopupMenu leftShift(JPopupMenu self, Component component) {
self.add(component);
return self;
@@ -921,6 +982,7 @@ public class SwingGroovyMethods {
* @return same popupMenu, after the value was added to it.
* @since 1.6.4
*/
+ @Deprecated
public static JPopupMenu leftShift(JPopupMenu self, JMenuItem item) {
self.add(item);
return self;
@@ -935,6 +997,7 @@ public class SwingGroovyMethods {
* @return same popupMenu, after the value was added to it.
* @since 1.6.4
*/
+ @Deprecated
public static JPopupMenu leftShift(JPopupMenu self, String str) {
self.add(str);
return self;
@@ -949,6 +1012,7 @@ public class SwingGroovyMethods {
* @return same popupMenu, after the value was added to it.
* @since 1.6.4
*/
+ @Deprecated
public static JPopupMenu leftShift(JPopupMenu self, GString gstr) {
self.add(gstr.toString());
return self;
@@ -961,6 +1025,7 @@ public class SwingGroovyMethods {
* @return an Iterator for a JPopupMenu
* @since 1.6.4
*/
+ @Deprecated
public static Iterator<MenuElement> iterator(JPopupMenu self) {
return DefaultGroovyMethods.iterator(self.getSubElements());
}
@@ -972,6 +1037,7 @@ public class SwingGroovyMethods {
* @return the tab count of the tabbedPane
* @since 1.6.4
*/
+ @Deprecated
public static int size(JTabbedPane self) {
return self.getTabCount();
}
@@ -982,6 +1048,7 @@ public class SwingGroovyMethods {
* @param self a JTabbedPane
* @since 1.6.4
*/
+ @Deprecated
public static void clear(JTabbedPane self) {
self.removeAll();
}
@@ -994,6 +1061,7 @@ public class SwingGroovyMethods {
* @return the component at the given index
* @since 1.6.4
*/
+ @Deprecated
public static Component getAt(JTabbedPane self, int index) {
return self.getComponentAt(index);
}
@@ -1005,6 +1073,7 @@ public class SwingGroovyMethods {
* @return an Iterator for a JTabbedPane
* @since 1.6.4
*/
+ @Deprecated
public static Iterator<Component> iterator(final JTabbedPane self) {
return new Iterator<Component>() {
private int index = 0;
@@ -1032,6 +1101,7 @@ public class SwingGroovyMethods {
* @return same toolBar, after the value was added to it.
* @since 1.6.4
*/
+ @Deprecated
public static JToolBar leftShift(JToolBar self, Action action) {
self.add(action);
return self;
@@ -1045,6 +1115,7 @@ public class SwingGroovyMethods {
* @return the tab component at the given index
* @since 1.6.4
*/
+ @Deprecated
public static Component getAt(JToolBar self, int index) {
return self.getComponentAtIndex(index);
}
@@ -1055,6 +1126,7 @@ public class SwingGroovyMethods {
* @param mnemonic the String
* @since 2.3.7
*/
+ @Deprecated
public static void setMnemonic(AbstractButton button, String mnemonic) {
char c = ShortTypeHandling.castToChar(mnemonic);
button.setMnemonic(c);
[groovy] 06/19: Split history main/java/groovy/util/AntBuilder.java
to main/java/groovy/ant - rename source-file to temp
Posted by 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 c4652f89a61b3d259851bb31412fe558c81a9fd8
Author: Paul King <pa...@asert.com.au>
AuthorDate: Wed May 15 19:54:15 2019 +1000
Split history main/java/groovy/util/AntBuilder.java to main/java/groovy/ant - rename source-file to temp
---
.../groovy-ant/src/{main/java/groovy/util/AntBuilder.java => temp} | 0
1 file changed, 0 insertions(+), 0 deletions(-)
diff --git a/subprojects/groovy-ant/src/main/java/groovy/util/AntBuilder.java b/subprojects/groovy-ant/src/temp
similarity index 100%
rename from subprojects/groovy-ant/src/main/java/groovy/util/AntBuilder.java
rename to subprojects/groovy-ant/src/temp
[groovy] 01/19: Split history
main/groovy/groovy/util/FileNameFinder.groovy to main/groovy/groovy/ant -
rename file to target-name
Posted by 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 ca374bf4ccc5546889de07d4cf12405e03b0008a
Author: Paul King <pa...@asert.com.au>
AuthorDate: Wed May 15 19:53:17 2019 +1000
Split history main/groovy/groovy/util/FileNameFinder.groovy to main/groovy/groovy/ant - rename file to target-name
---
.../groovy-ant/src/main/groovy/groovy/{util => ant}/FileNameFinder.groovy | 0
1 file changed, 0 insertions(+), 0 deletions(-)
diff --git a/subprojects/groovy-ant/src/main/groovy/groovy/util/FileNameFinder.groovy b/subprojects/groovy-ant/src/main/groovy/groovy/ant/FileNameFinder.groovy
similarity index 100%
rename from subprojects/groovy-ant/src/main/groovy/groovy/util/FileNameFinder.groovy
rename to subprojects/groovy-ant/src/main/groovy/groovy/ant/FileNameFinder.groovy
[groovy] 03/19: Split history
main/groovy/groovy/util/FileNameFinder.groovy to main/groovy/groovy/ant -
resolve conflict and keep both files
Posted by 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 008848a0944854d0aeb26e34ca85c7c84b6da44f
Merge: cacf58d ca374bf
Author: Paul King <pa...@asert.com.au>
AuthorDate: Wed May 15 19:53:18 2019 +1000
Split history main/groovy/groovy/util/FileNameFinder.groovy to main/groovy/groovy/ant - resolve conflict and keep both files
.../main/groovy/groovy/ant/FileNameFinder.groovy | 46 ++++++++++++++++++++++
1 file changed, 46 insertions(+)
[groovy] 04/19: Split history
main/groovy/groovy/util/FileNameFinder.groovy to main/groovy/groovy/ant -
restore name of source-file
Posted by 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 f648f1ffff476d0324dacbd284cd07a292a50b66
Author: Paul King <pa...@asert.com.au>
AuthorDate: Wed May 15 19:53:18 2019 +1000
Split history main/groovy/groovy/util/FileNameFinder.groovy to main/groovy/groovy/ant - restore name of source-file
---
.../src/{temp => main/groovy/groovy/util/FileNameFinder.groovy} | 0
1 file changed, 0 insertions(+), 0 deletions(-)
diff --git a/subprojects/groovy-ant/src/temp b/subprojects/groovy-ant/src/main/groovy/groovy/util/FileNameFinder.groovy
similarity index 100%
rename from subprojects/groovy-ant/src/temp
rename to subprojects/groovy-ant/src/main/groovy/groovy/util/FileNameFinder.groovy
[groovy] 18/19: GROOVY-8647: Split package renaming (groovy-test)
Posted by 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 d8eeaffd70a0fa68aeb05853e40c65428f01df44
Author: Paul King <pa...@asert.com.au>
AuthorDate: Wed May 15 23:34:18 2019 +1000
GROOVY-8647: Split package renaming (groovy-test)
---
.../main/groovy/groovy/util/JavadocAssertionTestSuite.groovy | 2 +-
.../src/main/java/groovy/test/NotYetImplemented.java | 2 +-
.../groovy-test/src/main/java/groovy/util/AllTestSuite.java | 2 +-
.../test/transform/NotYetImplementedASTTransformation.java | 2 +-
.../test/transform/NotYetImplementedTransformTest.groovy | 12 ++++++------
5 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/subprojects/groovy-test/src/main/groovy/groovy/util/JavadocAssertionTestSuite.groovy b/subprojects/groovy-test/src/main/groovy/groovy/util/JavadocAssertionTestSuite.groovy
index 285428a..d2b4a93 100644
--- a/subprojects/groovy-test/src/main/groovy/groovy/util/JavadocAssertionTestSuite.groovy
+++ b/subprojects/groovy-test/src/main/groovy/groovy/util/JavadocAssertionTestSuite.groovy
@@ -69,7 +69,7 @@ class JavadocAssertionTestSuite extends TestSuite {
public static final String SYSPROP_SRC_EXCLUDES_PATTERN = "javadocAssertion.src.excludesPattern";
private static final JavadocAssertionTestBuilder testBuilder = new JavadocAssertionTestBuilder()
- private static final IFileNameFinder finder = Class.forName('groovy.util.FileNameFinder',true,this.classLoader).newInstance()
+ private static final IFileNameFinder finder = Class.forName('groovy.ant.FileNameFinder',true,this.classLoader).newInstance()
static Test suite() {
String basedir = System.getProperty(SYSPROP_SRC_DIR, "./src/")
diff --git a/subprojects/groovy-test/src/main/java/groovy/test/NotYetImplemented.java b/subprojects/groovy-test/src/main/java/groovy/test/NotYetImplemented.java
index 14724ca..c040417 100644
--- a/subprojects/groovy-test/src/main/java/groovy/test/NotYetImplemented.java
+++ b/subprojects/groovy-test/src/main/java/groovy/test/NotYetImplemented.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package groovy.test.transform;
+package groovy.test;
import org.codehaus.groovy.transform.GroovyASTTransformationClass;
diff --git a/subprojects/groovy-test/src/main/java/groovy/util/AllTestSuite.java b/subprojects/groovy-test/src/main/java/groovy/util/AllTestSuite.java
index d92a1d7..b721573 100644
--- a/subprojects/groovy-test/src/main/java/groovy/util/AllTestSuite.java
+++ b/subprojects/groovy-test/src/main/java/groovy/util/AllTestSuite.java
@@ -92,7 +92,7 @@ public class AllTestSuite extends TestSuite {
static { // this is only needed since the Groovy Build compiles *.groovy files after *.java files
try {
// TODO: dk: make FileNameFinder injectable
- finder = (IFileNameFinder) Class.forName("groovy.util.FileNameFinder").getDeclaredConstructor().newInstance();
+ finder = (IFileNameFinder) Class.forName("groovy.ant.FileNameFinder").getDeclaredConstructor().newInstance();
} catch (Exception e) {
throw new RuntimeException("Cannot find and instantiate class FileNameFinder", e);
}
diff --git a/subprojects/groovy-test/src/main/java/org/apache/groovy/test/transform/NotYetImplementedASTTransformation.java b/subprojects/groovy-test/src/main/java/org/apache/groovy/test/transform/NotYetImplementedASTTransformation.java
index a5c59c1..9ff1fb3 100644
--- a/subprojects/groovy-test/src/main/java/org/apache/groovy/test/transform/NotYetImplementedASTTransformation.java
+++ b/subprojects/groovy-test/src/main/java/org/apache/groovy/test/transform/NotYetImplementedASTTransformation.java
@@ -48,7 +48,7 @@ import static org.codehaus.groovy.ast.tools.GeneralUtils.throwS;
/**
* Handles generation of code for the {@code @NotYetImplemented} annotation.
*
- * @see groovy.transform.NotYetImplemented
+ * @see groovy.test.NotYetImplemented
*/
@GroovyASTTransformation(phase = CompilePhase.CANONICALIZATION)
public class NotYetImplementedASTTransformation extends AbstractASTTransformation {
diff --git a/subprojects/groovy-test/src/test/groovy/org/apache/groovy/test/transform/NotYetImplementedTransformTest.groovy b/subprojects/groovy-test/src/test/groovy/org/apache/groovy/test/transform/NotYetImplementedTransformTest.groovy
index 993f5e9..12605e1 100644
--- a/subprojects/groovy-test/src/test/groovy/org/apache/groovy/test/transform/NotYetImplementedTransformTest.groovy
+++ b/subprojects/groovy-test/src/test/groovy/org/apache/groovy/test/transform/NotYetImplementedTransformTest.groovy
@@ -24,7 +24,7 @@ class NotYetImplementedTransformTest extends GroovyShellTestCase {
void testNotYetImplemented() {
def output = evaluate("""
- import groovy.transform.NotYetImplemented
+ import groovy.test.NotYetImplemented
class MyTests extends GroovyTestCase {
@NotYetImplemented void testShouldNotFail() {
@@ -41,7 +41,7 @@ class NotYetImplementedTransformTest extends GroovyShellTestCase {
void testNotYetImplementedWithException() {
def output = evaluate("""
- import groovy.transform.NotYetImplemented
+ import groovy.test.NotYetImplemented
class MyTests extends GroovyTestCase {
@NotYetImplemented void testShouldNotFail() {
@@ -58,7 +58,7 @@ class NotYetImplementedTransformTest extends GroovyShellTestCase {
void testNotYetImplementedPassThrough() {
def output = evaluate("""
- import groovy.transform.NotYetImplemented
+ import groovy.test.NotYetImplemented
class MyTests extends GroovyTestCase {
@NotYetImplemented void testShouldFail() {
@@ -77,7 +77,7 @@ class NotYetImplementedTransformTest extends GroovyShellTestCase {
void testEmptyTestMethod() {
def output = evaluate("""
- import groovy.transform.NotYetImplemented
+ import groovy.test.NotYetImplemented
class MyTests extends GroovyTestCase {
@NotYetImplemented void testShouldNotFail() {}
@@ -94,7 +94,7 @@ class NotYetImplementedTransformTest extends GroovyShellTestCase {
void testNotYetImplementedJUnit4() {
def output = evaluate("""
- import groovy.transform.NotYetImplemented
+ import groovy.test.NotYetImplemented
import org.junit.Test
import org.junit.runner.JUnitCore
@@ -113,7 +113,7 @@ class NotYetImplementedTransformTest extends GroovyShellTestCase {
void testNotYetImplementedPassThroughJUnit4() {
def output = evaluate("""
- import groovy.transform.NotYetImplemented
+ import groovy.test.NotYetImplemented
import org.junit.Test
import org.junit.runner.JUnitCore
[groovy] 19/19: GROOVY-8647: Split package renaming (groovy-ant)
Posted by 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 4540b1ea8f3cab092190fce10fba871d764f4757
Author: Paul King <pa...@asert.com.au>
AuthorDate: Wed May 15 23:39:10 2019 +1000
GROOVY-8647: Split package renaming (groovy-ant)
---
.../groovy-ant/src/main/groovy/groovy/ant/FileNameFinder.groovy | 2 +-
.../groovy-ant/src/main/groovy/groovy/util/FileNameFinder.groovy | 3 +++
subprojects/groovy-ant/src/main/java/groovy/ant/AntBuilder.java | 3 ++-
subprojects/groovy-ant/src/main/java/groovy/util/AntBuilder.java | 2 ++
.../groovy-ant/src/main/java/org/codehaus/groovy/ant/Groovy.java | 2 +-
.../groovy-ant/src/main/java/org/codehaus/groovy/ant/Groovyc.java | 2 +-
subprojects/groovy-ant/src/spec/test/builder/AntBuilderSpecTest.groovy | 2 +-
7 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/subprojects/groovy-ant/src/main/groovy/groovy/ant/FileNameFinder.groovy b/subprojects/groovy-ant/src/main/groovy/groovy/ant/FileNameFinder.groovy
index 9fa5b0e..cf8a79d 100644
--- a/subprojects/groovy-ant/src/main/groovy/groovy/ant/FileNameFinder.groovy
+++ b/subprojects/groovy-ant/src/main/groovy/groovy/ant/FileNameFinder.groovy
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package groovy.util
+package groovy.ant
/**
* Find files according to a base directory and an includes and excludes pattern.
diff --git a/subprojects/groovy-ant/src/main/groovy/groovy/util/FileNameFinder.groovy b/subprojects/groovy-ant/src/main/groovy/groovy/util/FileNameFinder.groovy
index 9fa5b0e..c751d30 100644
--- a/subprojects/groovy-ant/src/main/groovy/groovy/util/FileNameFinder.groovy
+++ b/subprojects/groovy-ant/src/main/groovy/groovy/util/FileNameFinder.groovy
@@ -18,10 +18,13 @@
*/
package groovy.util
+import groovy.ant.AntBuilder
+
/**
* Find files according to a base directory and an includes and excludes pattern.
* The include and exclude patterns conform to Ant's fileset pattern conventions.
*/
+@Deprecated
class FileNameFinder implements IFileNameFinder {
List<String> getFileNames(String basedir, String pattern) {
diff --git a/subprojects/groovy-ant/src/main/java/groovy/ant/AntBuilder.java b/subprojects/groovy-ant/src/main/java/groovy/ant/AntBuilder.java
index 63123d9..166fa66 100644
--- a/subprojects/groovy-ant/src/main/java/groovy/ant/AntBuilder.java
+++ b/subprojects/groovy-ant/src/main/java/groovy/ant/AntBuilder.java
@@ -16,8 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package groovy.util;
+package groovy.ant;
+import groovy.util.BuilderSupport;
import groovy.xml.QName;
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.BuildLogger;
diff --git a/subprojects/groovy-ant/src/main/java/groovy/util/AntBuilder.java b/subprojects/groovy-ant/src/main/java/groovy/util/AntBuilder.java
index 63123d9..988140d 100644
--- a/subprojects/groovy-ant/src/main/java/groovy/util/AntBuilder.java
+++ b/subprojects/groovy-ant/src/main/java/groovy/util/AntBuilder.java
@@ -63,6 +63,7 @@ import java.util.logging.Logger;
* your classpath - see the <a href="http://ant.apache.org/manual/install.html#librarydependencies">library
* dependencies</a> for more details.
*/
+@Deprecated
public class AntBuilder extends BuilderSupport {
private final Logger log = Logger.getLogger(getClass().getName());
@@ -493,6 +494,7 @@ public class AntBuilder extends BuilderSupport {
* Would be nice to retrieve location information (from AST?).
* In a first time, without info
*/
+@Deprecated
class AntBuilderLocator implements Locator {
public int getColumnNumber() {
return 0;
diff --git a/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/Groovy.java b/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/Groovy.java
index f235771..a0931d0 100644
--- a/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/Groovy.java
+++ b/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/Groovy.java
@@ -18,12 +18,12 @@
*/
package org.codehaus.groovy.ant;
+import groovy.ant.AntBuilder;
import groovy.lang.Binding;
import groovy.lang.GroovyClassLoader;
import groovy.lang.GroovyShell;
import groovy.lang.MissingMethodException;
import groovy.lang.Script;
-import groovy.util.AntBuilder;
import org.apache.groovy.io.StringBuilderWriter;
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Project;
diff --git a/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/Groovyc.java b/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/Groovyc.java
index 899536d..9feb055 100644
--- a/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/Groovyc.java
+++ b/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/Groovyc.java
@@ -163,7 +163,7 @@ import java.util.StringTokenizer;
* <p>
* Based on the implementation of the Javac task in Apache Ant.
* <p>
- * Can also be used from {@link groovy.util.AntBuilder} to allow the build file to be scripted in Groovy.
+ * Can also be used from {@link groovy.ant.AntBuilder} to allow the build file to be scripted in Groovy.
*/
public class Groovyc extends MatchingTask {
private static final URL[] EMPTY_URL_ARRAY = new URL[0];
diff --git a/subprojects/groovy-ant/src/spec/test/builder/AntBuilderSpecTest.groovy b/subprojects/groovy-ant/src/spec/test/builder/AntBuilderSpecTest.groovy
index 40a6c55..40c38aa 100644
--- a/subprojects/groovy-ant/src/spec/test/builder/AntBuilderSpecTest.groovy
+++ b/subprojects/groovy-ant/src/spec/test/builder/AntBuilderSpecTest.groovy
@@ -32,7 +32,7 @@ class AntBuilderSpecTest extends AntTestCase {
// end::create_zip_builder[]
*/
// tag::example_echo[]
- def ant = new AntBuilder() // <1>
+ def ant = new groovy.ant.AntBuilder() // <1>
ant.echo('hello from Ant!') // <2>
// end::example_echo[]
}
[groovy] 02/19: Split history
main/groovy/groovy/util/FileNameFinder.groovy to main/groovy/groovy/ant -
rename source-file to temp
Posted by 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 cacf58dc4935635350c5c9e5c7972dad7649127d
Author: Paul King <pa...@asert.com.au>
AuthorDate: Wed May 15 19:53:17 2019 +1000
Split history main/groovy/groovy/util/FileNameFinder.groovy to main/groovy/groovy/ant - rename source-file to temp
---
.../src/{main/groovy/groovy/util/FileNameFinder.groovy => temp} | 0
1 file changed, 0 insertions(+), 0 deletions(-)
diff --git a/subprojects/groovy-ant/src/main/groovy/groovy/util/FileNameFinder.groovy b/subprojects/groovy-ant/src/temp
similarity index 100%
rename from subprojects/groovy-ant/src/main/groovy/groovy/util/FileNameFinder.groovy
rename to subprojects/groovy-ant/src/temp
[groovy] 12/19: Split history
main/resources/org/codehaus/groovy/antlib.xml to main/resources/groovy/ant
- restore name of source-file
Posted by 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 60cd00d1775359b2efa42700acd8ed825d484aa6
Author: Paul King <pa...@asert.com.au>
AuthorDate: Wed May 15 20:12:35 2019 +1000
Split history main/resources/org/codehaus/groovy/antlib.xml to main/resources/groovy/ant - restore name of source-file
---
.../src/{temp => main/resources/org/codehaus/groovy/antlib.xml} | 0
1 file changed, 0 insertions(+), 0 deletions(-)
diff --git a/subprojects/groovy-ant/src/temp b/subprojects/groovy-ant/src/main/resources/org/codehaus/groovy/antlib.xml
similarity index 100%
rename from subprojects/groovy-ant/src/temp
rename to subprojects/groovy-ant/src/main/resources/org/codehaus/groovy/antlib.xml
[groovy] 09/19: Split history
main/resources/org/codehaus/groovy/antlib.xml to main/resources/groovy/ant
- rename file to target-name
Posted by 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 3b0199f93e9ffdce589a02eb31fee495706ee057
Author: Paul King <pa...@asert.com.au>
AuthorDate: Wed May 15 20:12:33 2019 +1000
Split history main/resources/org/codehaus/groovy/antlib.xml to main/resources/groovy/ant - rename file to target-name
---
.../src/main/resources/{org/codehaus/groovy => groovy/ant}/antlib.xml | 0
1 file changed, 0 insertions(+), 0 deletions(-)
diff --git a/subprojects/groovy-ant/src/main/resources/org/codehaus/groovy/antlib.xml b/subprojects/groovy-ant/src/main/resources/groovy/ant/antlib.xml
similarity index 100%
rename from subprojects/groovy-ant/src/main/resources/org/codehaus/groovy/antlib.xml
rename to subprojects/groovy-ant/src/main/resources/groovy/ant/antlib.xml
[groovy] 14/19: Split history
main/java/org/codehaus/groovy/runtime/SwingGroovyMethods.java to
main/java/org/apache/groovy/swing/extensions - rename source-file to temp
Posted by 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 2cbcfc8dbc9ec221a0622255f736c90db38fd339
Author: Paul King <pa...@asert.com.au>
AuthorDate: Wed May 15 23:17:38 2019 +1000
Split history main/java/org/codehaus/groovy/runtime/SwingGroovyMethods.java to main/java/org/apache/groovy/swing/extensions - rename source-file to temp
---
.../java/org/codehaus/groovy/runtime/SwingGroovyMethods.java => temp} | 0
1 file changed, 0 insertions(+), 0 deletions(-)
diff --git a/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/runtime/SwingGroovyMethods.java b/subprojects/groovy-swing/src/temp
similarity index 100%
rename from subprojects/groovy-swing/src/main/java/org/codehaus/groovy/runtime/SwingGroovyMethods.java
rename to subprojects/groovy-swing/src/temp