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/17 04:50:46 UTC
[groovy] branch master updated (60c102a -> a9d4d59)
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 60c102a GROOVY-9121: Default compiler configuration is modified by GroovyMain
new b786db2 Split history main/java/org/codehaus/groovy/binding to main/java/org/apache/groovy/swing - rename source-file to temp
new cb0ed44 Split history main/java/org/codehaus/groovy/binding to main/java/org/apache/groovy/swing - rename file to target-name
new ce873bb Split history main/java/org/codehaus/groovy/binding to main/java/org/apache/groovy/swing - resolve conflict and keep both files
new 42d5fa3 Split history main/java/org/codehaus/groovy/binding to main/java/org/apache/groovy/swing - restore name of source-file
new cc20ac3 Split history main/java/groovy/inspect/swingui/TableMap.java to main/java/groovy/swing/table - rename source-file to temp
new 046c59a Split history main/java/groovy/inspect/swingui/TableMap.java to main/java/groovy/swing/table - rename file to target-name
new 4ad5955 Split history main/java/groovy/inspect/swingui/TableMap.java to main/java/groovy/swing/table - resolve conflict and keep both files
new cbf4348 Split history main/java/groovy/inspect/swingui/TableMap.java to main/java/groovy/swing/table - restore name of source-file
new 9af853f Split history main/java/groovy/inspect/swingui/TableSorter.java to main/java/groovy/swing/table - rename source-file to temp
new d78bf65 Split history main/java/groovy/inspect/swingui/TableSorter.java to main/java/groovy/swing/table - rename file to target-name
new 5f61e69 Split history main/java/groovy/inspect/swingui/TableSorter.java to main/java/groovy/swing/table - resolve conflict and keep both files
new ea297f8 Split history main/java/groovy/inspect/swingui/TableSorter.java to main/java/groovy/swing/table - restore name of source-file
new 79a1997 Split history main/java/groovy/model to main/java/groovy/swing - rename source-file to temp
new 7d9f9bb Split history main/java/groovy/model to main/java/groovy/swing - rename file to target-name
new 33d0e41 Split history main/java/groovy/model to main/java/groovy/swing - resolve conflict and keep both files
new c41d398 Split history main/java/groovy/model to main/java/groovy/swing - restore name of source-file
new a9d4d59 GROOVY-8647: Split package renaming (groovy-swing)
The 17 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:
src/test/groovy/NewExpressionTest.groovy | 1 +
.../groovy/groovy/swing/LookAndFeelHelper.groovy | 18 ++---
.../swing/binding/JComboBoxMetaMethods.groovy | 5 +-
.../groovy/swing/binding/JListMetaMethods.groovy | 5 +-
.../groovy/swing/binding/JTableMetaMethods.groovy | 16 ++--
.../groovy/swing/factory/TableModelFactory.groovy | 90 +++++++++++-----------
.../main/java/groovy/inspect/swingui/TableMap.java | 1 +
.../java/groovy/inspect/swingui/TableSorter.java | 1 +
.../src/main/java/groovy/model/ClosureModel.java | 1 +
.../main/java/groovy/model/DefaultTableColumn.java | 1 +
.../main/java/groovy/model/DefaultTableModel.java | 1 +
.../src/main/java/groovy/model/FormModel.java | 1 +
.../main/java/groovy/model/NestedValueModel.java | 1 +
.../src/main/java/groovy/model/PropertyModel.java | 1 +
.../src/main/java/groovy/model/ValueHolder.java | 1 +
.../src/main/java/groovy/model/ValueModel.java | 1 +
.../groovy/{ => swing}/model/ClosureModel.java | 2 +-
.../{ => swing}/model/DefaultTableColumn.java | 2 +-
.../{ => swing}/model/DefaultTableModel.java | 2 +-
.../java/groovy/{ => swing}/model/FormModel.java | 2 +-
.../groovy/{ => swing}/model/NestedValueModel.java | 2 +-
.../groovy/{ => swing}/model/PropertyModel.java | 2 +-
.../java/groovy/{ => swing}/model/ValueHolder.java | 2 +-
.../java/groovy/{ => swing}/model/ValueModel.java | 2 +-
.../src/main/java/groovy/swing/model/package.html | 29 +++++++
.../{inspect/swingui => swing/table}/TableMap.java | 2 +-
.../swingui => swing/table}/TableSorter.java | 2 +-
.../groovy/swing}/binding/AbstractFullBinding.java | 2 +-
.../groovy/swing}/binding/AggregateBinding.java | 2 +-
.../groovy/swing}/binding/BindPath.java | 2 +-
.../groovy/swing}/binding/BindingProxy.java | 2 +-
.../groovy/swing}/binding/BindingUpdatable.java | 2 +-
.../swing}/binding/ClosureSourceBinding.java | 2 +-
.../swing}/binding/ClosureTriggerBinding.java | 2 +-
.../groovy/swing}/binding/EventTriggerBinding.java | 2 +-
.../groovy/swing}/binding/FullBinding.java | 2 +-
.../swing}/binding/MutualPropertyBinding.java | 3 +-
.../groovy/swing}/binding/PropertyBinding.java | 2 +-
.../binding/PropertyChangeProxyTargetBinding.java | 2 +-
.../swing}/binding/PropertyPathFullBinding.java | 2 +-
.../groovy/swing}/binding/SourceBinding.java | 2 +-
.../swing}/binding/SwingTimerTriggerBinding.java | 2 +-
.../groovy/swing}/binding/TargetBinding.java | 2 +-
.../groovy/swing}/binding/TriggerBinding.java | 2 +-
.../org/apache/groovy/swing/binding/package.html | 28 +++++++
.../groovy/binding/AbstractFullBinding.java | 1 +
.../codehaus/groovy/binding/AggregateBinding.java | 1 +
.../java/org/codehaus/groovy/binding/BindPath.java | 1 +
.../org/codehaus/groovy/binding/BindingProxy.java | 1 +
.../codehaus/groovy/binding/BindingUpdatable.java | 1 +
.../groovy/binding/ClosureSourceBinding.java | 1 +
.../groovy/binding/ClosureTriggerBinding.java | 4 +
.../groovy/binding/EventTriggerBinding.java | 1 +
.../org/codehaus/groovy/binding/FullBinding.java | 1 +
.../groovy/binding/MutualPropertyBinding.java | 1 +
.../codehaus/groovy/binding/PropertyBinding.java | 1 +
.../binding/PropertyChangeProxyTargetBinding.java | 1 +
.../groovy/binding/PropertyPathFullBinding.java | 1 +
.../org/codehaus/groovy/binding/SourceBinding.java | 1 +
.../groovy/binding/SwingTimerTriggerBinding.java | 2 +
.../org/codehaus/groovy/binding/TargetBinding.java | 1 +
.../codehaus/groovy/binding/TriggerBinding.java | 1 +
.../{ => swing}/ClosureSwingListenerTest.groovy | 4 +-
.../groovy/runtime => groovy/swing}/DummyBean.java | 6 +-
.../{util => swing}/GroovySwingTestCase.groovy | 8 +-
.../groovy/groovy/{ => swing}/StrangeBean.java | 2 +-
.../groovy/{ => swing}/StrangeBeanBeanInfo.java | 2 +-
.../groovy/{ => swing}/StrangeEventListener.java | 2 +-
.../groovy/swing/SwingBuilderBindingsTest.groovy | 73 ++++++++++--------
.../groovy/swing/SwingBuilderTableTest.groovy | 14 ++--
.../{ => swing}/beans/BindableSwingTest.groovy | 9 ++-
.../{ => swing}/beans/VetoableSwingTest.groovy | 9 ++-
.../groovy/{ => swing}/bugs/Groovy303_Bug.groovy | 21 +++--
.../groovy/{ => swing}/bugs/PropertyBug.groovy | 5 +-
.../groovy/{ => swing}/model/TableModelTest.groovy | 4 +-
75 files changed, 272 insertions(+), 165 deletions(-)
copy subprojects/groovy-swing/src/main/java/groovy/{ => swing}/model/ClosureModel.java (98%)
copy subprojects/groovy-swing/src/main/java/groovy/{ => swing}/model/DefaultTableColumn.java (98%)
copy subprojects/groovy-swing/src/main/java/groovy/{ => swing}/model/DefaultTableModel.java (99%)
copy subprojects/groovy-swing/src/main/java/groovy/{ => swing}/model/FormModel.java (98%)
copy subprojects/groovy-swing/src/main/java/groovy/{ => swing}/model/NestedValueModel.java (97%)
copy subprojects/groovy-swing/src/main/java/groovy/{ => swing}/model/PropertyModel.java (98%)
copy subprojects/groovy-swing/src/main/java/groovy/{ => swing}/model/ValueHolder.java (99%)
copy subprojects/groovy-swing/src/main/java/groovy/{ => swing}/model/ValueModel.java (97%)
create mode 100644 subprojects/groovy-swing/src/main/java/groovy/swing/model/package.html
copy subprojects/groovy-swing/src/main/java/groovy/{inspect/swingui => swing/table}/TableMap.java (98%)
copy subprojects/groovy-swing/src/main/java/groovy/{inspect/swingui => swing/table}/TableSorter.java (99%)
copy subprojects/groovy-swing/src/main/java/org/{codehaus/groovy => apache/groovy/swing}/binding/AbstractFullBinding.java (98%)
copy subprojects/groovy-swing/src/main/java/org/{codehaus/groovy => apache/groovy/swing}/binding/AggregateBinding.java (98%)
copy subprojects/groovy-swing/src/main/java/org/{codehaus/groovy => apache/groovy/swing}/binding/BindPath.java (99%)
copy subprojects/groovy-swing/src/main/java/org/{codehaus/groovy => apache/groovy/swing}/binding/BindingProxy.java (99%)
copy subprojects/groovy-swing/src/main/java/org/{codehaus/groovy => apache/groovy/swing}/binding/BindingUpdatable.java (97%)
copy subprojects/groovy-swing/src/main/java/org/{codehaus/groovy => apache/groovy/swing}/binding/ClosureSourceBinding.java (97%)
copy subprojects/groovy-swing/src/main/java/org/{codehaus/groovy => apache/groovy/swing}/binding/ClosureTriggerBinding.java (99%)
copy subprojects/groovy-swing/src/main/java/org/{codehaus/groovy => apache/groovy/swing}/binding/EventTriggerBinding.java (98%)
copy subprojects/groovy-swing/src/main/java/org/{codehaus/groovy => apache/groovy/swing}/binding/FullBinding.java (97%)
copy subprojects/groovy-swing/src/main/java/org/{codehaus/groovy => apache/groovy/swing}/binding/MutualPropertyBinding.java (99%)
copy subprojects/groovy-swing/src/main/java/org/{codehaus/groovy => apache/groovy/swing}/binding/PropertyBinding.java (99%)
copy subprojects/groovy-swing/src/main/java/org/{codehaus/groovy => apache/groovy/swing}/binding/PropertyChangeProxyTargetBinding.java (97%)
copy subprojects/groovy-swing/src/main/java/org/{codehaus/groovy => apache/groovy/swing}/binding/PropertyPathFullBinding.java (98%)
copy subprojects/groovy-swing/src/main/java/org/{codehaus/groovy => apache/groovy/swing}/binding/SourceBinding.java (95%)
copy subprojects/groovy-swing/src/main/java/org/{codehaus/groovy => apache/groovy/swing}/binding/SwingTimerTriggerBinding.java (99%)
copy subprojects/groovy-swing/src/main/java/org/{codehaus/groovy => apache/groovy/swing}/binding/TargetBinding.java (95%)
copy subprojects/groovy-swing/src/main/java/org/{codehaus/groovy => apache/groovy/swing}/binding/TriggerBinding.java (95%)
create mode 100644 subprojects/groovy-swing/src/main/java/org/apache/groovy/swing/binding/package.html
rename subprojects/groovy-swing/src/test/groovy/groovy/{ => swing}/ClosureSwingListenerTest.groovy (98%)
rename subprojects/groovy-swing/src/test/groovy/{org/codehaus/groovy/runtime => groovy/swing}/DummyBean.java (96%)
rename subprojects/groovy-swing/src/test/groovy/groovy/{util => swing}/GroovySwingTestCase.groovy (88%)
rename subprojects/groovy-swing/src/test/groovy/groovy/{ => swing}/StrangeBean.java (98%)
rename subprojects/groovy-swing/src/test/groovy/groovy/{ => swing}/StrangeBeanBeanInfo.java (98%)
rename subprojects/groovy-swing/src/test/groovy/groovy/{ => swing}/StrangeEventListener.java (98%)
rename subprojects/groovy-swing/src/test/groovy/groovy/{ => swing}/beans/BindableSwingTest.groovy (90%)
rename subprojects/groovy-swing/src/test/groovy/groovy/{ => swing}/beans/VetoableSwingTest.groovy (87%)
rename subprojects/groovy-swing/src/test/groovy/groovy/{ => swing}/bugs/Groovy303_Bug.groovy (80%)
rename subprojects/groovy-swing/src/test/groovy/groovy/{ => swing}/bugs/PropertyBug.groovy (94%)
rename subprojects/groovy-swing/src/test/groovy/groovy/{ => swing}/model/TableModelTest.groovy (97%)
[groovy] 16/17: Split history main/java/groovy/model to
main/java/groovy/swing - 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 c41d398cee14a1d2d5e5f0d0eeac1ce6154a657c
Author: Paul King <pa...@asert.com.au>
AuthorDate: Fri May 17 13:54:54 2019 +1000
Split history main/java/groovy/model to main/java/groovy/swing - restore name of source-file
---
.../groovy-swing/src/{temp => main/java/groovy/model}/ClosureModel.java | 0
.../src/{temp => main/java/groovy/model}/DefaultTableColumn.java | 0
.../src/{temp => main/java/groovy/model}/DefaultTableModel.java | 0
.../groovy-swing/src/{temp => main/java/groovy/model}/FormModel.java | 0
.../src/{temp => main/java/groovy/model}/NestedValueModel.java | 0
.../groovy-swing/src/{temp => main/java/groovy/model}/PropertyModel.java | 0
.../groovy-swing/src/{temp => main/java/groovy/model}/ValueHolder.java | 0
.../groovy-swing/src/{temp => main/java/groovy/model}/ValueModel.java | 0
.../groovy-swing/src/{temp => main/java/groovy/model}/package.html | 0
9 files changed, 0 insertions(+), 0 deletions(-)
diff --git a/subprojects/groovy-swing/src/temp/ClosureModel.java b/subprojects/groovy-swing/src/main/java/groovy/model/ClosureModel.java
similarity index 100%
rename from subprojects/groovy-swing/src/temp/ClosureModel.java
rename to subprojects/groovy-swing/src/main/java/groovy/model/ClosureModel.java
diff --git a/subprojects/groovy-swing/src/temp/DefaultTableColumn.java b/subprojects/groovy-swing/src/main/java/groovy/model/DefaultTableColumn.java
similarity index 100%
rename from subprojects/groovy-swing/src/temp/DefaultTableColumn.java
rename to subprojects/groovy-swing/src/main/java/groovy/model/DefaultTableColumn.java
diff --git a/subprojects/groovy-swing/src/temp/DefaultTableModel.java b/subprojects/groovy-swing/src/main/java/groovy/model/DefaultTableModel.java
similarity index 100%
rename from subprojects/groovy-swing/src/temp/DefaultTableModel.java
rename to subprojects/groovy-swing/src/main/java/groovy/model/DefaultTableModel.java
diff --git a/subprojects/groovy-swing/src/temp/FormModel.java b/subprojects/groovy-swing/src/main/java/groovy/model/FormModel.java
similarity index 100%
rename from subprojects/groovy-swing/src/temp/FormModel.java
rename to subprojects/groovy-swing/src/main/java/groovy/model/FormModel.java
diff --git a/subprojects/groovy-swing/src/temp/NestedValueModel.java b/subprojects/groovy-swing/src/main/java/groovy/model/NestedValueModel.java
similarity index 100%
rename from subprojects/groovy-swing/src/temp/NestedValueModel.java
rename to subprojects/groovy-swing/src/main/java/groovy/model/NestedValueModel.java
diff --git a/subprojects/groovy-swing/src/temp/PropertyModel.java b/subprojects/groovy-swing/src/main/java/groovy/model/PropertyModel.java
similarity index 100%
rename from subprojects/groovy-swing/src/temp/PropertyModel.java
rename to subprojects/groovy-swing/src/main/java/groovy/model/PropertyModel.java
diff --git a/subprojects/groovy-swing/src/temp/ValueHolder.java b/subprojects/groovy-swing/src/main/java/groovy/model/ValueHolder.java
similarity index 100%
rename from subprojects/groovy-swing/src/temp/ValueHolder.java
rename to subprojects/groovy-swing/src/main/java/groovy/model/ValueHolder.java
diff --git a/subprojects/groovy-swing/src/temp/ValueModel.java b/subprojects/groovy-swing/src/main/java/groovy/model/ValueModel.java
similarity index 100%
rename from subprojects/groovy-swing/src/temp/ValueModel.java
rename to subprojects/groovy-swing/src/main/java/groovy/model/ValueModel.java
diff --git a/subprojects/groovy-swing/src/temp/package.html b/subprojects/groovy-swing/src/main/java/groovy/model/package.html
similarity index 100%
rename from subprojects/groovy-swing/src/temp/package.html
rename to subprojects/groovy-swing/src/main/java/groovy/model/package.html
[groovy] 15/17: Split history main/java/groovy/model to
main/java/groovy/swing - 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 33d0e4189caa55dc614797c14a5d0529eed86e45
Merge: 79a1997 7d9f9bb
Author: Paul King <pa...@asert.com.au>
AuthorDate: Fri May 17 13:54:54 2019 +1000
Split history main/java/groovy/model to main/java/groovy/swing - resolve conflict and keep both files
.../main/java/groovy/swing/model/ClosureModel.java | 78 ++++++++
.../groovy/swing/model/DefaultTableColumn.java | 83 ++++++++
.../java/groovy/swing/model/DefaultTableModel.java | 214 +++++++++++++++++++++
.../main/java/groovy/swing/model/FormModel.java | 46 +++++
.../java/groovy/swing/model/NestedValueModel.java | 27 +++
.../java/groovy/swing/model/PropertyModel.java | 80 ++++++++
.../main/java/groovy/swing/model/ValueHolder.java | 93 +++++++++
.../main/java/groovy/swing/model/ValueModel.java | 29 +++
.../src/main/java/groovy/swing/model/package.html | 29 +++
9 files changed, 679 insertions(+)
[groovy] 05/17: Split history
main/java/groovy/inspect/swingui/TableMap.java to
main/java/groovy/swing/table - 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 046c59a00fe54574e3fd6cfffa41e77e5d41503e
Author: Paul King <pa...@asert.com.au>
AuthorDate: Fri May 17 13:53:33 2019 +1000
Split history main/java/groovy/inspect/swingui/TableMap.java to main/java/groovy/swing/table - rename file to target-name
---
.../src/main/java/groovy/{inspect/swingui => swing/table}/TableMap.java | 0
1 file changed, 0 insertions(+), 0 deletions(-)
diff --git a/subprojects/groovy-swing/src/main/java/groovy/inspect/swingui/TableMap.java b/subprojects/groovy-swing/src/main/java/groovy/swing/table/TableMap.java
similarity index 100%
rename from subprojects/groovy-swing/src/main/java/groovy/inspect/swingui/TableMap.java
rename to subprojects/groovy-swing/src/main/java/groovy/swing/table/TableMap.java
[groovy] 03/17: Split history main/java/org/codehaus/groovy/binding
to main/java/org/apache/groovy/swing - 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 ce873bb51418d5026b9aa42e0a0887cda9ee0c82
Merge: b786db2 cb0ed44
Author: Paul King <pa...@asert.com.au>
AuthorDate: Fri May 17 13:50:54 2019 +1000
Split history main/java/org/codehaus/groovy/binding to main/java/org/apache/groovy/swing - resolve conflict and keep both files
.../groovy/swing/binding/AbstractFullBinding.java | 113 +++++++
.../groovy/swing/binding/AggregateBinding.java | 82 +++++
.../org/apache/groovy/swing/binding/BindPath.java | 237 +++++++++++++
.../apache/groovy/swing/binding/BindingProxy.java | 159 +++++++++
.../groovy/swing/binding/BindingUpdatable.java | 57 ++++
.../groovy/swing/binding/ClosureSourceBinding.java | 61 ++++
.../swing/binding/ClosureTriggerBinding.java | 167 ++++++++++
.../groovy/swing/binding/EventTriggerBinding.java | 87 +++++
.../apache/groovy/swing/binding/FullBinding.java | 47 +++
.../swing/binding/MutualPropertyBinding.java | 198 +++++++++++
.../groovy/swing/binding/PropertyBinding.java | 367 +++++++++++++++++++++
.../binding/PropertyChangeProxyTargetBinding.java | 41 +++
.../swing/binding/PropertyPathFullBinding.java | 78 +++++
.../apache/groovy/swing/binding/SourceBinding.java | 28 ++
.../swing/binding/SwingTimerTriggerBinding.java | 181 ++++++++++
.../apache/groovy/swing/binding/TargetBinding.java | 27 ++
.../groovy/swing/binding/TriggerBinding.java | 28 ++
.../org/apache/groovy/swing/binding/package.html | 28 ++
18 files changed, 1986 insertions(+)
[groovy] 06/17: Split history
main/java/groovy/inspect/swingui/TableMap.java to
main/java/groovy/swing/table - 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 cc20ac353497f2f3babb07f4e029dfd718801f74
Author: Paul King <pa...@asert.com.au>
AuthorDate: Fri May 17 13:53:34 2019 +1000
Split history main/java/groovy/inspect/swingui/TableMap.java to main/java/groovy/swing/table - rename source-file to temp
---
.../src/{main/java/groovy/inspect/swingui/TableMap.java => temp} | 0
1 file changed, 0 insertions(+), 0 deletions(-)
diff --git a/subprojects/groovy-swing/src/main/java/groovy/inspect/swingui/TableMap.java b/subprojects/groovy-swing/src/temp
similarity index 100%
rename from subprojects/groovy-swing/src/main/java/groovy/inspect/swingui/TableMap.java
rename to subprojects/groovy-swing/src/temp
[groovy] 01/17: Split history main/java/org/codehaus/groovy/binding
to main/java/org/apache/groovy/swing - 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 cb0ed447747b3e7277c8312c1b8bcc198454d4eb
Author: Paul King <pa...@asert.com.au>
AuthorDate: Fri May 17 13:50:53 2019 +1000
Split history main/java/org/codehaus/groovy/binding to main/java/org/apache/groovy/swing - rename file to target-name
---
.../groovy => apache/groovy/swing}/binding/AbstractFullBinding.java | 0
.../groovy => apache/groovy/swing}/binding/AggregateBinding.java | 0
.../org/{codehaus/groovy => apache/groovy/swing}/binding/BindPath.java | 0
.../{codehaus/groovy => apache/groovy/swing}/binding/BindingProxy.java | 0
.../groovy => apache/groovy/swing}/binding/BindingUpdatable.java | 0
.../groovy => apache/groovy/swing}/binding/ClosureSourceBinding.java | 0
.../groovy => apache/groovy/swing}/binding/ClosureTriggerBinding.java | 0
.../groovy => apache/groovy/swing}/binding/EventTriggerBinding.java | 0
.../org/{codehaus/groovy => apache/groovy/swing}/binding/FullBinding.java | 0
.../groovy => apache/groovy/swing}/binding/MutualPropertyBinding.java | 0
.../{codehaus/groovy => apache/groovy/swing}/binding/PropertyBinding.java | 0
.../groovy/swing}/binding/PropertyChangeProxyTargetBinding.java | 0
.../groovy => apache/groovy/swing}/binding/PropertyPathFullBinding.java | 0
.../{codehaus/groovy => apache/groovy/swing}/binding/SourceBinding.java | 0
.../groovy => apache/groovy/swing}/binding/SwingTimerTriggerBinding.java | 0
.../{codehaus/groovy => apache/groovy/swing}/binding/TargetBinding.java | 0
.../{codehaus/groovy => apache/groovy/swing}/binding/TriggerBinding.java | 0
.../org/{codehaus/groovy => apache/groovy/swing}/binding/package.html | 0
18 files changed, 0 insertions(+), 0 deletions(-)
diff --git a/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/AbstractFullBinding.java b/subprojects/groovy-swing/src/main/java/org/apache/groovy/swing/binding/AbstractFullBinding.java
similarity index 100%
rename from subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/AbstractFullBinding.java
rename to subprojects/groovy-swing/src/main/java/org/apache/groovy/swing/binding/AbstractFullBinding.java
diff --git a/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/AggregateBinding.java b/subprojects/groovy-swing/src/main/java/org/apache/groovy/swing/binding/AggregateBinding.java
similarity index 100%
rename from subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/AggregateBinding.java
rename to subprojects/groovy-swing/src/main/java/org/apache/groovy/swing/binding/AggregateBinding.java
diff --git a/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/BindPath.java b/subprojects/groovy-swing/src/main/java/org/apache/groovy/swing/binding/BindPath.java
similarity index 100%
rename from subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/BindPath.java
rename to subprojects/groovy-swing/src/main/java/org/apache/groovy/swing/binding/BindPath.java
diff --git a/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/BindingProxy.java b/subprojects/groovy-swing/src/main/java/org/apache/groovy/swing/binding/BindingProxy.java
similarity index 100%
rename from subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/BindingProxy.java
rename to subprojects/groovy-swing/src/main/java/org/apache/groovy/swing/binding/BindingProxy.java
diff --git a/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/BindingUpdatable.java b/subprojects/groovy-swing/src/main/java/org/apache/groovy/swing/binding/BindingUpdatable.java
similarity index 100%
rename from subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/BindingUpdatable.java
rename to subprojects/groovy-swing/src/main/java/org/apache/groovy/swing/binding/BindingUpdatable.java
diff --git a/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/ClosureSourceBinding.java b/subprojects/groovy-swing/src/main/java/org/apache/groovy/swing/binding/ClosureSourceBinding.java
similarity index 100%
rename from subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/ClosureSourceBinding.java
rename to subprojects/groovy-swing/src/main/java/org/apache/groovy/swing/binding/ClosureSourceBinding.java
diff --git a/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/ClosureTriggerBinding.java b/subprojects/groovy-swing/src/main/java/org/apache/groovy/swing/binding/ClosureTriggerBinding.java
similarity index 100%
rename from subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/ClosureTriggerBinding.java
rename to subprojects/groovy-swing/src/main/java/org/apache/groovy/swing/binding/ClosureTriggerBinding.java
diff --git a/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/EventTriggerBinding.java b/subprojects/groovy-swing/src/main/java/org/apache/groovy/swing/binding/EventTriggerBinding.java
similarity index 100%
rename from subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/EventTriggerBinding.java
rename to subprojects/groovy-swing/src/main/java/org/apache/groovy/swing/binding/EventTriggerBinding.java
diff --git a/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/FullBinding.java b/subprojects/groovy-swing/src/main/java/org/apache/groovy/swing/binding/FullBinding.java
similarity index 100%
rename from subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/FullBinding.java
rename to subprojects/groovy-swing/src/main/java/org/apache/groovy/swing/binding/FullBinding.java
diff --git a/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/MutualPropertyBinding.java b/subprojects/groovy-swing/src/main/java/org/apache/groovy/swing/binding/MutualPropertyBinding.java
similarity index 100%
rename from subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/MutualPropertyBinding.java
rename to subprojects/groovy-swing/src/main/java/org/apache/groovy/swing/binding/MutualPropertyBinding.java
diff --git a/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/PropertyBinding.java b/subprojects/groovy-swing/src/main/java/org/apache/groovy/swing/binding/PropertyBinding.java
similarity index 100%
rename from subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/PropertyBinding.java
rename to subprojects/groovy-swing/src/main/java/org/apache/groovy/swing/binding/PropertyBinding.java
diff --git a/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/PropertyChangeProxyTargetBinding.java b/subprojects/groovy-swing/src/main/java/org/apache/groovy/swing/binding/PropertyChangeProxyTargetBinding.java
similarity index 100%
rename from subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/PropertyChangeProxyTargetBinding.java
rename to subprojects/groovy-swing/src/main/java/org/apache/groovy/swing/binding/PropertyChangeProxyTargetBinding.java
diff --git a/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/PropertyPathFullBinding.java b/subprojects/groovy-swing/src/main/java/org/apache/groovy/swing/binding/PropertyPathFullBinding.java
similarity index 100%
rename from subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/PropertyPathFullBinding.java
rename to subprojects/groovy-swing/src/main/java/org/apache/groovy/swing/binding/PropertyPathFullBinding.java
diff --git a/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/SourceBinding.java b/subprojects/groovy-swing/src/main/java/org/apache/groovy/swing/binding/SourceBinding.java
similarity index 100%
rename from subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/SourceBinding.java
rename to subprojects/groovy-swing/src/main/java/org/apache/groovy/swing/binding/SourceBinding.java
diff --git a/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/SwingTimerTriggerBinding.java b/subprojects/groovy-swing/src/main/java/org/apache/groovy/swing/binding/SwingTimerTriggerBinding.java
similarity index 100%
rename from subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/SwingTimerTriggerBinding.java
rename to subprojects/groovy-swing/src/main/java/org/apache/groovy/swing/binding/SwingTimerTriggerBinding.java
diff --git a/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/TargetBinding.java b/subprojects/groovy-swing/src/main/java/org/apache/groovy/swing/binding/TargetBinding.java
similarity index 100%
rename from subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/TargetBinding.java
rename to subprojects/groovy-swing/src/main/java/org/apache/groovy/swing/binding/TargetBinding.java
diff --git a/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/TriggerBinding.java b/subprojects/groovy-swing/src/main/java/org/apache/groovy/swing/binding/TriggerBinding.java
similarity index 100%
rename from subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/TriggerBinding.java
rename to subprojects/groovy-swing/src/main/java/org/apache/groovy/swing/binding/TriggerBinding.java
diff --git a/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/package.html b/subprojects/groovy-swing/src/main/java/org/apache/groovy/swing/binding/package.html
similarity index 100%
rename from subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/package.html
rename to subprojects/groovy-swing/src/main/java/org/apache/groovy/swing/binding/package.html
[groovy] 17/17: 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 a9d4d59970b08d485474c44e69d4053e3cbeb895
Author: Paul King <pa...@asert.com.au>
AuthorDate: Fri May 17 14:50:35 2019 +1000
GROOVY-8647: Split package renaming (groovy-swing)
---
src/test/groovy/NewExpressionTest.groovy | 1 +
.../groovy/groovy/swing/LookAndFeelHelper.groovy | 18 ++---
.../swing/binding/JComboBoxMetaMethods.groovy | 5 +-
.../groovy/swing/binding/JListMetaMethods.groovy | 5 +-
.../groovy/swing/binding/JTableMetaMethods.groovy | 16 ++--
.../groovy/swing/factory/TableModelFactory.groovy | 90 +++++++++++-----------
.../main/java/groovy/inspect/swingui/TableMap.java | 1 +
.../java/groovy/inspect/swingui/TableSorter.java | 1 +
.../src/main/java/groovy/model/ClosureModel.java | 1 +
.../main/java/groovy/model/DefaultTableColumn.java | 1 +
.../main/java/groovy/model/DefaultTableModel.java | 1 +
.../src/main/java/groovy/model/FormModel.java | 1 +
.../main/java/groovy/model/NestedValueModel.java | 1 +
.../src/main/java/groovy/model/PropertyModel.java | 1 +
.../src/main/java/groovy/model/ValueHolder.java | 1 +
.../src/main/java/groovy/model/ValueModel.java | 1 +
.../main/java/groovy/swing/model/ClosureModel.java | 2 +-
.../groovy/swing/model/DefaultTableColumn.java | 2 +-
.../java/groovy/swing/model/DefaultTableModel.java | 2 +-
.../main/java/groovy/swing/model/FormModel.java | 2 +-
.../java/groovy/swing/model/NestedValueModel.java | 2 +-
.../java/groovy/swing/model/PropertyModel.java | 2 +-
.../main/java/groovy/swing/model/ValueHolder.java | 2 +-
.../main/java/groovy/swing/model/ValueModel.java | 2 +-
.../src/main/java/groovy/swing/model/package.html | 2 +-
.../src/main/java/groovy/swing/table/TableMap.java | 2 +-
.../main/java/groovy/swing/table/TableSorter.java | 2 +-
.../groovy/swing/binding/AbstractFullBinding.java | 2 +-
.../groovy/swing/binding/AggregateBinding.java | 2 +-
.../org/apache/groovy/swing/binding/BindPath.java | 2 +-
.../apache/groovy/swing/binding/BindingProxy.java | 2 +-
.../groovy/swing/binding/BindingUpdatable.java | 2 +-
.../groovy/swing/binding/ClosureSourceBinding.java | 2 +-
.../swing/binding/ClosureTriggerBinding.java | 2 +-
.../groovy/swing/binding/EventTriggerBinding.java | 2 +-
.../apache/groovy/swing/binding/FullBinding.java | 2 +-
.../swing/binding/MutualPropertyBinding.java | 3 +-
.../groovy/swing/binding/PropertyBinding.java | 2 +-
.../binding/PropertyChangeProxyTargetBinding.java | 2 +-
.../swing/binding/PropertyPathFullBinding.java | 2 +-
.../apache/groovy/swing/binding/SourceBinding.java | 2 +-
.../swing/binding/SwingTimerTriggerBinding.java | 2 +-
.../apache/groovy/swing/binding/TargetBinding.java | 2 +-
.../groovy/swing/binding/TriggerBinding.java | 2 +-
.../org/apache/groovy/swing/binding/package.html | 2 +-
.../groovy/binding/AbstractFullBinding.java | 1 +
.../codehaus/groovy/binding/AggregateBinding.java | 1 +
.../java/org/codehaus/groovy/binding/BindPath.java | 1 +
.../org/codehaus/groovy/binding/BindingProxy.java | 1 +
.../codehaus/groovy/binding/BindingUpdatable.java | 1 +
.../groovy/binding/ClosureSourceBinding.java | 1 +
.../groovy/binding/ClosureTriggerBinding.java | 4 +
.../groovy/binding/EventTriggerBinding.java | 1 +
.../org/codehaus/groovy/binding/FullBinding.java | 1 +
.../groovy/binding/MutualPropertyBinding.java | 1 +
.../codehaus/groovy/binding/PropertyBinding.java | 1 +
.../binding/PropertyChangeProxyTargetBinding.java | 1 +
.../groovy/binding/PropertyPathFullBinding.java | 1 +
.../org/codehaus/groovy/binding/SourceBinding.java | 1 +
.../groovy/binding/SwingTimerTriggerBinding.java | 2 +
.../org/codehaus/groovy/binding/TargetBinding.java | 1 +
.../codehaus/groovy/binding/TriggerBinding.java | 1 +
.../{ => swing}/ClosureSwingListenerTest.groovy | 4 +-
.../groovy/runtime => groovy/swing}/DummyBean.java | 6 +-
.../{util => swing}/GroovySwingTestCase.groovy | 8 +-
.../groovy/groovy/{ => swing}/StrangeBean.java | 2 +-
.../groovy/{ => swing}/StrangeBeanBeanInfo.java | 2 +-
.../groovy/{ => swing}/StrangeEventListener.java | 2 +-
.../groovy/swing/SwingBuilderBindingsTest.groovy | 73 ++++++++++--------
.../groovy/swing/SwingBuilderTableTest.groovy | 14 ++--
.../{ => swing}/beans/BindableSwingTest.groovy | 9 ++-
.../{ => swing}/beans/VetoableSwingTest.groovy | 9 ++-
.../groovy/{ => swing}/bugs/Groovy303_Bug.groovy | 21 +++--
.../groovy/{ => swing}/bugs/PropertyBug.groovy | 5 +-
.../groovy/{ => swing}/model/TableModelTest.groovy | 4 +-
75 files changed, 217 insertions(+), 167 deletions(-)
diff --git a/src/test/groovy/NewExpressionTest.groovy b/src/test/groovy/NewExpressionTest.groovy
index 16a9b72..6d7a6b2 100644
--- a/src/test/groovy/NewExpressionTest.groovy
+++ b/src/test/groovy/NewExpressionTest.groovy
@@ -18,6 +18,7 @@
*/
package groovy
+import groovy.test.GroovyTestCase
import org.codehaus.groovy.runtime.DummyBean
class NewExpressionTest extends GroovyTestCase {
diff --git a/subprojects/groovy-swing/src/main/groovy/groovy/swing/LookAndFeelHelper.groovy b/subprojects/groovy-swing/src/main/groovy/groovy/swing/LookAndFeelHelper.groovy
index 6355d27..d07d83f 100644
--- a/subprojects/groovy-swing/src/main/groovy/groovy/swing/LookAndFeelHelper.groovy
+++ b/subprojects/groovy-swing/src/main/groovy/groovy/swing/LookAndFeelHelper.groovy
@@ -29,10 +29,10 @@ class LookAndFeelHelper {
protected static LookAndFeelHelper instance;
private LookAndFeelHelper() {
// linux GTK bug : http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6389282
- UIManager.getInstalledLookAndFeels();
+ UIManager.getInstalledLookAndFeels()
}
- public static LookAndFeelHelper getInstance() {
+ static LookAndFeelHelper getInstance() {
return instance ?: (instance = new LookAndFeelHelper())
}
@@ -63,7 +63,7 @@ class LookAndFeelHelper {
napkin : 'net.sourceforge.napkinlaf.NapkinLookAndFeel'
]
- public String addLookAndFeelAlias(String alias, String className) {
+ String addLookAndFeelAlias(String alias, String className) {
lafCodeNames[alias] = className
}
@@ -92,7 +92,7 @@ class LookAndFeelHelper {
],
]
- public String addLookAndFeelAttributeHandler(String className, String attr, Closure handler) {
+ String addLookAndFeelAttributeHandler(String className, String attr, Closure handler) {
Map attrs = extendedAttributes[className]
if (attrs == null) {
attrs = [:]
@@ -102,11 +102,11 @@ class LookAndFeelHelper {
}
- public boolean isLeaf() {
+ boolean isLeaf() {
return true
}
- public LookAndFeel lookAndFeel(Object value, Map attributes, Closure initClosure) {
+ LookAndFeel lookAndFeel(Object value, Map attributes, Closure initClosure) {
LookAndFeel lafInstance
String lafClassName
@@ -162,7 +162,7 @@ class LookAndFeelHelper {
// ignore it, try the next on the list
}
}
- return null;
+ return null
}
static String getAquaLAFName() {
@@ -176,7 +176,7 @@ class LookAndFeelHelper {
// ignore it, try the next on the list
}
}
- return null;
+ return null
}
static String getSubstanceLAFName() {
@@ -190,6 +190,6 @@ class LookAndFeelHelper {
// ignore it, try the next on the list
}
}
- return null;
+ return null
}
}
diff --git a/subprojects/groovy-swing/src/main/groovy/groovy/swing/binding/JComboBoxMetaMethods.groovy b/subprojects/groovy-swing/src/main/groovy/groovy/swing/binding/JComboBoxMetaMethods.groovy
index 4d6f828..cfcf159 100644
--- a/subprojects/groovy-swing/src/main/groovy/groovy/swing/binding/JComboBoxMetaMethods.groovy
+++ b/subprojects/groovy-swing/src/main/groovy/groovy/swing/binding/JComboBoxMetaMethods.groovy
@@ -18,7 +18,8 @@
*/
package groovy.swing.binding
-import javax.swing.*
+import javax.swing.ComboBoxModel
+import javax.swing.JComboBox
class JComboBoxMetaMethods {
@@ -26,7 +27,7 @@ class JComboBoxMetaMethods {
AbstractSyntheticMetaMethods.enhance(comboBox, [
getElements : { ->
- ComboBoxModel model = delegate.model;
+ ComboBoxModel model = delegate.model
def results = []
int size = model.size
for (int i = 0; i < size; i++) {
diff --git a/subprojects/groovy-swing/src/main/groovy/groovy/swing/binding/JListMetaMethods.groovy b/subprojects/groovy-swing/src/main/groovy/groovy/swing/binding/JListMetaMethods.groovy
index 2b96d06..58f2202 100644
--- a/subprojects/groovy-swing/src/main/groovy/groovy/swing/binding/JListMetaMethods.groovy
+++ b/subprojects/groovy-swing/src/main/groovy/groovy/swing/binding/JListMetaMethods.groovy
@@ -18,7 +18,8 @@
*/
package groovy.swing.binding
-import javax.swing.*
+import javax.swing.JList
+import javax.swing.ListModel
/**
* @since 1.7.5
@@ -27,7 +28,7 @@ class JListMetaMethods {
static void enhanceMetaClass(JList list) {
AbstractSyntheticMetaMethods.enhance(list, [
getElements : { ->
- ListModel model = delegate.model;
+ ListModel model = delegate.model
def results = []
int size = model.size
for (int i = 0; i < size; i++) {
diff --git a/subprojects/groovy-swing/src/main/groovy/groovy/swing/binding/JTableMetaMethods.groovy b/subprojects/groovy-swing/src/main/groovy/groovy/swing/binding/JTableMetaMethods.groovy
index fb4cc9c..e5dbd10 100644
--- a/subprojects/groovy-swing/src/main/groovy/groovy/swing/binding/JTableMetaMethods.groovy
+++ b/subprojects/groovy-swing/src/main/groovy/groovy/swing/binding/JTableMetaMethods.groovy
@@ -20,21 +20,21 @@ package groovy.swing.binding
import org.codehaus.groovy.runtime.InvokerHelper
-import javax.swing.*
+import javax.swing.JTable
import javax.swing.table.TableColumn
import javax.swing.table.TableColumnModel
import javax.swing.table.TableModel
class JTableMetaMethods {
- public static void enhanceMetaClass(table) {
+ static void enhanceMetaClass(table) {
AbstractSyntheticMetaMethods.enhance(table, [
getElements:{->
def model = delegate.model;
if (model instanceof javax.swing.table.DefaultTableModel) {
return Collections.unmodifiableList(model.getDataVector())
- } else if (model instanceof groovy.model.DefaultTableModel) {
+ } else if (model instanceof groovy.swing.model.DefaultTableModel) {
return Collections.unmodifiableList(model.rows)
}
},
@@ -45,12 +45,12 @@ class JTableMetaMethods {
def myTable = delegate
return myTable.getSelectedRows().collect { getElement(myTable, it) }
}
- ]);
+ ])
}
- public static Object getElement(JTable table, int row) {
+ static Object getElement(JTable table, int row) {
if (row == -1) {
- return null;
+ return null
}
TableModel model = table.model
if (model instanceof javax.swing.table.DefaultTableModel) {
@@ -63,10 +63,10 @@ class JTableMetaMethods {
table.getValueAt(row, c.getModelIndex()))
}
return value;
- } else if (model instanceof groovy.model.DefaultTableModel) {
+ } else if (model instanceof groovy.swing.model.DefaultTableModel) {
Object rowValue = model.getRowsModel().value
if (rowValue == null) {
- return null;
+ return null
}
return InvokerHelper.asList(rowValue)[row]
}
diff --git a/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/TableModelFactory.groovy b/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/TableModelFactory.groovy
index c088eff..272e069 100644
--- a/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/TableModelFactory.groovy
+++ b/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/TableModelFactory.groovy
@@ -18,45 +18,45 @@
*/
package groovy.swing.factory
-import groovy.model.DefaultTableModel
-import groovy.model.ValueHolder
-import groovy.model.ValueModel
+import groovy.swing.model.DefaultTableModel
+import groovy.swing.model.ValueHolder
+import groovy.swing.model.ValueModel
-import javax.swing.*
+import javax.swing.JTable
import javax.swing.table.TableModel
import java.beans.PropertyChangeEvent
import java.beans.PropertyChangeListener
-public class TableModelFactory extends AbstractFactory {
+class TableModelFactory extends AbstractFactory {
- public Object newInstance(FactoryBuilderSupport builder, Object name, Object value, Map attributes) throws InstantiationException, IllegalAccessException {
+ Object newInstance(FactoryBuilderSupport builder, Object name, Object value, Map attributes) throws InstantiationException, IllegalAccessException {
if (FactoryBuilderSupport.checkValueIsType(value, name, TableModel)) {
- return value;
+ return value
} else if (attributes.get(name) instanceof TableModel) {
- return attributes.remove(name);
+ return attributes.remove(name)
} else {
- ValueModel model = (ValueModel) attributes.remove("model");
+ ValueModel model = (ValueModel) attributes.remove("model")
if (model == null) {
- Object list = attributes.remove("list");
+ Object list = attributes.remove("list")
if (list == null) {
- list = new ArrayList();
+ list = new ArrayList()
}
- model = new ValueHolder(list);
+ model = new ValueHolder(list)
}
- return new DefaultTableModel(model);
+ return new DefaultTableModel(model)
}
}
- public void onNodeCompleted(FactoryBuilderSupport builder, Object parent, Object node) {
+ void onNodeCompleted(FactoryBuilderSupport builder, Object parent, Object node) {
if ((node.columnCount > 0) && (parent instanceof JTable)) {
- parent.autoCreateColumnsFromModel = false;
+ parent.autoCreateColumnsFromModel = false
PropertyChangeListener listener = {e ->
if ((e.propertyName == 'model') && e.newValue instanceof DefaultTableModel) {
e.source.columnModel = e.newValue.columnModel
e.source.revalidate()
e.source.repaint()
}
- } as PropertyChangeListener;
+ } as PropertyChangeListener
parent.addPropertyChangeListener('model', listener)
builder.addDisposalClosure( {parent.removePropertyChangeListener('model', listener)})
@@ -67,59 +67,59 @@ public class TableModelFactory extends AbstractFactory {
}
}
-public class PropertyColumnFactory extends AbstractFactory {
+class PropertyColumnFactory extends AbstractFactory {
- public Object newInstance(FactoryBuilderSupport builder, Object name, Object value, Map attributes) throws InstantiationException, IllegalAccessException {
- FactoryBuilderSupport.checkValueIsNull(value, name);
- Object current = builder.getCurrent();
+ Object newInstance(FactoryBuilderSupport builder, Object name, Object value, Map attributes) throws InstantiationException, IllegalAccessException {
+ FactoryBuilderSupport.checkValueIsNull(value, name)
+ Object current = builder.getCurrent()
if (current instanceof DefaultTableModel) {
- DefaultTableModel model = (DefaultTableModel) current;
- String property = (String) attributes.remove("propertyName");
+ DefaultTableModel model = (DefaultTableModel) current
+ String property = (String) attributes.remove("propertyName")
if (property == null) {
- throw new IllegalArgumentException("Must specify a property for a propertyColumn");
+ throw new IllegalArgumentException("Must specify a property for a propertyColumn")
}
- Object header = attributes.remove("header");
+ Object header = attributes.remove("header")
if (header == null) {
- header = "";
+ header = ""
}
- Class type = (Class) attributes.remove("type");
+ Class type = (Class) attributes.remove("type")
if (type == null) {
- type = Object;
+ type = Object
}
- Boolean editable = (Boolean) attributes.remove("editable");
+ Boolean editable = (Boolean) attributes.remove("editable")
if (editable == null) {
- editable = Boolean.TRUE;
+ editable = Boolean.TRUE
}
- return model.addPropertyColumn(header, property, type, editable.booleanValue());
+ return model.addPropertyColumn(header, property, type, editable.booleanValue())
} else {
- throw new RuntimeException("propertyColumn must be a child of a tableModel");
+ throw new RuntimeException("propertyColumn must be a child of a tableModel")
}
}
}
-public class ClosureColumnFactory extends AbstractFactory {
+class ClosureColumnFactory extends AbstractFactory {
- public Object newInstance(FactoryBuilderSupport builder, Object name, Object value, Map attributes) throws InstantiationException, IllegalAccessException {
- FactoryBuilderSupport.checkValueIsNull(value, name);
- Object current = builder.getCurrent();
+ Object newInstance(FactoryBuilderSupport builder, Object name, Object value, Map attributes) throws InstantiationException, IllegalAccessException {
+ FactoryBuilderSupport.checkValueIsNull(value, name)
+ Object current = builder.getCurrent()
if (current instanceof DefaultTableModel) {
- DefaultTableModel model = (DefaultTableModel) current;
- Object header = attributes.remove("header");
+ DefaultTableModel model = (DefaultTableModel) current
+ Object header = attributes.remove("header")
if (header == null) {
- header = "";
+ header = ""
}
- Closure readClosure = (Closure) attributes.remove("read");
+ Closure readClosure = (Closure) attributes.remove("read")
if (readClosure == null) {
- throw new IllegalArgumentException("Must specify 'read' Closure property for a closureColumn");
+ throw new IllegalArgumentException("Must specify 'read' Closure property for a closureColumn")
}
- Closure writeClosure = (Closure) attributes.remove("write");
- Class type = (Class) attributes.remove("type");
+ Closure writeClosure = (Closure) attributes.remove("write")
+ Class type = (Class) attributes.remove("type")
if (type == null) {
- type = Object;
+ type = Object
}
- return model.addClosureColumn(header, readClosure, writeClosure, type);
+ return model.addClosureColumn(header, readClosure, writeClosure, type)
} else {
- throw new RuntimeException("closureColumn must be a child of a tableModel");
+ throw new RuntimeException("closureColumn must be a child of a tableModel")
}
}
}
diff --git a/subprojects/groovy-swing/src/main/java/groovy/inspect/swingui/TableMap.java b/subprojects/groovy-swing/src/main/java/groovy/inspect/swingui/TableMap.java
index 9645746..6908be5 100644
--- a/subprojects/groovy-swing/src/main/java/groovy/inspect/swingui/TableMap.java
+++ b/subprojects/groovy-swing/src/main/java/groovy/inspect/swingui/TableMap.java
@@ -32,6 +32,7 @@ import javax.swing.table.TableModel;
* a TableMap which has not been subclassed into a chain of table filters
* should have no effect.
*/
+@Deprecated
public class TableMap extends AbstractTableModel implements TableModelListener {
protected TableModel model;
diff --git a/subprojects/groovy-swing/src/main/java/groovy/inspect/swingui/TableSorter.java b/subprojects/groovy-swing/src/main/java/groovy/inspect/swingui/TableSorter.java
index 74ed0d6..87bbbda 100644
--- a/subprojects/groovy-swing/src/main/java/groovy/inspect/swingui/TableSorter.java
+++ b/subprojects/groovy-swing/src/main/java/groovy/inspect/swingui/TableSorter.java
@@ -42,6 +42,7 @@ import java.util.Vector;
* which means that it does not move around rows when its comparison
* function returns 0 to denote that they are equivalent.
*/
+@Deprecated
public class TableSorter extends TableMap {
private static final int[] EMPTY_INT_ARRAY = new int[0];
int indexes[];
diff --git a/subprojects/groovy-swing/src/main/java/groovy/model/ClosureModel.java b/subprojects/groovy-swing/src/main/java/groovy/model/ClosureModel.java
index 0f664de..80c8055 100644
--- a/subprojects/groovy-swing/src/main/java/groovy/model/ClosureModel.java
+++ b/subprojects/groovy-swing/src/main/java/groovy/model/ClosureModel.java
@@ -25,6 +25,7 @@ import groovy.lang.Closure;
* the value from some source model and an optional write closure
* for updating the value.
*/
+@Deprecated
public class ClosureModel implements ValueModel, NestedValueModel {
private final ValueModel sourceModel;
diff --git a/subprojects/groovy-swing/src/main/java/groovy/model/DefaultTableColumn.java b/subprojects/groovy-swing/src/main/java/groovy/model/DefaultTableColumn.java
index 29fcf5b..a88a1ad 100644
--- a/subprojects/groovy-swing/src/main/java/groovy/model/DefaultTableColumn.java
+++ b/subprojects/groovy-swing/src/main/java/groovy/model/DefaultTableColumn.java
@@ -23,6 +23,7 @@ import javax.swing.table.TableColumn;
/**
* Represents a column using a ValueModel to extract the value.
*/
+@Deprecated
public class DefaultTableColumn extends TableColumn {
private ValueModel valueModel;
diff --git a/subprojects/groovy-swing/src/main/java/groovy/model/DefaultTableModel.java b/subprojects/groovy-swing/src/main/java/groovy/model/DefaultTableModel.java
index 0e4d45c..280bbd0 100644
--- a/subprojects/groovy-swing/src/main/java/groovy/model/DefaultTableModel.java
+++ b/subprojects/groovy-swing/src/main/java/groovy/model/DefaultTableModel.java
@@ -31,6 +31,7 @@ import java.util.List;
/**
* A default table model made up of PropertyModels on a Value model.
*/
+@Deprecated
public class DefaultTableModel extends AbstractTableModel {
private ValueModel rowModel;
diff --git a/subprojects/groovy-swing/src/main/java/groovy/model/FormModel.java b/subprojects/groovy-swing/src/main/java/groovy/model/FormModel.java
index fdec612..8468caa 100644
--- a/subprojects/groovy-swing/src/main/java/groovy/model/FormModel.java
+++ b/subprojects/groovy-swing/src/main/java/groovy/model/FormModel.java
@@ -25,6 +25,7 @@ import java.util.Map;
* Represents a number of field models which can be ValueModel,
* PropertyModel, TableModel, TreeModel or nested FormModel instances
*/
+@Deprecated
public class FormModel {
private Map fieldModels;
diff --git a/subprojects/groovy-swing/src/main/java/groovy/model/NestedValueModel.java b/subprojects/groovy-swing/src/main/java/groovy/model/NestedValueModel.java
index c31d269..15e86faa 100644
--- a/subprojects/groovy-swing/src/main/java/groovy/model/NestedValueModel.java
+++ b/subprojects/groovy-swing/src/main/java/groovy/model/NestedValueModel.java
@@ -22,6 +22,7 @@ package groovy.model;
* Represents a nested value model such as a PropertyModel
* or a ClosureModel
*/
+@Deprecated
public interface NestedValueModel {
ValueModel getSourceModel();
}
diff --git a/subprojects/groovy-swing/src/main/java/groovy/model/PropertyModel.java b/subprojects/groovy-swing/src/main/java/groovy/model/PropertyModel.java
index 4b56d9b..e4cb9d8 100644
--- a/subprojects/groovy-swing/src/main/java/groovy/model/PropertyModel.java
+++ b/subprojects/groovy-swing/src/main/java/groovy/model/PropertyModel.java
@@ -23,6 +23,7 @@ import org.codehaus.groovy.runtime.InvokerHelper;
/**
* Represents a property of a value as a model.
*/
+@Deprecated
public class PropertyModel implements ValueModel, NestedValueModel {
private ValueModel sourceModel;
diff --git a/subprojects/groovy-swing/src/main/java/groovy/model/ValueHolder.java b/subprojects/groovy-swing/src/main/java/groovy/model/ValueHolder.java
index e34b043..4e9bd33 100644
--- a/subprojects/groovy-swing/src/main/java/groovy/model/ValueHolder.java
+++ b/subprojects/groovy-swing/src/main/java/groovy/model/ValueHolder.java
@@ -25,6 +25,7 @@ import java.beans.PropertyChangeSupport;
* A simple ValueModel implementation which is a holder of an object value.
* Used to share local variables with closures
*/
+@Deprecated
public class ValueHolder implements ValueModel {
private Object value;
private final Class type;
diff --git a/subprojects/groovy-swing/src/main/java/groovy/model/ValueModel.java b/subprojects/groovy-swing/src/main/java/groovy/model/ValueModel.java
index 510fd79..b9726a5 100644
--- a/subprojects/groovy-swing/src/main/java/groovy/model/ValueModel.java
+++ b/subprojects/groovy-swing/src/main/java/groovy/model/ValueModel.java
@@ -21,6 +21,7 @@ package groovy.model;
/**
* Represents a model of a value
*/
+@Deprecated
public interface ValueModel {
Object getValue();
void setValue(Object value);
diff --git a/subprojects/groovy-swing/src/main/java/groovy/swing/model/ClosureModel.java b/subprojects/groovy-swing/src/main/java/groovy/swing/model/ClosureModel.java
index 0f664de..2667a78 100644
--- a/subprojects/groovy-swing/src/main/java/groovy/swing/model/ClosureModel.java
+++ b/subprojects/groovy-swing/src/main/java/groovy/swing/model/ClosureModel.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package groovy.model;
+package groovy.swing.model;
import groovy.lang.Closure;
diff --git a/subprojects/groovy-swing/src/main/java/groovy/swing/model/DefaultTableColumn.java b/subprojects/groovy-swing/src/main/java/groovy/swing/model/DefaultTableColumn.java
index 29fcf5b..02b34ad 100644
--- a/subprojects/groovy-swing/src/main/java/groovy/swing/model/DefaultTableColumn.java
+++ b/subprojects/groovy-swing/src/main/java/groovy/swing/model/DefaultTableColumn.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package groovy.model;
+package groovy.swing.model;
import javax.swing.table.TableColumn;
diff --git a/subprojects/groovy-swing/src/main/java/groovy/swing/model/DefaultTableModel.java b/subprojects/groovy-swing/src/main/java/groovy/swing/model/DefaultTableModel.java
index 0e4d45c..c6fc486 100644
--- a/subprojects/groovy-swing/src/main/java/groovy/swing/model/DefaultTableModel.java
+++ b/subprojects/groovy-swing/src/main/java/groovy/swing/model/DefaultTableModel.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package groovy.model;
+package groovy.swing.model;
import groovy.lang.Closure;
import org.codehaus.groovy.runtime.InvokerHelper;
diff --git a/subprojects/groovy-swing/src/main/java/groovy/swing/model/FormModel.java b/subprojects/groovy-swing/src/main/java/groovy/swing/model/FormModel.java
index fdec612..e1057a7 100644
--- a/subprojects/groovy-swing/src/main/java/groovy/swing/model/FormModel.java
+++ b/subprojects/groovy-swing/src/main/java/groovy/swing/model/FormModel.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package groovy.model;
+package groovy.swing.model;
import java.util.HashMap;
import java.util.Map;
diff --git a/subprojects/groovy-swing/src/main/java/groovy/swing/model/NestedValueModel.java b/subprojects/groovy-swing/src/main/java/groovy/swing/model/NestedValueModel.java
index c31d269..261b2b3 100644
--- a/subprojects/groovy-swing/src/main/java/groovy/swing/model/NestedValueModel.java
+++ b/subprojects/groovy-swing/src/main/java/groovy/swing/model/NestedValueModel.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package groovy.model;
+package groovy.swing.model;
/**
* Represents a nested value model such as a PropertyModel
diff --git a/subprojects/groovy-swing/src/main/java/groovy/swing/model/PropertyModel.java b/subprojects/groovy-swing/src/main/java/groovy/swing/model/PropertyModel.java
index 4b56d9b..a930a53 100644
--- a/subprojects/groovy-swing/src/main/java/groovy/swing/model/PropertyModel.java
+++ b/subprojects/groovy-swing/src/main/java/groovy/swing/model/PropertyModel.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package groovy.model;
+package groovy.swing.model;
import org.codehaus.groovy.runtime.InvokerHelper;
diff --git a/subprojects/groovy-swing/src/main/java/groovy/swing/model/ValueHolder.java b/subprojects/groovy-swing/src/main/java/groovy/swing/model/ValueHolder.java
index e34b043..64ba5af 100644
--- a/subprojects/groovy-swing/src/main/java/groovy/swing/model/ValueHolder.java
+++ b/subprojects/groovy-swing/src/main/java/groovy/swing/model/ValueHolder.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package groovy.model;
+package groovy.swing.model;
import java.beans.PropertyChangeListener;
import java.beans.PropertyChangeSupport;
diff --git a/subprojects/groovy-swing/src/main/java/groovy/swing/model/ValueModel.java b/subprojects/groovy-swing/src/main/java/groovy/swing/model/ValueModel.java
index 510fd79..2802703 100644
--- a/subprojects/groovy-swing/src/main/java/groovy/swing/model/ValueModel.java
+++ b/subprojects/groovy-swing/src/main/java/groovy/swing/model/ValueModel.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package groovy.model;
+package groovy.swing.model;
/**
* Represents a model of a value
diff --git a/subprojects/groovy-swing/src/main/java/groovy/swing/model/package.html b/subprojects/groovy-swing/src/main/java/groovy/swing/model/package.html
index eae064c..326512c 100644
--- a/subprojects/groovy-swing/src/main/java/groovy/swing/model/package.html
+++ b/subprojects/groovy-swing/src/main/java/groovy/swing/model/package.html
@@ -20,7 +20,7 @@
-->
<html>
<head>
- <title>package groovy.model.*</title>
+ <title>package groovy.swing.model.*</title>
</head>
<body>
<p>An MVC model package for working with user interfaces and data structures and arbitrary Java and Groovy objects
diff --git a/subprojects/groovy-swing/src/main/java/groovy/swing/table/TableMap.java b/subprojects/groovy-swing/src/main/java/groovy/swing/table/TableMap.java
index 9645746..c5f106f 100644
--- a/subprojects/groovy-swing/src/main/java/groovy/swing/table/TableMap.java
+++ b/subprojects/groovy-swing/src/main/java/groovy/swing/table/TableMap.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package groovy.inspect.swingui;
+package groovy.swing.table;
import javax.swing.event.TableModelEvent;
import javax.swing.event.TableModelListener;
diff --git a/subprojects/groovy-swing/src/main/java/groovy/swing/table/TableSorter.java b/subprojects/groovy-swing/src/main/java/groovy/swing/table/TableSorter.java
index 74ed0d6..018db20 100644
--- a/subprojects/groovy-swing/src/main/java/groovy/swing/table/TableSorter.java
+++ b/subprojects/groovy-swing/src/main/java/groovy/swing/table/TableSorter.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package groovy.inspect.swingui;
+package groovy.swing.table;
import javax.swing.*;
import javax.swing.event.TableModelEvent;
diff --git a/subprojects/groovy-swing/src/main/java/org/apache/groovy/swing/binding/AbstractFullBinding.java b/subprojects/groovy-swing/src/main/java/org/apache/groovy/swing/binding/AbstractFullBinding.java
index d361793..0720885 100644
--- a/subprojects/groovy-swing/src/main/java/org/apache/groovy/swing/binding/AbstractFullBinding.java
+++ b/subprojects/groovy-swing/src/main/java/org/apache/groovy/swing/binding/AbstractFullBinding.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.codehaus.groovy.binding;
+package org.apache.groovy.swing.binding;
import groovy.lang.Closure;
diff --git a/subprojects/groovy-swing/src/main/java/org/apache/groovy/swing/binding/AggregateBinding.java b/subprojects/groovy-swing/src/main/java/org/apache/groovy/swing/binding/AggregateBinding.java
index c27726d..628dd06 100644
--- a/subprojects/groovy-swing/src/main/java/org/apache/groovy/swing/binding/AggregateBinding.java
+++ b/subprojects/groovy-swing/src/main/java/org/apache/groovy/swing/binding/AggregateBinding.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.codehaus.groovy.binding;
+package org.apache.groovy.swing.binding;
import java.util.LinkedHashSet;
import java.util.Set;
diff --git a/subprojects/groovy-swing/src/main/java/org/apache/groovy/swing/binding/BindPath.java b/subprojects/groovy-swing/src/main/java/org/apache/groovy/swing/binding/BindPath.java
index ceb740a..74450a5 100644
--- a/subprojects/groovy-swing/src/main/java/org/apache/groovy/swing/binding/BindPath.java
+++ b/subprojects/groovy-swing/src/main/java/org/apache/groovy/swing/binding/BindPath.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.codehaus.groovy.binding;
+package org.apache.groovy.swing.binding;
import groovy.lang.MetaClass;
import groovy.lang.MissingPropertyException;
diff --git a/subprojects/groovy-swing/src/main/java/org/apache/groovy/swing/binding/BindingProxy.java b/subprojects/groovy-swing/src/main/java/org/apache/groovy/swing/binding/BindingProxy.java
index a687eba..87566d0 100644
--- a/subprojects/groovy-swing/src/main/java/org/apache/groovy/swing/binding/BindingProxy.java
+++ b/subprojects/groovy-swing/src/main/java/org/apache/groovy/swing/binding/BindingProxy.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.codehaus.groovy.binding;
+package org.apache.groovy.swing.binding;
import groovy.lang.GroovyObjectSupport;
import groovy.lang.ReadOnlyPropertyException;
diff --git a/subprojects/groovy-swing/src/main/java/org/apache/groovy/swing/binding/BindingUpdatable.java b/subprojects/groovy-swing/src/main/java/org/apache/groovy/swing/binding/BindingUpdatable.java
index d4b6b16..7c7b25d 100644
--- a/subprojects/groovy-swing/src/main/java/org/apache/groovy/swing/binding/BindingUpdatable.java
+++ b/subprojects/groovy-swing/src/main/java/org/apache/groovy/swing/binding/BindingUpdatable.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.codehaus.groovy.binding;
+package org.apache.groovy.swing.binding;
/**
* @since Groovy 1.1
diff --git a/subprojects/groovy-swing/src/main/java/org/apache/groovy/swing/binding/ClosureSourceBinding.java b/subprojects/groovy-swing/src/main/java/org/apache/groovy/swing/binding/ClosureSourceBinding.java
index 22f422b..39fc689 100644
--- a/subprojects/groovy-swing/src/main/java/org/apache/groovy/swing/binding/ClosureSourceBinding.java
+++ b/subprojects/groovy-swing/src/main/java/org/apache/groovy/swing/binding/ClosureSourceBinding.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.codehaus.groovy.binding;
+package org.apache.groovy.swing.binding;
import groovy.lang.Closure;
diff --git a/subprojects/groovy-swing/src/main/java/org/apache/groovy/swing/binding/ClosureTriggerBinding.java b/subprojects/groovy-swing/src/main/java/org/apache/groovy/swing/binding/ClosureTriggerBinding.java
index 0069d92..d2484c3 100644
--- a/subprojects/groovy-swing/src/main/java/org/apache/groovy/swing/binding/ClosureTriggerBinding.java
+++ b/subprojects/groovy-swing/src/main/java/org/apache/groovy/swing/binding/ClosureTriggerBinding.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.codehaus.groovy.binding;
+package org.apache.groovy.swing.binding;
import groovy.lang.Closure;
import groovy.lang.GroovyObjectSupport;
diff --git a/subprojects/groovy-swing/src/main/java/org/apache/groovy/swing/binding/EventTriggerBinding.java b/subprojects/groovy-swing/src/main/java/org/apache/groovy/swing/binding/EventTriggerBinding.java
index 844c617..03fc0ce 100644
--- a/subprojects/groovy-swing/src/main/java/org/apache/groovy/swing/binding/EventTriggerBinding.java
+++ b/subprojects/groovy-swing/src/main/java/org/apache/groovy/swing/binding/EventTriggerBinding.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.codehaus.groovy.binding;
+package org.apache.groovy.swing.binding;
import groovy.lang.Closure;
import org.codehaus.groovy.runtime.InvokerHelper;
diff --git a/subprojects/groovy-swing/src/main/java/org/apache/groovy/swing/binding/FullBinding.java b/subprojects/groovy-swing/src/main/java/org/apache/groovy/swing/binding/FullBinding.java
index 77375c4..f8fe46b 100644
--- a/subprojects/groovy-swing/src/main/java/org/apache/groovy/swing/binding/FullBinding.java
+++ b/subprojects/groovy-swing/src/main/java/org/apache/groovy/swing/binding/FullBinding.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.codehaus.groovy.binding;
+package org.apache.groovy.swing.binding;
import groovy.lang.Closure;
diff --git a/subprojects/groovy-swing/src/main/java/org/apache/groovy/swing/binding/MutualPropertyBinding.java b/subprojects/groovy-swing/src/main/java/org/apache/groovy/swing/binding/MutualPropertyBinding.java
index a11de2b..7cc7dd7 100644
--- a/subprojects/groovy-swing/src/main/java/org/apache/groovy/swing/binding/MutualPropertyBinding.java
+++ b/subprojects/groovy-swing/src/main/java/org/apache/groovy/swing/binding/MutualPropertyBinding.java
@@ -16,14 +16,13 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.codehaus.groovy.binding;
+package org.apache.groovy.swing.binding;
import groovy.lang.Closure;
/**
* @since Groovy 1.6
*/
-
public class MutualPropertyBinding implements FullBinding {
boolean bound;
diff --git a/subprojects/groovy-swing/src/main/java/org/apache/groovy/swing/binding/PropertyBinding.java b/subprojects/groovy-swing/src/main/java/org/apache/groovy/swing/binding/PropertyBinding.java
index 47149f5..a485f35 100644
--- a/subprojects/groovy-swing/src/main/java/org/apache/groovy/swing/binding/PropertyBinding.java
+++ b/subprojects/groovy-swing/src/main/java/org/apache/groovy/swing/binding/PropertyBinding.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.codehaus.groovy.binding;
+package org.apache.groovy.swing.binding;
import groovy.beans.DefaultPropertyAccessor;
import groovy.beans.PropertyAccessor;
diff --git a/subprojects/groovy-swing/src/main/java/org/apache/groovy/swing/binding/PropertyChangeProxyTargetBinding.java b/subprojects/groovy-swing/src/main/java/org/apache/groovy/swing/binding/PropertyChangeProxyTargetBinding.java
index 0751b0e..2a2dc34 100644
--- a/subprojects/groovy-swing/src/main/java/org/apache/groovy/swing/binding/PropertyChangeProxyTargetBinding.java
+++ b/subprojects/groovy-swing/src/main/java/org/apache/groovy/swing/binding/PropertyChangeProxyTargetBinding.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.codehaus.groovy.binding;
+package org.apache.groovy.swing.binding;
import org.codehaus.groovy.runtime.InvokerHelper;
diff --git a/subprojects/groovy-swing/src/main/java/org/apache/groovy/swing/binding/PropertyPathFullBinding.java b/subprojects/groovy-swing/src/main/java/org/apache/groovy/swing/binding/PropertyPathFullBinding.java
index 0de2a51..594da1a 100644
--- a/subprojects/groovy-swing/src/main/java/org/apache/groovy/swing/binding/PropertyPathFullBinding.java
+++ b/subprojects/groovy-swing/src/main/java/org/apache/groovy/swing/binding/PropertyPathFullBinding.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.codehaus.groovy.binding;
+package org.apache.groovy.swing.binding;
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
diff --git a/subprojects/groovy-swing/src/main/java/org/apache/groovy/swing/binding/SourceBinding.java b/subprojects/groovy-swing/src/main/java/org/apache/groovy/swing/binding/SourceBinding.java
index 9ed635c..6105914 100644
--- a/subprojects/groovy-swing/src/main/java/org/apache/groovy/swing/binding/SourceBinding.java
+++ b/subprojects/groovy-swing/src/main/java/org/apache/groovy/swing/binding/SourceBinding.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.codehaus.groovy.binding;
+package org.apache.groovy.swing.binding;
/**
* @since Groovy 1.1
diff --git a/subprojects/groovy-swing/src/main/java/org/apache/groovy/swing/binding/SwingTimerTriggerBinding.java b/subprojects/groovy-swing/src/main/java/org/apache/groovy/swing/binding/SwingTimerTriggerBinding.java
index 26ad72a..5fa2ff0 100644
--- a/subprojects/groovy-swing/src/main/java/org/apache/groovy/swing/binding/SwingTimerTriggerBinding.java
+++ b/subprojects/groovy-swing/src/main/java/org/apache/groovy/swing/binding/SwingTimerTriggerBinding.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.codehaus.groovy.binding;
+package org.apache.groovy.swing.binding;
import javax.swing.*;
import java.awt.event.ActionEvent;
diff --git a/subprojects/groovy-swing/src/main/java/org/apache/groovy/swing/binding/TargetBinding.java b/subprojects/groovy-swing/src/main/java/org/apache/groovy/swing/binding/TargetBinding.java
index 6fba010..9c1b879 100644
--- a/subprojects/groovy-swing/src/main/java/org/apache/groovy/swing/binding/TargetBinding.java
+++ b/subprojects/groovy-swing/src/main/java/org/apache/groovy/swing/binding/TargetBinding.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.codehaus.groovy.binding;
+package org.apache.groovy.swing.binding;
/**
* @since Groovy 1.1
diff --git a/subprojects/groovy-swing/src/main/java/org/apache/groovy/swing/binding/TriggerBinding.java b/subprojects/groovy-swing/src/main/java/org/apache/groovy/swing/binding/TriggerBinding.java
index f41a075..0d39d4f 100644
--- a/subprojects/groovy-swing/src/main/java/org/apache/groovy/swing/binding/TriggerBinding.java
+++ b/subprojects/groovy-swing/src/main/java/org/apache/groovy/swing/binding/TriggerBinding.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.codehaus.groovy.binding;
+package org.apache.groovy.swing.binding;
/**
* @since Groovy 1.1
diff --git a/subprojects/groovy-swing/src/main/java/org/apache/groovy/swing/binding/package.html b/subprojects/groovy-swing/src/main/java/org/apache/groovy/swing/binding/package.html
index 805c576..30eec5e 100644
--- a/subprojects/groovy-swing/src/main/java/org/apache/groovy/swing/binding/package.html
+++ b/subprojects/groovy-swing/src/main/java/org/apache/groovy/swing/binding/package.html
@@ -20,7 +20,7 @@
-->
<html>
<head>
- <title>package org.codehaus.groovy.binding.*</title>
+ <title>package org.apache.groovy.swing.binding.*</title>
</head>
<body>
<p>Classes related to property binding.</p>
diff --git a/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/AbstractFullBinding.java b/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/AbstractFullBinding.java
index d361793..b534116 100644
--- a/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/AbstractFullBinding.java
+++ b/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/AbstractFullBinding.java
@@ -23,6 +23,7 @@ import groovy.lang.Closure;
/**
* @since Groovy 1.1
*/
+@Deprecated
public abstract class AbstractFullBinding implements FullBinding {
protected SourceBinding sourceBinding;
diff --git a/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/AggregateBinding.java b/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/AggregateBinding.java
index c27726d..3b85d53 100644
--- a/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/AggregateBinding.java
+++ b/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/AggregateBinding.java
@@ -26,6 +26,7 @@ import java.util.Set;
*
* @since Groovy 1.6
*/
+@Deprecated
public class AggregateBinding implements BindingUpdatable {
protected boolean bound;
diff --git a/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/BindPath.java b/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/BindPath.java
index ceb740a..f0cdbe8 100644
--- a/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/BindPath.java
+++ b/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/BindPath.java
@@ -32,6 +32,7 @@ import java.util.TreeMap;
* The bind path object. This class represents one "step" in the bind path.
*/
@SuppressWarnings({"unchecked"}) // all are of type Object, so generics are useless
+@Deprecated
public class BindPath {
/**
diff --git a/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/BindingProxy.java b/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/BindingProxy.java
index a687eba..0815018 100644
--- a/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/BindingProxy.java
+++ b/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/BindingProxy.java
@@ -37,6 +37,7 @@ import java.util.Map;
*
* @since Groovy 1.5
*/
+@Deprecated
public class BindingProxy extends GroovyObjectSupport implements BindingUpdatable {
Object model;
diff --git a/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/BindingUpdatable.java b/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/BindingUpdatable.java
index d4b6b16..d822567 100644
--- a/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/BindingUpdatable.java
+++ b/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/BindingUpdatable.java
@@ -21,6 +21,7 @@ package org.codehaus.groovy.binding;
/**
* @since Groovy 1.1
*/
+@Deprecated
public interface BindingUpdatable {
/**
diff --git a/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/ClosureSourceBinding.java b/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/ClosureSourceBinding.java
index 22f422b..c9f6e2b 100644
--- a/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/ClosureSourceBinding.java
+++ b/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/ClosureSourceBinding.java
@@ -23,6 +23,7 @@ import groovy.lang.Closure;
/**
* @since Groovy 1.1
*/
+@Deprecated
public class ClosureSourceBinding implements SourceBinding {
private static final Object[] EMPTY_OBJECT_ARRAY = new Object[0];
diff --git a/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/ClosureTriggerBinding.java b/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/ClosureTriggerBinding.java
index 0069d92..11a85f2 100644
--- a/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/ClosureTriggerBinding.java
+++ b/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/ClosureTriggerBinding.java
@@ -31,6 +31,7 @@ import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
+@Deprecated
public class ClosureTriggerBinding implements TriggerBinding, SourceBinding {
private static final BindPath[] EMPTY_BINDPATH_ARRAY = new BindPath[0];
Map<String, TriggerBinding> syntheticBindings;
@@ -133,10 +134,12 @@ public class ClosureTriggerBinding implements TriggerBinding, SourceBinding {
}
}
+@Deprecated
class DeadEndException extends RuntimeException {
DeadEndException(String message) { super(message); }
}
+@Deprecated
class DeadEndObject {
public Object getProperty(String property) {
throw new DeadEndException("Cannot bind to a property on the return value of a method call");
@@ -146,6 +149,7 @@ class DeadEndObject {
}
}
+@Deprecated
class BindPathSnooper extends GroovyObjectSupport {
static final DeadEndObject DEAD_END = new DeadEndObject();
diff --git a/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/EventTriggerBinding.java b/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/EventTriggerBinding.java
index 844c617..b7b503d 100644
--- a/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/EventTriggerBinding.java
+++ b/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/EventTriggerBinding.java
@@ -24,6 +24,7 @@ import org.codehaus.groovy.runtime.InvokerHelper;
/**
* @since Groovy 1.1
*/
+@Deprecated
public class EventTriggerBinding implements TriggerBinding {
Object triggerBean;
diff --git a/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/FullBinding.java b/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/FullBinding.java
index 77375c4..ebe7d2c 100644
--- a/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/FullBinding.java
+++ b/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/FullBinding.java
@@ -23,6 +23,7 @@ import groovy.lang.Closure;
/**
* @since Groovy 1.1
*/
+@Deprecated
public interface FullBinding extends BindingUpdatable {
SourceBinding getSourceBinding();
diff --git a/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/MutualPropertyBinding.java b/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/MutualPropertyBinding.java
index a11de2b..41f3b63 100644
--- a/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/MutualPropertyBinding.java
+++ b/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/MutualPropertyBinding.java
@@ -24,6 +24,7 @@ import groovy.lang.Closure;
* @since Groovy 1.6
*/
+@Deprecated
public class MutualPropertyBinding implements FullBinding {
boolean bound;
diff --git a/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/PropertyBinding.java b/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/PropertyBinding.java
index 47149f5..dbc9a89 100644
--- a/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/PropertyBinding.java
+++ b/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/PropertyBinding.java
@@ -48,6 +48,7 @@ import java.util.logging.Logger;
/**
* @since Groovy 1.1
*/
+@Deprecated
public class PropertyBinding implements SourceBinding, TargetBinding, TriggerBinding {
private static final ExecutorService DEFAULT_EXECUTOR_SERVICE = Executors.newFixedThreadPool(Runtime.getRuntime().availableProcessors());
private static final Logger LOG = Logger.getLogger(PropertyBinding.class.getName());
diff --git a/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/PropertyChangeProxyTargetBinding.java b/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/PropertyChangeProxyTargetBinding.java
index 0751b0e..0d2fe7c 100644
--- a/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/PropertyChangeProxyTargetBinding.java
+++ b/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/PropertyChangeProxyTargetBinding.java
@@ -23,6 +23,7 @@ import org.codehaus.groovy.runtime.InvokerHelper;
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
+@Deprecated
public class PropertyChangeProxyTargetBinding implements TargetBinding {
Object proxyObject;
String propertyName;
diff --git a/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/PropertyPathFullBinding.java b/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/PropertyPathFullBinding.java
index 0de2a51..c2bc0ca 100644
--- a/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/PropertyPathFullBinding.java
+++ b/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/PropertyPathFullBinding.java
@@ -26,6 +26,7 @@ import java.util.Set;
/**
* A property path full binding
*/
+@Deprecated
public class PropertyPathFullBinding extends AbstractFullBinding implements PropertyChangeListener {
/**
diff --git a/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/SourceBinding.java b/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/SourceBinding.java
index 9ed635c..51daf39 100644
--- a/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/SourceBinding.java
+++ b/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/SourceBinding.java
@@ -21,6 +21,7 @@ package org.codehaus.groovy.binding;
/**
* @since Groovy 1.1
*/
+@Deprecated
public interface SourceBinding {
Object getSourceValue();
diff --git a/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/SwingTimerTriggerBinding.java b/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/SwingTimerTriggerBinding.java
index 26ad72a..5a1159b 100644
--- a/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/SwingTimerTriggerBinding.java
+++ b/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/SwingTimerTriggerBinding.java
@@ -25,6 +25,7 @@ import java.awt.event.ActionListener;
/**
* @since Groovy 1.1
*/
+@Deprecated
public class SwingTimerTriggerBinding implements TriggerBinding {
public FullBinding createBinding(SourceBinding source, TargetBinding target) {
return new SwingTimerFullBinding((ClosureSourceBinding) source, target);
@@ -34,6 +35,7 @@ public class SwingTimerTriggerBinding implements TriggerBinding {
/**
* @since Groovy 1.1
*/
+@Deprecated
class SwingTimerFullBinding extends AbstractFullBinding implements ActionListener {
Timer timer;
long startTime;
diff --git a/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/TargetBinding.java b/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/TargetBinding.java
index 6fba010..5e06405 100644
--- a/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/TargetBinding.java
+++ b/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/TargetBinding.java
@@ -21,6 +21,7 @@ package org.codehaus.groovy.binding;
/**
* @since Groovy 1.1
*/
+@Deprecated
public interface TargetBinding {
void updateTargetValue(Object value);
diff --git a/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/TriggerBinding.java b/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/TriggerBinding.java
index f41a075..201b736 100644
--- a/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/TriggerBinding.java
+++ b/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/TriggerBinding.java
@@ -21,6 +21,7 @@ package org.codehaus.groovy.binding;
/**
* @since Groovy 1.1
*/
+@Deprecated
public interface TriggerBinding {
FullBinding createBinding(SourceBinding source, TargetBinding target);
diff --git a/subprojects/groovy-swing/src/test/groovy/groovy/ClosureSwingListenerTest.groovy b/subprojects/groovy-swing/src/test/groovy/groovy/swing/ClosureSwingListenerTest.groovy
similarity index 98%
rename from subprojects/groovy-swing/src/test/groovy/groovy/ClosureSwingListenerTest.groovy
rename to subprojects/groovy-swing/src/test/groovy/groovy/swing/ClosureSwingListenerTest.groovy
index 0b0b431..cabcbe2 100644
--- a/subprojects/groovy-swing/src/test/groovy/groovy/ClosureSwingListenerTest.groovy
+++ b/subprojects/groovy-swing/src/test/groovy/groovy/swing/ClosureSwingListenerTest.groovy
@@ -16,12 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*/
-package groovy
+package groovy.swing
import javax.swing.JButton
-/**
- */
class ClosureSwingListenerTest extends GroovySwingTestCase {
void testAddingAndRemovingAClosureListener() {
diff --git a/subprojects/groovy-swing/src/test/groovy/org/codehaus/groovy/runtime/DummyBean.java b/subprojects/groovy-swing/src/test/groovy/groovy/swing/DummyBean.java
similarity index 96%
rename from subprojects/groovy-swing/src/test/groovy/org/codehaus/groovy/runtime/DummyBean.java
rename to subprojects/groovy-swing/src/test/groovy/groovy/swing/DummyBean.java
index 80a72f8..9ab11a2 100644
--- a/subprojects/groovy-swing/src/test/groovy/org/codehaus/groovy/runtime/DummyBean.java
+++ b/subprojects/groovy-swing/src/test/groovy/groovy/swing/DummyBean.java
@@ -16,9 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.codehaus.groovy.runtime;
+package groovy.swing;
-import java.awt.*;
+import java.awt.Point;
import java.beans.PropertyChangeListener;
import java.beans.PropertyChangeSupport;
import java.util.HashMap;
@@ -29,7 +29,7 @@ import java.util.Map;
*/
public class DummyBean {
private String name = "James";
- private Integer i = new Integer(123);
+ private Integer i = 123;
private Map dynamicProperties = new HashMap();
private Point point;
private PropertyChangeSupport changeSupport = new PropertyChangeSupport(this);
diff --git a/subprojects/groovy-swing/src/test/groovy/groovy/util/GroovySwingTestCase.groovy b/subprojects/groovy-swing/src/test/groovy/groovy/swing/GroovySwingTestCase.groovy
similarity index 88%
rename from subprojects/groovy-swing/src/test/groovy/groovy/util/GroovySwingTestCase.groovy
rename to subprojects/groovy-swing/src/test/groovy/groovy/swing/GroovySwingTestCase.groovy
index c52d32e..043a6fb 100644
--- a/subprojects/groovy-swing/src/test/groovy/groovy/util/GroovySwingTestCase.groovy
+++ b/subprojects/groovy-swing/src/test/groovy/groovy/swing/GroovySwingTestCase.groovy
@@ -16,13 +16,15 @@
* specific language governing permissions and limitations
* under the License.
*/
-package groovy.util
+package groovy.swing
+
+import groovy.test.GroovyTestCase
import javax.swing.SwingUtilities
-public abstract class GroovySwingTestCase extends GroovyTestCase {
+abstract class GroovySwingTestCase extends GroovyTestCase {
- public static void testInEDT(Closure test) {
+ static void testInEDT(Closure test) {
Throwable exception = null
if (HeadlessTestSupport.headless) {
return
diff --git a/subprojects/groovy-swing/src/test/groovy/groovy/StrangeBean.java b/subprojects/groovy-swing/src/test/groovy/groovy/swing/StrangeBean.java
similarity index 98%
rename from subprojects/groovy-swing/src/test/groovy/groovy/StrangeBean.java
rename to subprojects/groovy-swing/src/test/groovy/groovy/swing/StrangeBean.java
index 07c3ce8..8a3936a 100644
--- a/subprojects/groovy-swing/src/test/groovy/groovy/StrangeBean.java
+++ b/subprojects/groovy-swing/src/test/groovy/groovy/swing/StrangeBean.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package groovy;
+package groovy.swing;
import java.util.LinkedHashSet;
import java.util.Set;
diff --git a/subprojects/groovy-swing/src/test/groovy/groovy/StrangeBeanBeanInfo.java b/subprojects/groovy-swing/src/test/groovy/groovy/swing/StrangeBeanBeanInfo.java
similarity index 98%
rename from subprojects/groovy-swing/src/test/groovy/groovy/StrangeBeanBeanInfo.java
rename to subprojects/groovy-swing/src/test/groovy/groovy/swing/StrangeBeanBeanInfo.java
index 24443c8..8e2f97b 100644
--- a/subprojects/groovy-swing/src/test/groovy/groovy/StrangeBeanBeanInfo.java
+++ b/subprojects/groovy-swing/src/test/groovy/groovy/swing/StrangeBeanBeanInfo.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package groovy;
+package groovy.swing;
import java.beans.EventSetDescriptor;
import java.beans.SimpleBeanInfo;
diff --git a/subprojects/groovy-swing/src/test/groovy/groovy/StrangeEventListener.java b/subprojects/groovy-swing/src/test/groovy/groovy/swing/StrangeEventListener.java
similarity index 98%
rename from subprojects/groovy-swing/src/test/groovy/groovy/StrangeEventListener.java
rename to subprojects/groovy-swing/src/test/groovy/groovy/swing/StrangeEventListener.java
index 3b3e98b..f2a6671 100644
--- a/subprojects/groovy-swing/src/test/groovy/groovy/StrangeEventListener.java
+++ b/subprojects/groovy-swing/src/test/groovy/groovy/swing/StrangeEventListener.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package groovy;
+package groovy.swing;
import java.util.EventListener;
import java.beans.PropertyChangeEvent;
diff --git a/subprojects/groovy-swing/src/test/groovy/groovy/swing/SwingBuilderBindingsTest.groovy b/subprojects/groovy-swing/src/test/groovy/groovy/swing/SwingBuilderBindingsTest.groovy
index c1163c8..8aeb744 100644
--- a/subprojects/groovy-swing/src/test/groovy/groovy/swing/SwingBuilderBindingsTest.groovy
+++ b/subprojects/groovy-swing/src/test/groovy/groovy/swing/SwingBuilderBindingsTest.groovy
@@ -20,16 +20,21 @@ package groovy.swing
import groovy.beans.Bindable
import groovy.beans.Vetoable
+
+import javax.swing.DefaultBoundedRangeModel
+import javax.swing.DefaultButtonModel
+import javax.swing.DefaultListModel
+import javax.swing.ListSelectionModel
+import javax.swing.SpinnerNumberModel
+import javax.swing.text.PlainDocument
import java.awt.event.ActionEvent
import java.beans.PropertyChangeEvent
import java.beans.PropertyVetoException
import java.text.SimpleDateFormat
-import javax.swing.text.PlainDocument
-import javax.swing.*
-public class SwingBuilderBindingsTest extends GroovySwingTestCase {
+class SwingBuilderBindingsTest extends GroovySwingTestCase {
- public void testSliderValueBinding() {
+ void testSliderValueBinding() {
testInEDT {
SwingBuilder swing = new SwingBuilder()
@@ -67,7 +72,7 @@ public class SwingBuilderBindingsTest extends GroovySwingTestCase {
}
}
- public void testSpinnerValueBinding() {
+ void testSpinnerValueBinding() {
testInEDT {
SwingBuilder swing = new SwingBuilder()
@@ -105,7 +110,7 @@ public class SwingBuilderBindingsTest extends GroovySwingTestCase {
}
}
- public void testScrollBarValueBinding() {
+ void testScrollBarValueBinding() {
testInEDT {
SwingBuilder swing = new SwingBuilder()
swing.actions {
@@ -142,7 +147,7 @@ public class SwingBuilderBindingsTest extends GroovySwingTestCase {
}
}
- public void testTextFieldTextBinding() {
+ void testTextFieldTextBinding() {
testInEDT {
SwingBuilder swing = new SwingBuilder()
swing.actions {
@@ -178,7 +183,7 @@ public class SwingBuilderBindingsTest extends GroovySwingTestCase {
}
}
- public void testCheckboxSelectedBinding() {
+ void testCheckboxSelectedBinding() {
testInEDT {
SwingBuilder swing = new SwingBuilder()
swing.actions {
@@ -214,7 +219,7 @@ public class SwingBuilderBindingsTest extends GroovySwingTestCase {
}
}
- public void testComboBoxBindSyntheticProperties() {
+ void testComboBoxBindSyntheticProperties() {
testInEDT {
SwingBuilder swing = new SwingBuilder()
def comboData = ['Alpha', 'Bravo', 'Charlie', 'Delta']
@@ -327,7 +332,7 @@ public class SwingBuilderBindingsTest extends GroovySwingTestCase {
}
}
- public void testListBindSyntheticProperties() {
+ void testListBindSyntheticProperties() {
testInEDT {
SwingBuilder swing = new SwingBuilder()
def listModel = new DefaultListModel()
@@ -426,7 +431,7 @@ public class SwingBuilderBindingsTest extends GroovySwingTestCase {
}
}
- public void testEventBinding() {
+ void testEventBinding() {
testInEDT {
SwingBuilder swing = new SwingBuilder()
def capture
@@ -449,7 +454,7 @@ public class SwingBuilderBindingsTest extends GroovySwingTestCase {
}
}
- public void testPropertyBinding() {
+ void testPropertyBinding() {
testInEDT {
SwingBuilder swing = new SwingBuilder()
@@ -485,7 +490,7 @@ public class SwingBuilderBindingsTest extends GroovySwingTestCase {
}
}
- public void testBindGroup() {
+ void testBindGroup() {
testInEDT {
SwingBuilder swing = new SwingBuilder()
@@ -557,7 +562,7 @@ public class SwingBuilderBindingsTest extends GroovySwingTestCase {
}
}
- public void testPropertyEventBinding() {
+ void testPropertyEventBinding() {
testInEDT {
SwingBuilder swing = new SwingBuilder()
@@ -604,7 +609,7 @@ public class SwingBuilderBindingsTest extends GroovySwingTestCase {
}
}
- public void testBindNodeValue() {
+ void testBindNodeValue() {
testInEDT {
SwingBuilder swing = new SwingBuilder()
@@ -627,7 +632,7 @@ public class SwingBuilderBindingsTest extends GroovySwingTestCase {
}
}
- public void testReversePropertyBinding() {
+ void testReversePropertyBinding() {
testInEDT {
SwingBuilder swing = new SwingBuilder()
@@ -663,7 +668,7 @@ public class SwingBuilderBindingsTest extends GroovySwingTestCase {
}
}
- public void testValueNodeBinding() {
+ void testValueNodeBinding() {
testInEDT {
SwingBuilder swing = new SwingBuilder()
@@ -700,7 +705,7 @@ public class SwingBuilderBindingsTest extends GroovySwingTestCase {
}
}
- public void testReversePropertyPropertites() {
+ void testReversePropertyPropertites() {
testInEDT {
SwingBuilder swing = new SwingBuilder()
@@ -714,7 +719,7 @@ public class SwingBuilderBindingsTest extends GroovySwingTestCase {
}
}
- public void testConverters() {
+ void testConverters() {
testInEDT {
SwingBuilder swing = new SwingBuilder()
@@ -755,7 +760,7 @@ public class SwingBuilderBindingsTest extends GroovySwingTestCase {
}
}
- public void testDateConverters() {
+ void testDateConverters() {
testInEDT {
BindableBean model = new BindableBean()
model.date = new Date()
@@ -794,7 +799,7 @@ public class SwingBuilderBindingsTest extends GroovySwingTestCase {
}
}
- public void testPropertyValuePassthrough() {
+ void testPropertyValuePassthrough() {
testInEDT {
SwingBuilder swing = new SwingBuilder()
@@ -826,11 +831,11 @@ public class SwingBuilderBindingsTest extends GroovySwingTestCase {
}
}
- public void testModel() {
+ void testModel() {
testInEDT {
SwingBuilder swing = new SwingBuilder()
- def bean = new org.codehaus.groovy.runtime.DummyBean()
+ def bean = new DummyBean()
swing.bindProxy(bean, id: 'dummyBean')
@@ -843,7 +848,7 @@ public class SwingBuilderBindingsTest extends GroovySwingTestCase {
assert swing.textField.text != bean.name
// test for no update on bean change
- bean = new org.codehaus.groovy.runtime.DummyBean()
+ bean = new DummyBean()
bean.name = 'Alex'
swing.dummyBean.setModel(bean)
assert swing.textField.text != bean.name
@@ -860,11 +865,11 @@ public class SwingBuilderBindingsTest extends GroovySwingTestCase {
}
}
- public void testModelUpdate() {
+ void testModelUpdate() {
testInEDT {
SwingBuilder swing = new SwingBuilder()
- def bean = new org.codehaus.groovy.runtime.DummyBean()
+ def bean = new DummyBean()
swing.bindProxy(bean, id: 'dummyBean', bind: true)
@@ -874,7 +879,7 @@ public class SwingBuilderBindingsTest extends GroovySwingTestCase {
assert swing.textField.text == bean.name
// test for update on bean change
- bean = new org.codehaus.groovy.runtime.DummyBean()
+ bean = new DummyBean()
bean.name = 'Alex'
swing.dummyBean.setModel(bean)
@@ -890,7 +895,7 @@ public class SwingBuilderBindingsTest extends GroovySwingTestCase {
bean.name = 'Guillaume'
assert swing.textField.text != bean.name
- bean = new org.codehaus.groovy.runtime.DummyBean()
+ bean = new DummyBean()
bean.name = 'Andres'
swing.dummyBean.setModel(bean)
@@ -959,7 +964,7 @@ public class SwingBuilderBindingsTest extends GroovySwingTestCase {
assert source[sourceProperty] == target[targetProperty]
}
- public void testMutualPropertyBinding() {
+ void testMutualPropertyBinding() {
testInEDT {
['full', 'source', 'target'].each { mode -> // contextual bind mode
['prop', 'synth'].each { target -> // target binding
@@ -1101,7 +1106,7 @@ public class SwingBuilderBindingsTest extends GroovySwingTestCase {
}
}
- public void testConverter() {
+ void testConverter() {
testInEDT {
SwingBuilder swing = new SwingBuilder()
def model = new BindableBean()
@@ -1126,7 +1131,7 @@ public class SwingBuilderBindingsTest extends GroovySwingTestCase {
}
}
- public void testValidator() {
+ void testValidator() {
testInEDT {
SwingBuilder swing = new SwingBuilder()
def model = new BindableBean()
@@ -1156,7 +1161,7 @@ public class SwingBuilderBindingsTest extends GroovySwingTestCase {
}
}
- public void testBindableVetoable() {
+ void testBindableVetoable() {
testInEDT {
def bbean = new BindableBean()
bbean.vetoableChange = { PropertyChangeEvent pce ->
@@ -1176,7 +1181,7 @@ public class SwingBuilderBindingsTest extends GroovySwingTestCase {
}
}
- public void testGroovy4627_source_binding() {
+ void testGroovy4627_source_binding() {
testInEDT {
SwingBuilder swing = new SwingBuilder()
@@ -1211,7 +1216,7 @@ public class SwingBuilderBindingsTest extends GroovySwingTestCase {
}
}
- public void testGroovy4627_target_binding() {
+ void testGroovy4627_target_binding() {
testInEDT {
SwingBuilder swing = new SwingBuilder()
diff --git a/subprojects/groovy-swing/src/test/groovy/groovy/swing/SwingBuilderTableTest.groovy b/subprojects/groovy-swing/src/test/groovy/groovy/swing/SwingBuilderTableTest.groovy
index 58c4399..57b990b 100644
--- a/subprojects/groovy-swing/src/test/groovy/groovy/swing/SwingBuilderTableTest.groovy
+++ b/subprojects/groovy-swing/src/test/groovy/groovy/swing/SwingBuilderTableTest.groovy
@@ -18,11 +18,11 @@
*/
package groovy.swing
-import groovy.model.DefaultTableColumn
-import groovy.model.DefaultTableModel
-import groovy.model.PropertyModel
-import groovy.model.ValueHolder
-import groovy.inspect.swingui.TableSorter
+import groovy.swing.model.DefaultTableColumn
+import groovy.swing.model.DefaultTableModel
+import groovy.swing.model.PropertyModel
+import groovy.swing.model.ValueHolder
+import groovy.swing.table.TableSorter
class SwingBuilderTableTest extends GroovySwingTestCase {
@@ -95,7 +95,7 @@ class SwingBuilderTableTest extends GroovySwingTestCase {
tableModel {
closureColumn(read: closure, write: closure, header: 'header')
}
- tableModel(model: new groovy.model.ValueHolder('foo')) {
+ tableModel(model: new groovy.swing.model.ValueHolder('foo')) {
closureColumn(read: closure, type: String)
}
tableModel(list: ['a', 'b']) {
@@ -103,7 +103,7 @@ class SwingBuilderTableTest extends GroovySwingTestCase {
}
}
- assert table.columnModel.class.name == 'groovy.model.DefaultTableModel$MyTableColumnModel'
+ assert table.columnModel.class.name == 'groovy.swing.model.DefaultTableModel$MyTableColumnModel'
}
}
diff --git a/subprojects/groovy-swing/src/test/groovy/groovy/beans/BindableSwingTest.groovy b/subprojects/groovy-swing/src/test/groovy/groovy/swing/beans/BindableSwingTest.groovy
similarity index 90%
rename from subprojects/groovy-swing/src/test/groovy/groovy/beans/BindableSwingTest.groovy
rename to subprojects/groovy-swing/src/test/groovy/groovy/swing/beans/BindableSwingTest.groovy
index 487626e..f05210b 100644
--- a/subprojects/groovy-swing/src/test/groovy/groovy/beans/BindableSwingTest.groovy
+++ b/subprojects/groovy-swing/src/test/groovy/groovy/swing/beans/BindableSwingTest.groovy
@@ -16,16 +16,19 @@
* specific language governing permissions and limitations
* under the License.
*/
-package groovy.beans
+package groovy.swing.beans
+
+import groovy.swing.GroovySwingTestCase
class BindableSwingTest extends GroovySwingTestCase {
- public void testExtendsComponent() {
+ void testExtendsComponent() {
testInEDT {
GroovyShell shell = new GroovyShell()
shell.evaluate("""
import groovy.beans.Bindable
+ import javax.swing.JPanel
- class BindableTestBean6 extends javax.swing.JPanel {
+ class BindableTestBean6 extends JPanel {
@Bindable String testField
/*
diff --git a/subprojects/groovy-swing/src/test/groovy/groovy/beans/VetoableSwingTest.groovy b/subprojects/groovy-swing/src/test/groovy/groovy/swing/beans/VetoableSwingTest.groovy
similarity index 87%
rename from subprojects/groovy-swing/src/test/groovy/groovy/beans/VetoableSwingTest.groovy
rename to subprojects/groovy-swing/src/test/groovy/groovy/swing/beans/VetoableSwingTest.groovy
index 7163265..73378be 100644
--- a/subprojects/groovy-swing/src/test/groovy/groovy/beans/VetoableSwingTest.groovy
+++ b/subprojects/groovy-swing/src/test/groovy/groovy/swing/beans/VetoableSwingTest.groovy
@@ -16,16 +16,19 @@
* specific language governing permissions and limitations
* under the License.
*/
-package groovy.beans
+package groovy.swing.beans
+
+import groovy.swing.GroovySwingTestCase
class VetoableSwingTest extends GroovySwingTestCase {
- public void testExtendsComponent() {
+ void testExtendsComponent() {
testInEDT {
GroovyShell shell = new GroovyShell()
shell.evaluate("""
import groovy.beans.Vetoable
+ import javax.swing.JPanel
- class VetoableTestBean7 extends javax.swing.JPanel {
+ class VetoableTestBean7 extends JPanel {
@Vetoable String testField
}
diff --git a/subprojects/groovy-swing/src/test/groovy/groovy/bugs/Groovy303_Bug.groovy b/subprojects/groovy-swing/src/test/groovy/groovy/swing/bugs/Groovy303_Bug.groovy
similarity index 80%
rename from subprojects/groovy-swing/src/test/groovy/groovy/bugs/Groovy303_Bug.groovy
rename to subprojects/groovy-swing/src/test/groovy/groovy/swing/bugs/Groovy303_Bug.groovy
index b7877ad..3a60dd5 100644
--- a/subprojects/groovy-swing/src/test/groovy/groovy/bugs/Groovy303_Bug.groovy
+++ b/subprojects/groovy-swing/src/test/groovy/groovy/swing/bugs/Groovy303_Bug.groovy
@@ -16,18 +16,23 @@
* specific language governing permissions and limitations
* under the License.
*/
-package groovy.bugs
+package groovy.swing.bugs
-import java.awt.*
-import java.awt.event.*
-import javax.swing.*
+import groovy.swing.GroovySwingTestCase
+
+import javax.swing.JButton
+import javax.swing.JFrame
+import javax.swing.JPanel
+import java.awt.BorderLayout
+import java.awt.event.ActionEvent
+import java.awt.event.ActionListener
class Groovy303_Bug extends GroovySwingTestCase {
void testBug() {
- testInEDT {
- def scholastic = new Scholastic()
- scholastic.createUI()
- }
+ testInEDT {
+ def scholastic = new Scholastic()
+ scholastic.createUI()
+ }
}
}
diff --git a/subprojects/groovy-swing/src/test/groovy/groovy/bugs/PropertyBug.groovy b/subprojects/groovy-swing/src/test/groovy/groovy/swing/bugs/PropertyBug.groovy
similarity index 94%
rename from subprojects/groovy-swing/src/test/groovy/groovy/bugs/PropertyBug.groovy
rename to subprojects/groovy-swing/src/test/groovy/groovy/swing/bugs/PropertyBug.groovy
index 732db84..441123d 100644
--- a/subprojects/groovy-swing/src/test/groovy/groovy/bugs/PropertyBug.groovy
+++ b/subprojects/groovy-swing/src/test/groovy/groovy/swing/bugs/PropertyBug.groovy
@@ -16,13 +16,12 @@
* specific language governing permissions and limitations
* under the License.
*/
-package groovy.bugs
+package groovy.swing.bugs
import javax.swing.JButton
import javax.swing.JPanel
+import groovy.swing.GroovySwingTestCase
-/**
- */
class PropertyBug extends GroovySwingTestCase {
void testBug() {
diff --git a/subprojects/groovy-swing/src/test/groovy/groovy/model/TableModelTest.groovy b/subprojects/groovy-swing/src/test/groovy/groovy/swing/model/TableModelTest.groovy
similarity index 97%
rename from subprojects/groovy-swing/src/test/groovy/groovy/model/TableModelTest.groovy
rename to subprojects/groovy-swing/src/test/groovy/groovy/swing/model/TableModelTest.groovy
index c41a420..035f24a 100644
--- a/subprojects/groovy-swing/src/test/groovy/groovy/model/TableModelTest.groovy
+++ b/subprojects/groovy-swing/src/test/groovy/groovy/swing/model/TableModelTest.groovy
@@ -16,7 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package groovy.model
+package groovy.swing.model
+
+import groovy.test.GroovyTestCase
class TableModelTest extends GroovyTestCase {
[groovy] 08/17: Split history
main/java/groovy/inspect/swingui/TableMap.java to
main/java/groovy/swing/table - 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 cbf43482a038d87bfe6fc3b838f3bfc609d83072
Author: Paul King <pa...@asert.com.au>
AuthorDate: Fri May 17 13:53:35 2019 +1000
Split history main/java/groovy/inspect/swingui/TableMap.java to main/java/groovy/swing/table - restore name of source-file
---
.../src/{temp => main/java/groovy/inspect/swingui/TableMap.java} | 0
1 file changed, 0 insertions(+), 0 deletions(-)
diff --git a/subprojects/groovy-swing/src/temp b/subprojects/groovy-swing/src/main/java/groovy/inspect/swingui/TableMap.java
similarity index 100%
rename from subprojects/groovy-swing/src/temp
rename to subprojects/groovy-swing/src/main/java/groovy/inspect/swingui/TableMap.java
[groovy] 11/17: Split history
main/java/groovy/inspect/swingui/TableSorter.java to
main/java/groovy/swing/table - 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 5f61e690b5549f92b44bb01fdb25b837f90605f1
Merge: 9af853f d78bf65
Author: Paul King <pa...@asert.com.au>
AuthorDate: Fri May 17 13:53:55 2019 +1000
Split history main/java/groovy/inspect/swingui/TableSorter.java to main/java/groovy/swing/table - resolve conflict and keep both files
.../main/java/groovy/swing/table/TableSorter.java | 326 +++++++++++++++++++++
1 file changed, 326 insertions(+)
[groovy] 09/17: Split history
main/java/groovy/inspect/swingui/TableSorter.java to
main/java/groovy/swing/table - 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 d78bf65466dccd00441bc4c1355bb00443e47f0d
Author: Paul King <pa...@asert.com.au>
AuthorDate: Fri May 17 13:53:54 2019 +1000
Split history main/java/groovy/inspect/swingui/TableSorter.java to main/java/groovy/swing/table - rename file to target-name
---
.../main/java/groovy/{inspect/swingui => swing/table}/TableSorter.java | 0
1 file changed, 0 insertions(+), 0 deletions(-)
diff --git a/subprojects/groovy-swing/src/main/java/groovy/inspect/swingui/TableSorter.java b/subprojects/groovy-swing/src/main/java/groovy/swing/table/TableSorter.java
similarity index 100%
rename from subprojects/groovy-swing/src/main/java/groovy/inspect/swingui/TableSorter.java
rename to subprojects/groovy-swing/src/main/java/groovy/swing/table/TableSorter.java
[groovy] 13/17: Split history main/java/groovy/model to
main/java/groovy/swing - 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 7d9f9bb4841c59dba4a58b77bb720c2da50daadd
Author: Paul King <pa...@asert.com.au>
AuthorDate: Fri May 17 13:54:53 2019 +1000
Split history main/java/groovy/model to main/java/groovy/swing - rename file to target-name
---
.../groovy-swing/src/main/java/groovy/{ => swing}/model/ClosureModel.java | 0
.../src/main/java/groovy/{ => swing}/model/DefaultTableColumn.java | 0
.../src/main/java/groovy/{ => swing}/model/DefaultTableModel.java | 0
.../groovy-swing/src/main/java/groovy/{ => swing}/model/FormModel.java | 0
.../src/main/java/groovy/{ => swing}/model/NestedValueModel.java | 0
.../src/main/java/groovy/{ => swing}/model/PropertyModel.java | 0
.../groovy-swing/src/main/java/groovy/{ => swing}/model/ValueHolder.java | 0
.../groovy-swing/src/main/java/groovy/{ => swing}/model/ValueModel.java | 0
.../groovy-swing/src/main/java/groovy/{ => swing}/model/package.html | 0
9 files changed, 0 insertions(+), 0 deletions(-)
diff --git a/subprojects/groovy-swing/src/main/java/groovy/model/ClosureModel.java b/subprojects/groovy-swing/src/main/java/groovy/swing/model/ClosureModel.java
similarity index 100%
rename from subprojects/groovy-swing/src/main/java/groovy/model/ClosureModel.java
rename to subprojects/groovy-swing/src/main/java/groovy/swing/model/ClosureModel.java
diff --git a/subprojects/groovy-swing/src/main/java/groovy/model/DefaultTableColumn.java b/subprojects/groovy-swing/src/main/java/groovy/swing/model/DefaultTableColumn.java
similarity index 100%
rename from subprojects/groovy-swing/src/main/java/groovy/model/DefaultTableColumn.java
rename to subprojects/groovy-swing/src/main/java/groovy/swing/model/DefaultTableColumn.java
diff --git a/subprojects/groovy-swing/src/main/java/groovy/model/DefaultTableModel.java b/subprojects/groovy-swing/src/main/java/groovy/swing/model/DefaultTableModel.java
similarity index 100%
rename from subprojects/groovy-swing/src/main/java/groovy/model/DefaultTableModel.java
rename to subprojects/groovy-swing/src/main/java/groovy/swing/model/DefaultTableModel.java
diff --git a/subprojects/groovy-swing/src/main/java/groovy/model/FormModel.java b/subprojects/groovy-swing/src/main/java/groovy/swing/model/FormModel.java
similarity index 100%
rename from subprojects/groovy-swing/src/main/java/groovy/model/FormModel.java
rename to subprojects/groovy-swing/src/main/java/groovy/swing/model/FormModel.java
diff --git a/subprojects/groovy-swing/src/main/java/groovy/model/NestedValueModel.java b/subprojects/groovy-swing/src/main/java/groovy/swing/model/NestedValueModel.java
similarity index 100%
rename from subprojects/groovy-swing/src/main/java/groovy/model/NestedValueModel.java
rename to subprojects/groovy-swing/src/main/java/groovy/swing/model/NestedValueModel.java
diff --git a/subprojects/groovy-swing/src/main/java/groovy/model/PropertyModel.java b/subprojects/groovy-swing/src/main/java/groovy/swing/model/PropertyModel.java
similarity index 100%
rename from subprojects/groovy-swing/src/main/java/groovy/model/PropertyModel.java
rename to subprojects/groovy-swing/src/main/java/groovy/swing/model/PropertyModel.java
diff --git a/subprojects/groovy-swing/src/main/java/groovy/model/ValueHolder.java b/subprojects/groovy-swing/src/main/java/groovy/swing/model/ValueHolder.java
similarity index 100%
rename from subprojects/groovy-swing/src/main/java/groovy/model/ValueHolder.java
rename to subprojects/groovy-swing/src/main/java/groovy/swing/model/ValueHolder.java
diff --git a/subprojects/groovy-swing/src/main/java/groovy/model/ValueModel.java b/subprojects/groovy-swing/src/main/java/groovy/swing/model/ValueModel.java
similarity index 100%
rename from subprojects/groovy-swing/src/main/java/groovy/model/ValueModel.java
rename to subprojects/groovy-swing/src/main/java/groovy/swing/model/ValueModel.java
diff --git a/subprojects/groovy-swing/src/main/java/groovy/model/package.html b/subprojects/groovy-swing/src/main/java/groovy/swing/model/package.html
similarity index 100%
rename from subprojects/groovy-swing/src/main/java/groovy/model/package.html
rename to subprojects/groovy-swing/src/main/java/groovy/swing/model/package.html
[groovy] 14/17: Split history main/java/groovy/model to
main/java/groovy/swing - 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 79a199733efad3f7141f0a5e6ea3a54c84f4d075
Author: Paul King <pa...@asert.com.au>
AuthorDate: Fri May 17 13:54:53 2019 +1000
Split history main/java/groovy/model to main/java/groovy/swing - rename source-file to temp
---
.../groovy-swing/src/{main/java/groovy/model => temp}/ClosureModel.java | 0
.../src/{main/java/groovy/model => temp}/DefaultTableColumn.java | 0
.../src/{main/java/groovy/model => temp}/DefaultTableModel.java | 0
.../groovy-swing/src/{main/java/groovy/model => temp}/FormModel.java | 0
.../src/{main/java/groovy/model => temp}/NestedValueModel.java | 0
.../groovy-swing/src/{main/java/groovy/model => temp}/PropertyModel.java | 0
.../groovy-swing/src/{main/java/groovy/model => temp}/ValueHolder.java | 0
.../groovy-swing/src/{main/java/groovy/model => temp}/ValueModel.java | 0
.../groovy-swing/src/{main/java/groovy/model => temp}/package.html | 0
9 files changed, 0 insertions(+), 0 deletions(-)
diff --git a/subprojects/groovy-swing/src/main/java/groovy/model/ClosureModel.java b/subprojects/groovy-swing/src/temp/ClosureModel.java
similarity index 100%
rename from subprojects/groovy-swing/src/main/java/groovy/model/ClosureModel.java
rename to subprojects/groovy-swing/src/temp/ClosureModel.java
diff --git a/subprojects/groovy-swing/src/main/java/groovy/model/DefaultTableColumn.java b/subprojects/groovy-swing/src/temp/DefaultTableColumn.java
similarity index 100%
rename from subprojects/groovy-swing/src/main/java/groovy/model/DefaultTableColumn.java
rename to subprojects/groovy-swing/src/temp/DefaultTableColumn.java
diff --git a/subprojects/groovy-swing/src/main/java/groovy/model/DefaultTableModel.java b/subprojects/groovy-swing/src/temp/DefaultTableModel.java
similarity index 100%
rename from subprojects/groovy-swing/src/main/java/groovy/model/DefaultTableModel.java
rename to subprojects/groovy-swing/src/temp/DefaultTableModel.java
diff --git a/subprojects/groovy-swing/src/main/java/groovy/model/FormModel.java b/subprojects/groovy-swing/src/temp/FormModel.java
similarity index 100%
rename from subprojects/groovy-swing/src/main/java/groovy/model/FormModel.java
rename to subprojects/groovy-swing/src/temp/FormModel.java
diff --git a/subprojects/groovy-swing/src/main/java/groovy/model/NestedValueModel.java b/subprojects/groovy-swing/src/temp/NestedValueModel.java
similarity index 100%
rename from subprojects/groovy-swing/src/main/java/groovy/model/NestedValueModel.java
rename to subprojects/groovy-swing/src/temp/NestedValueModel.java
diff --git a/subprojects/groovy-swing/src/main/java/groovy/model/PropertyModel.java b/subprojects/groovy-swing/src/temp/PropertyModel.java
similarity index 100%
rename from subprojects/groovy-swing/src/main/java/groovy/model/PropertyModel.java
rename to subprojects/groovy-swing/src/temp/PropertyModel.java
diff --git a/subprojects/groovy-swing/src/main/java/groovy/model/ValueHolder.java b/subprojects/groovy-swing/src/temp/ValueHolder.java
similarity index 100%
rename from subprojects/groovy-swing/src/main/java/groovy/model/ValueHolder.java
rename to subprojects/groovy-swing/src/temp/ValueHolder.java
diff --git a/subprojects/groovy-swing/src/main/java/groovy/model/ValueModel.java b/subprojects/groovy-swing/src/temp/ValueModel.java
similarity index 100%
rename from subprojects/groovy-swing/src/main/java/groovy/model/ValueModel.java
rename to subprojects/groovy-swing/src/temp/ValueModel.java
diff --git a/subprojects/groovy-swing/src/main/java/groovy/model/package.html b/subprojects/groovy-swing/src/temp/package.html
similarity index 100%
rename from subprojects/groovy-swing/src/main/java/groovy/model/package.html
rename to subprojects/groovy-swing/src/temp/package.html
[groovy] 12/17: Split history
main/java/groovy/inspect/swingui/TableSorter.java to
main/java/groovy/swing/table - 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 ea297f85f806b66c8c2d7ccfeade0ca978c25631
Author: Paul King <pa...@asert.com.au>
AuthorDate: Fri May 17 13:53:55 2019 +1000
Split history main/java/groovy/inspect/swingui/TableSorter.java to main/java/groovy/swing/table - restore name of source-file
---
.../src/{temp => main/java/groovy/inspect/swingui/TableSorter.java} | 0
1 file changed, 0 insertions(+), 0 deletions(-)
diff --git a/subprojects/groovy-swing/src/temp b/subprojects/groovy-swing/src/main/java/groovy/inspect/swingui/TableSorter.java
similarity index 100%
rename from subprojects/groovy-swing/src/temp
rename to subprojects/groovy-swing/src/main/java/groovy/inspect/swingui/TableSorter.java
[groovy] 04/17: Split history main/java/org/codehaus/groovy/binding
to main/java/org/apache/groovy/swing - 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 42d5fa3ae2f4635b751dc01bf240187219e96e96
Author: Paul King <pa...@asert.com.au>
AuthorDate: Fri May 17 13:50:54 2019 +1000
Split history main/java/org/codehaus/groovy/binding to main/java/org/apache/groovy/swing - restore name of source-file
---
.../java/org/codehaus/groovy/binding}/AbstractFullBinding.java | 0
.../{temp => main/java/org/codehaus/groovy/binding}/AggregateBinding.java | 0
.../src/{temp => main/java/org/codehaus/groovy/binding}/BindPath.java | 0
.../src/{temp => main/java/org/codehaus/groovy/binding}/BindingProxy.java | 0
.../{temp => main/java/org/codehaus/groovy/binding}/BindingUpdatable.java | 0
.../java/org/codehaus/groovy/binding}/ClosureSourceBinding.java | 0
.../java/org/codehaus/groovy/binding}/ClosureTriggerBinding.java | 0
.../java/org/codehaus/groovy/binding}/EventTriggerBinding.java | 0
.../src/{temp => main/java/org/codehaus/groovy/binding}/FullBinding.java | 0
.../java/org/codehaus/groovy/binding}/MutualPropertyBinding.java | 0
.../{temp => main/java/org/codehaus/groovy/binding}/PropertyBinding.java | 0
.../org/codehaus/groovy/binding}/PropertyChangeProxyTargetBinding.java | 0
.../java/org/codehaus/groovy/binding}/PropertyPathFullBinding.java | 0
.../{temp => main/java/org/codehaus/groovy/binding}/SourceBinding.java | 0
.../java/org/codehaus/groovy/binding}/SwingTimerTriggerBinding.java | 0
.../{temp => main/java/org/codehaus/groovy/binding}/TargetBinding.java | 0
.../{temp => main/java/org/codehaus/groovy/binding}/TriggerBinding.java | 0
.../src/{temp => main/java/org/codehaus/groovy/binding}/package.html | 0
18 files changed, 0 insertions(+), 0 deletions(-)
diff --git a/subprojects/groovy-swing/src/temp/AbstractFullBinding.java b/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/AbstractFullBinding.java
similarity index 100%
rename from subprojects/groovy-swing/src/temp/AbstractFullBinding.java
rename to subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/AbstractFullBinding.java
diff --git a/subprojects/groovy-swing/src/temp/AggregateBinding.java b/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/AggregateBinding.java
similarity index 100%
rename from subprojects/groovy-swing/src/temp/AggregateBinding.java
rename to subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/AggregateBinding.java
diff --git a/subprojects/groovy-swing/src/temp/BindPath.java b/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/BindPath.java
similarity index 100%
rename from subprojects/groovy-swing/src/temp/BindPath.java
rename to subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/BindPath.java
diff --git a/subprojects/groovy-swing/src/temp/BindingProxy.java b/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/BindingProxy.java
similarity index 100%
rename from subprojects/groovy-swing/src/temp/BindingProxy.java
rename to subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/BindingProxy.java
diff --git a/subprojects/groovy-swing/src/temp/BindingUpdatable.java b/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/BindingUpdatable.java
similarity index 100%
rename from subprojects/groovy-swing/src/temp/BindingUpdatable.java
rename to subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/BindingUpdatable.java
diff --git a/subprojects/groovy-swing/src/temp/ClosureSourceBinding.java b/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/ClosureSourceBinding.java
similarity index 100%
rename from subprojects/groovy-swing/src/temp/ClosureSourceBinding.java
rename to subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/ClosureSourceBinding.java
diff --git a/subprojects/groovy-swing/src/temp/ClosureTriggerBinding.java b/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/ClosureTriggerBinding.java
similarity index 100%
rename from subprojects/groovy-swing/src/temp/ClosureTriggerBinding.java
rename to subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/ClosureTriggerBinding.java
diff --git a/subprojects/groovy-swing/src/temp/EventTriggerBinding.java b/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/EventTriggerBinding.java
similarity index 100%
rename from subprojects/groovy-swing/src/temp/EventTriggerBinding.java
rename to subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/EventTriggerBinding.java
diff --git a/subprojects/groovy-swing/src/temp/FullBinding.java b/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/FullBinding.java
similarity index 100%
rename from subprojects/groovy-swing/src/temp/FullBinding.java
rename to subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/FullBinding.java
diff --git a/subprojects/groovy-swing/src/temp/MutualPropertyBinding.java b/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/MutualPropertyBinding.java
similarity index 100%
rename from subprojects/groovy-swing/src/temp/MutualPropertyBinding.java
rename to subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/MutualPropertyBinding.java
diff --git a/subprojects/groovy-swing/src/temp/PropertyBinding.java b/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/PropertyBinding.java
similarity index 100%
rename from subprojects/groovy-swing/src/temp/PropertyBinding.java
rename to subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/PropertyBinding.java
diff --git a/subprojects/groovy-swing/src/temp/PropertyChangeProxyTargetBinding.java b/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/PropertyChangeProxyTargetBinding.java
similarity index 100%
rename from subprojects/groovy-swing/src/temp/PropertyChangeProxyTargetBinding.java
rename to subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/PropertyChangeProxyTargetBinding.java
diff --git a/subprojects/groovy-swing/src/temp/PropertyPathFullBinding.java b/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/PropertyPathFullBinding.java
similarity index 100%
rename from subprojects/groovy-swing/src/temp/PropertyPathFullBinding.java
rename to subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/PropertyPathFullBinding.java
diff --git a/subprojects/groovy-swing/src/temp/SourceBinding.java b/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/SourceBinding.java
similarity index 100%
rename from subprojects/groovy-swing/src/temp/SourceBinding.java
rename to subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/SourceBinding.java
diff --git a/subprojects/groovy-swing/src/temp/SwingTimerTriggerBinding.java b/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/SwingTimerTriggerBinding.java
similarity index 100%
rename from subprojects/groovy-swing/src/temp/SwingTimerTriggerBinding.java
rename to subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/SwingTimerTriggerBinding.java
diff --git a/subprojects/groovy-swing/src/temp/TargetBinding.java b/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/TargetBinding.java
similarity index 100%
rename from subprojects/groovy-swing/src/temp/TargetBinding.java
rename to subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/TargetBinding.java
diff --git a/subprojects/groovy-swing/src/temp/TriggerBinding.java b/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/TriggerBinding.java
similarity index 100%
rename from subprojects/groovy-swing/src/temp/TriggerBinding.java
rename to subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/TriggerBinding.java
diff --git a/subprojects/groovy-swing/src/temp/package.html b/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/package.html
similarity index 100%
rename from subprojects/groovy-swing/src/temp/package.html
rename to subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/package.html
[groovy] 07/17: Split history
main/java/groovy/inspect/swingui/TableMap.java to
main/java/groovy/swing/table - 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 4ad595525ce0796e2460ac72fd2999275a2e6ad2
Merge: cc20ac3 046c59a
Author: Paul King <pa...@asert.com.au>
AuthorDate: Fri May 17 13:53:34 2019 +1000
Split history main/java/groovy/inspect/swingui/TableMap.java to main/java/groovy/swing/table - resolve conflict and keep both files
.../src/main/java/groovy/swing/table/TableMap.java | 86 ++++++++++++++++++++++
1 file changed, 86 insertions(+)
[groovy] 02/17: Split history main/java/org/codehaus/groovy/binding
to main/java/org/apache/groovy/swing - 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 b786db21bf210a6255f0923484ebfcb2b6ae18b7
Author: Paul King <pa...@asert.com.au>
AuthorDate: Fri May 17 13:50:53 2019 +1000
Split history main/java/org/codehaus/groovy/binding to main/java/org/apache/groovy/swing - rename source-file to temp
---
.../java/org/codehaus/groovy/binding => temp}/AbstractFullBinding.java | 0
.../{main/java/org/codehaus/groovy/binding => temp}/AggregateBinding.java | 0
.../src/{main/java/org/codehaus/groovy/binding => temp}/BindPath.java | 0
.../src/{main/java/org/codehaus/groovy/binding => temp}/BindingProxy.java | 0
.../{main/java/org/codehaus/groovy/binding => temp}/BindingUpdatable.java | 0
.../java/org/codehaus/groovy/binding => temp}/ClosureSourceBinding.java | 0
.../java/org/codehaus/groovy/binding => temp}/ClosureTriggerBinding.java | 0
.../java/org/codehaus/groovy/binding => temp}/EventTriggerBinding.java | 0
.../src/{main/java/org/codehaus/groovy/binding => temp}/FullBinding.java | 0
.../java/org/codehaus/groovy/binding => temp}/MutualPropertyBinding.java | 0
.../{main/java/org/codehaus/groovy/binding => temp}/PropertyBinding.java | 0
.../groovy/binding => temp}/PropertyChangeProxyTargetBinding.java | 0
.../org/codehaus/groovy/binding => temp}/PropertyPathFullBinding.java | 0
.../{main/java/org/codehaus/groovy/binding => temp}/SourceBinding.java | 0
.../org/codehaus/groovy/binding => temp}/SwingTimerTriggerBinding.java | 0
.../{main/java/org/codehaus/groovy/binding => temp}/TargetBinding.java | 0
.../{main/java/org/codehaus/groovy/binding => temp}/TriggerBinding.java | 0
.../src/{main/java/org/codehaus/groovy/binding => temp}/package.html | 0
18 files changed, 0 insertions(+), 0 deletions(-)
diff --git a/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/AbstractFullBinding.java b/subprojects/groovy-swing/src/temp/AbstractFullBinding.java
similarity index 100%
rename from subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/AbstractFullBinding.java
rename to subprojects/groovy-swing/src/temp/AbstractFullBinding.java
diff --git a/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/AggregateBinding.java b/subprojects/groovy-swing/src/temp/AggregateBinding.java
similarity index 100%
rename from subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/AggregateBinding.java
rename to subprojects/groovy-swing/src/temp/AggregateBinding.java
diff --git a/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/BindPath.java b/subprojects/groovy-swing/src/temp/BindPath.java
similarity index 100%
rename from subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/BindPath.java
rename to subprojects/groovy-swing/src/temp/BindPath.java
diff --git a/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/BindingProxy.java b/subprojects/groovy-swing/src/temp/BindingProxy.java
similarity index 100%
rename from subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/BindingProxy.java
rename to subprojects/groovy-swing/src/temp/BindingProxy.java
diff --git a/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/BindingUpdatable.java b/subprojects/groovy-swing/src/temp/BindingUpdatable.java
similarity index 100%
rename from subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/BindingUpdatable.java
rename to subprojects/groovy-swing/src/temp/BindingUpdatable.java
diff --git a/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/ClosureSourceBinding.java b/subprojects/groovy-swing/src/temp/ClosureSourceBinding.java
similarity index 100%
rename from subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/ClosureSourceBinding.java
rename to subprojects/groovy-swing/src/temp/ClosureSourceBinding.java
diff --git a/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/ClosureTriggerBinding.java b/subprojects/groovy-swing/src/temp/ClosureTriggerBinding.java
similarity index 100%
rename from subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/ClosureTriggerBinding.java
rename to subprojects/groovy-swing/src/temp/ClosureTriggerBinding.java
diff --git a/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/EventTriggerBinding.java b/subprojects/groovy-swing/src/temp/EventTriggerBinding.java
similarity index 100%
rename from subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/EventTriggerBinding.java
rename to subprojects/groovy-swing/src/temp/EventTriggerBinding.java
diff --git a/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/FullBinding.java b/subprojects/groovy-swing/src/temp/FullBinding.java
similarity index 100%
rename from subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/FullBinding.java
rename to subprojects/groovy-swing/src/temp/FullBinding.java
diff --git a/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/MutualPropertyBinding.java b/subprojects/groovy-swing/src/temp/MutualPropertyBinding.java
similarity index 100%
rename from subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/MutualPropertyBinding.java
rename to subprojects/groovy-swing/src/temp/MutualPropertyBinding.java
diff --git a/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/PropertyBinding.java b/subprojects/groovy-swing/src/temp/PropertyBinding.java
similarity index 100%
rename from subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/PropertyBinding.java
rename to subprojects/groovy-swing/src/temp/PropertyBinding.java
diff --git a/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/PropertyChangeProxyTargetBinding.java b/subprojects/groovy-swing/src/temp/PropertyChangeProxyTargetBinding.java
similarity index 100%
rename from subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/PropertyChangeProxyTargetBinding.java
rename to subprojects/groovy-swing/src/temp/PropertyChangeProxyTargetBinding.java
diff --git a/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/PropertyPathFullBinding.java b/subprojects/groovy-swing/src/temp/PropertyPathFullBinding.java
similarity index 100%
rename from subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/PropertyPathFullBinding.java
rename to subprojects/groovy-swing/src/temp/PropertyPathFullBinding.java
diff --git a/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/SourceBinding.java b/subprojects/groovy-swing/src/temp/SourceBinding.java
similarity index 100%
rename from subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/SourceBinding.java
rename to subprojects/groovy-swing/src/temp/SourceBinding.java
diff --git a/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/SwingTimerTriggerBinding.java b/subprojects/groovy-swing/src/temp/SwingTimerTriggerBinding.java
similarity index 100%
rename from subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/SwingTimerTriggerBinding.java
rename to subprojects/groovy-swing/src/temp/SwingTimerTriggerBinding.java
diff --git a/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/TargetBinding.java b/subprojects/groovy-swing/src/temp/TargetBinding.java
similarity index 100%
rename from subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/TargetBinding.java
rename to subprojects/groovy-swing/src/temp/TargetBinding.java
diff --git a/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/TriggerBinding.java b/subprojects/groovy-swing/src/temp/TriggerBinding.java
similarity index 100%
rename from subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/TriggerBinding.java
rename to subprojects/groovy-swing/src/temp/TriggerBinding.java
diff --git a/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/package.html b/subprojects/groovy-swing/src/temp/package.html
similarity index 100%
rename from subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/package.html
rename to subprojects/groovy-swing/src/temp/package.html
[groovy] 10/17: Split history
main/java/groovy/inspect/swingui/TableSorter.java to
main/java/groovy/swing/table - 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 9af853fdbdbc7a58f18f723b4ec6679e9232f375
Author: Paul King <pa...@asert.com.au>
AuthorDate: Fri May 17 13:53:54 2019 +1000
Split history main/java/groovy/inspect/swingui/TableSorter.java to main/java/groovy/swing/table - rename source-file to temp
---
.../src/{main/java/groovy/inspect/swingui/TableSorter.java => temp} | 0
1 file changed, 0 insertions(+), 0 deletions(-)
diff --git a/subprojects/groovy-swing/src/main/java/groovy/inspect/swingui/TableSorter.java b/subprojects/groovy-swing/src/temp
similarity index 100%
rename from subprojects/groovy-swing/src/main/java/groovy/inspect/swingui/TableSorter.java
rename to subprojects/groovy-swing/src/temp