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/09/18 09:59:36 UTC
[groovy] branch GROOVY_3_0_X updated (3dca0dc -> 5a03bcf)
This is an automated email from the ASF dual-hosted git repository.
paulk pushed a change to branch GROOVY_3_0_X
in repository https://gitbox.apache.org/repos/asf/groovy.git.
from 3dca0dc GROOVY-9251: Bump picocli to 4.0.4
new ff74956 don't use deprecated version of class
new 290937c don't use deprecated version of class
new f494e65 don't use deprecated version of class
new 905b03e don't use deprecated version of class
new 5a03bcf don't use deprecated version of resources
The 5 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:
.../main/groovy/groovy/console/ui/Console.groovy | 6 +++---
.../ui/HistoryRecordGetTextToRunTests.groovy | 1 -
.../groovy/groovysh/commands/InspectCommand.groovy | 2 +-
.../swing/binding/AbstractButtonProperties.java | 10 +++++-----
.../swing/binding/AbstractSyntheticBinding.java | 8 ++++----
.../groovy/swing/binding/JComboBoxProperties.java | 10 +++++-----
.../groovy/swing/binding/JComponentProperties.java | 10 +++++-----
.../groovy/swing/binding/JListProperties.groovy | 10 +++++-----
.../groovy/swing/binding/JScrollBarProperties.java | 10 +++++-----
.../groovy/swing/binding/JSliderProperties.java | 10 +++++-----
.../groovy/swing/binding/JSpinnerProperties.java | 10 +++++-----
.../groovy/swing/binding/JTableProperties.java | 11 +++++------
.../swing/binding/JTextComponentProperties.java | 11 +++++------
.../groovy/groovy/swing/factory/BindFactory.groovy | 22 +++++++++++-----------
.../groovy/swing/factory/BindGroupFactory.groovy | 2 +-
.../groovy/swing/factory/BindProxyFactory.groovy | 2 +-
.../apache/groovy/swing/binding/BindingProxy.java | 2 +-
17 files changed, 67 insertions(+), 70 deletions(-)
[groovy] 01/05: don't use deprecated version of class
Posted by pa...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
paulk pushed a commit to branch GROOVY_3_0_X
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit ff74956c8d97714682daaa1cf9e0467cf5dd8eb9
Author: Paul King <pa...@asert.com.au>
AuthorDate: Wed Sep 18 13:02:43 2019 +1000
don't use deprecated version of class
---
.../groovy/org/apache/groovy/groovysh/commands/InspectCommand.groovy | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/commands/InspectCommand.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/commands/InspectCommand.groovy
index eee2a10..6fc947b 100644
--- a/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/commands/InspectCommand.groovy
+++ b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/commands/InspectCommand.groovy
@@ -18,7 +18,7 @@
*/
package org.apache.groovy.groovysh.commands
-import groovy.inspect.swingui.ObjectBrowser
+import groovy.console.ui.ObjectBrowser
import jline.console.completer.Completer
import org.apache.groovy.groovysh.CommandSupport
import org.apache.groovy.groovysh.Groovysh
[groovy] 04/05: don't use deprecated version of class
Posted by pa...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
paulk pushed a commit to branch GROOVY_3_0_X
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit 905b03ee18d290bd5112e137e00b3880ebc17f65
Author: Paul King <pa...@asert.com.au>
AuthorDate: Wed Sep 18 19:19:31 2019 +1000
don't use deprecated version of class
---
.../groovy/swing/binding/JComboBoxProperties.java | 10 +++++-----
.../groovy/swing/binding/JComponentProperties.java | 10 +++++-----
.../groovy/swing/binding/JListProperties.groovy | 10 +++++-----
.../groovy/swing/binding/JScrollBarProperties.java | 10 +++++-----
.../groovy/swing/binding/JSliderProperties.java | 10 +++++-----
.../groovy/swing/binding/JSpinnerProperties.java | 10 +++++-----
.../groovy/swing/binding/JTableProperties.java | 11 +++++------
.../swing/binding/JTextComponentProperties.java | 11 +++++------
.../groovy/groovy/swing/factory/BindFactory.groovy | 22 +++++++++++-----------
.../groovy/swing/factory/BindGroupFactory.groovy | 2 +-
.../groovy/swing/factory/BindProxyFactory.groovy | 2 +-
.../apache/groovy/swing/binding/BindingProxy.java | 2 +-
12 files changed, 54 insertions(+), 56 deletions(-)
diff --git a/subprojects/groovy-swing/src/main/groovy/groovy/swing/binding/JComboBoxProperties.java b/subprojects/groovy-swing/src/main/groovy/groovy/swing/binding/JComboBoxProperties.java
index 5b15751..9d6c102 100644
--- a/subprojects/groovy-swing/src/main/groovy/groovy/swing/binding/JComboBoxProperties.java
+++ b/subprojects/groovy-swing/src/main/groovy/groovy/swing/binding/JComboBoxProperties.java
@@ -18,11 +18,11 @@
*/
package groovy.swing.binding;
-import org.codehaus.groovy.binding.FullBinding;
-import org.codehaus.groovy.binding.PropertyBinding;
-import org.codehaus.groovy.binding.SourceBinding;
-import org.codehaus.groovy.binding.TargetBinding;
-import org.codehaus.groovy.binding.TriggerBinding;
+import org.apache.groovy.swing.binding.FullBinding;
+import org.apache.groovy.swing.binding.PropertyBinding;
+import org.apache.groovy.swing.binding.SourceBinding;
+import org.apache.groovy.swing.binding.TargetBinding;
+import org.apache.groovy.swing.binding.TriggerBinding;
import javax.swing.*;
import javax.swing.event.ListDataEvent;
diff --git a/subprojects/groovy-swing/src/main/groovy/groovy/swing/binding/JComponentProperties.java b/subprojects/groovy-swing/src/main/groovy/groovy/swing/binding/JComponentProperties.java
index 07f74ca..0103200 100644
--- a/subprojects/groovy-swing/src/main/groovy/groovy/swing/binding/JComponentProperties.java
+++ b/subprojects/groovy-swing/src/main/groovy/groovy/swing/binding/JComponentProperties.java
@@ -18,11 +18,11 @@
*/
package groovy.swing.binding;
-import org.codehaus.groovy.binding.FullBinding;
-import org.codehaus.groovy.binding.PropertyBinding;
-import org.codehaus.groovy.binding.SourceBinding;
-import org.codehaus.groovy.binding.TargetBinding;
-import org.codehaus.groovy.binding.TriggerBinding;
+import org.apache.groovy.swing.binding.FullBinding;
+import org.apache.groovy.swing.binding.PropertyBinding;
+import org.apache.groovy.swing.binding.SourceBinding;
+import org.apache.groovy.swing.binding.TargetBinding;
+import org.apache.groovy.swing.binding.TriggerBinding;
import javax.swing.*;
import java.awt.event.ComponentEvent;
diff --git a/subprojects/groovy-swing/src/main/groovy/groovy/swing/binding/JListProperties.groovy b/subprojects/groovy-swing/src/main/groovy/groovy/swing/binding/JListProperties.groovy
index 2a5b4fb..bd2beea 100644
--- a/subprojects/groovy-swing/src/main/groovy/groovy/swing/binding/JListProperties.groovy
+++ b/subprojects/groovy-swing/src/main/groovy/groovy/swing/binding/JListProperties.groovy
@@ -18,11 +18,11 @@
*/
package groovy.swing.binding
-import org.codehaus.groovy.binding.FullBinding
-import org.codehaus.groovy.binding.PropertyBinding
-import org.codehaus.groovy.binding.SourceBinding
-import org.codehaus.groovy.binding.TargetBinding
-import org.codehaus.groovy.binding.TriggerBinding
+import org.apache.groovy.swing.binding.FullBinding
+import org.apache.groovy.swing.binding.PropertyBinding
+import org.apache.groovy.swing.binding.SourceBinding
+import org.apache.groovy.swing.binding.TargetBinding
+import org.apache.groovy.swing.binding.TriggerBinding
import javax.swing.*
import javax.swing.event.ListDataEvent
diff --git a/subprojects/groovy-swing/src/main/groovy/groovy/swing/binding/JScrollBarProperties.java b/subprojects/groovy-swing/src/main/groovy/groovy/swing/binding/JScrollBarProperties.java
index c991d3a..fff328c 100644
--- a/subprojects/groovy-swing/src/main/groovy/groovy/swing/binding/JScrollBarProperties.java
+++ b/subprojects/groovy-swing/src/main/groovy/groovy/swing/binding/JScrollBarProperties.java
@@ -18,11 +18,11 @@
*/
package groovy.swing.binding;
-import org.codehaus.groovy.binding.FullBinding;
-import org.codehaus.groovy.binding.PropertyBinding;
-import org.codehaus.groovy.binding.SourceBinding;
-import org.codehaus.groovy.binding.TargetBinding;
-import org.codehaus.groovy.binding.TriggerBinding;
+import org.apache.groovy.swing.binding.FullBinding;
+import org.apache.groovy.swing.binding.PropertyBinding;
+import org.apache.groovy.swing.binding.SourceBinding;
+import org.apache.groovy.swing.binding.TargetBinding;
+import org.apache.groovy.swing.binding.TriggerBinding;
import javax.swing.*;
import javax.swing.event.ChangeEvent;
diff --git a/subprojects/groovy-swing/src/main/groovy/groovy/swing/binding/JSliderProperties.java b/subprojects/groovy-swing/src/main/groovy/groovy/swing/binding/JSliderProperties.java
index c03c17c..cb408ce 100644
--- a/subprojects/groovy-swing/src/main/groovy/groovy/swing/binding/JSliderProperties.java
+++ b/subprojects/groovy-swing/src/main/groovy/groovy/swing/binding/JSliderProperties.java
@@ -18,11 +18,11 @@
*/
package groovy.swing.binding;
-import org.codehaus.groovy.binding.FullBinding;
-import org.codehaus.groovy.binding.PropertyBinding;
-import org.codehaus.groovy.binding.SourceBinding;
-import org.codehaus.groovy.binding.TargetBinding;
-import org.codehaus.groovy.binding.TriggerBinding;
+import org.apache.groovy.swing.binding.FullBinding;
+import org.apache.groovy.swing.binding.PropertyBinding;
+import org.apache.groovy.swing.binding.SourceBinding;
+import org.apache.groovy.swing.binding.TargetBinding;
+import org.apache.groovy.swing.binding.TriggerBinding;
import javax.swing.*;
import javax.swing.event.ChangeEvent;
diff --git a/subprojects/groovy-swing/src/main/groovy/groovy/swing/binding/JSpinnerProperties.java b/subprojects/groovy-swing/src/main/groovy/groovy/swing/binding/JSpinnerProperties.java
index 69c98fd..4a24a65 100644
--- a/subprojects/groovy-swing/src/main/groovy/groovy/swing/binding/JSpinnerProperties.java
+++ b/subprojects/groovy-swing/src/main/groovy/groovy/swing/binding/JSpinnerProperties.java
@@ -18,11 +18,11 @@
*/
package groovy.swing.binding;
-import org.codehaus.groovy.binding.FullBinding;
-import org.codehaus.groovy.binding.PropertyBinding;
-import org.codehaus.groovy.binding.SourceBinding;
-import org.codehaus.groovy.binding.TargetBinding;
-import org.codehaus.groovy.binding.TriggerBinding;
+import org.apache.groovy.swing.binding.FullBinding;
+import org.apache.groovy.swing.binding.PropertyBinding;
+import org.apache.groovy.swing.binding.SourceBinding;
+import org.apache.groovy.swing.binding.TargetBinding;
+import org.apache.groovy.swing.binding.TriggerBinding;
import javax.swing.*;
import javax.swing.event.ChangeEvent;
diff --git a/subprojects/groovy-swing/src/main/groovy/groovy/swing/binding/JTableProperties.java b/subprojects/groovy-swing/src/main/groovy/groovy/swing/binding/JTableProperties.java
index 73a89c7..f9190e6 100644
--- a/subprojects/groovy-swing/src/main/groovy/groovy/swing/binding/JTableProperties.java
+++ b/subprojects/groovy-swing/src/main/groovy/groovy/swing/binding/JTableProperties.java
@@ -18,12 +18,11 @@
*/
package groovy.swing.binding;
-
-import org.codehaus.groovy.binding.FullBinding;
-import org.codehaus.groovy.binding.PropertyBinding;
-import org.codehaus.groovy.binding.SourceBinding;
-import org.codehaus.groovy.binding.TargetBinding;
-import org.codehaus.groovy.binding.TriggerBinding;
+import org.apache.groovy.swing.binding.FullBinding;
+import org.apache.groovy.swing.binding.PropertyBinding;
+import org.apache.groovy.swing.binding.SourceBinding;
+import org.apache.groovy.swing.binding.TargetBinding;
+import org.apache.groovy.swing.binding.TriggerBinding;
import javax.swing.*;
import javax.swing.event.ListSelectionEvent;
diff --git a/subprojects/groovy-swing/src/main/groovy/groovy/swing/binding/JTextComponentProperties.java b/subprojects/groovy-swing/src/main/groovy/groovy/swing/binding/JTextComponentProperties.java
index 93e6e14..852bd9e 100644
--- a/subprojects/groovy-swing/src/main/groovy/groovy/swing/binding/JTextComponentProperties.java
+++ b/subprojects/groovy-swing/src/main/groovy/groovy/swing/binding/JTextComponentProperties.java
@@ -18,11 +18,11 @@
*/
package groovy.swing.binding;
-import org.codehaus.groovy.binding.FullBinding;
-import org.codehaus.groovy.binding.PropertyBinding;
-import org.codehaus.groovy.binding.SourceBinding;
-import org.codehaus.groovy.binding.TargetBinding;
-import org.codehaus.groovy.binding.TriggerBinding;
+import org.apache.groovy.swing.binding.FullBinding;
+import org.apache.groovy.swing.binding.PropertyBinding;
+import org.apache.groovy.swing.binding.SourceBinding;
+import org.apache.groovy.swing.binding.TargetBinding;
+import org.apache.groovy.swing.binding.TriggerBinding;
import javax.swing.event.DocumentEvent;
import javax.swing.event.DocumentListener;
@@ -33,7 +33,6 @@ import java.beans.PropertyChangeListener;
import java.util.HashMap;
import java.util.Map;
-
/**
* @since Groovy 1.1
*/
diff --git a/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/BindFactory.groovy b/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/BindFactory.groovy
index 55afe7f..05d61cf 100644
--- a/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/BindFactory.groovy
+++ b/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/BindFactory.groovy
@@ -28,17 +28,17 @@ import groovy.swing.binding.JSliderProperties
import groovy.swing.binding.JSpinnerProperties
import groovy.swing.binding.JTableProperties
import groovy.swing.binding.JTextComponentProperties
-import org.codehaus.groovy.binding.AggregateBinding
-import org.codehaus.groovy.binding.BindingUpdatable
-import org.codehaus.groovy.binding.ClosureSourceBinding
-import org.codehaus.groovy.binding.ClosureTriggerBinding
-import org.codehaus.groovy.binding.EventTriggerBinding
-import org.codehaus.groovy.binding.FullBinding
-import org.codehaus.groovy.binding.MutualPropertyBinding
-import org.codehaus.groovy.binding.PropertyBinding
-import org.codehaus.groovy.binding.SourceBinding
-import org.codehaus.groovy.binding.TargetBinding
-import org.codehaus.groovy.binding.TriggerBinding
+import org.apache.groovy.swing.binding.AggregateBinding
+import org.apache.groovy.swing.binding.BindingUpdatable
+import org.apache.groovy.swing.binding.ClosureSourceBinding
+import org.apache.groovy.swing.binding.ClosureTriggerBinding
+import org.apache.groovy.swing.binding.EventTriggerBinding
+import org.apache.groovy.swing.binding.FullBinding
+import org.apache.groovy.swing.binding.MutualPropertyBinding
+import org.apache.groovy.swing.binding.PropertyBinding
+import org.apache.groovy.swing.binding.SourceBinding
+import org.apache.groovy.swing.binding.TargetBinding
+import org.apache.groovy.swing.binding.TriggerBinding
import java.util.Map.Entry
diff --git a/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/BindGroupFactory.groovy b/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/BindGroupFactory.groovy
index df37648..0dface2 100644
--- a/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/BindGroupFactory.groovy
+++ b/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/BindGroupFactory.groovy
@@ -18,7 +18,7 @@
*/
package groovy.swing.factory
-import org.codehaus.groovy.binding.AggregateBinding
+import org.apache.groovy.swing.binding.AggregateBinding
/**
* Factory for aggregate bindings
diff --git a/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/BindProxyFactory.groovy b/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/BindProxyFactory.groovy
index 744e763..2ae5742 100644
--- a/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/BindProxyFactory.groovy
+++ b/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/BindProxyFactory.groovy
@@ -18,7 +18,7 @@
*/
package groovy.swing.factory
-import org.codehaus.groovy.binding.BindingProxy
+import org.apache.groovy.swing.binding.BindingProxy
/**
* @since Groovy 1.1
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 87566d0..6240582 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
@@ -27,7 +27,7 @@ import java.util.List;
import java.util.Map;
/**
- * This class returns half bound {@link org.codehaus.groovy.binding.FullBinding}s on the source half to the model
+ * This class returns half bound {@link org.apache.groovy.swing.binding.FullBinding}s on the source half to the model
* object for every property reference (and I do mean every, valid or not, queried before or not). These returned
* half bindings are stored strongly in a list when generated.
*
[groovy] 02/05: don't use deprecated version of class
Posted by pa...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
paulk pushed a commit to branch GROOVY_3_0_X
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit 290937cbf5aaf61e5f457e41a4c59fa3fcc1353a
Author: Paul King <pa...@asert.com.au>
AuthorDate: Wed Sep 18 18:31:59 2019 +1000
don't use deprecated version of class
---
.../test/groovy/groovy/console/ui/HistoryRecordGetTextToRunTests.groovy | 1 -
1 file changed, 1 deletion(-)
diff --git a/subprojects/groovy-console/src/test/groovy/groovy/console/ui/HistoryRecordGetTextToRunTests.groovy b/subprojects/groovy-console/src/test/groovy/groovy/console/ui/HistoryRecordGetTextToRunTests.groovy
index 2a9127e..7e3d583 100644
--- a/subprojects/groovy-console/src/test/groovy/groovy/console/ui/HistoryRecordGetTextToRunTests.groovy
+++ b/subprojects/groovy-console/src/test/groovy/groovy/console/ui/HistoryRecordGetTextToRunTests.groovy
@@ -18,7 +18,6 @@
*/
package groovy.console.ui
-import groovy.ui.HistoryRecord
import junit.framework.TestCase
class HistoryRecordGetTextToRunTests extends TestCase {
[groovy] 03/05: don't use deprecated version of class
Posted by pa...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
paulk pushed a commit to branch GROOVY_3_0_X
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit f494e6513973bc32caa878f7bb3ca8965328aa77
Author: Paul King <pa...@asert.com.au>
AuthorDate: Wed Sep 18 19:04:50 2019 +1000
don't use deprecated version of class
---
.../groovy/groovy/swing/binding/AbstractButtonProperties.java | 10 +++++-----
.../groovy/groovy/swing/binding/AbstractSyntheticBinding.java | 8 ++++----
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/subprojects/groovy-swing/src/main/groovy/groovy/swing/binding/AbstractButtonProperties.java b/subprojects/groovy-swing/src/main/groovy/groovy/swing/binding/AbstractButtonProperties.java
index 826b2b6..21410b2 100644
--- a/subprojects/groovy-swing/src/main/groovy/groovy/swing/binding/AbstractButtonProperties.java
+++ b/subprojects/groovy-swing/src/main/groovy/groovy/swing/binding/AbstractButtonProperties.java
@@ -18,11 +18,11 @@
*/
package groovy.swing.binding;
-import org.codehaus.groovy.binding.FullBinding;
-import org.codehaus.groovy.binding.PropertyBinding;
-import org.codehaus.groovy.binding.SourceBinding;
-import org.codehaus.groovy.binding.TargetBinding;
-import org.codehaus.groovy.binding.TriggerBinding;
+import org.apache.groovy.swing.binding.FullBinding;
+import org.apache.groovy.swing.binding.PropertyBinding;
+import org.apache.groovy.swing.binding.SourceBinding;
+import org.apache.groovy.swing.binding.TargetBinding;
+import org.apache.groovy.swing.binding.TriggerBinding;
import javax.swing.*;
import java.awt.event.ItemEvent;
diff --git a/subprojects/groovy-swing/src/main/groovy/groovy/swing/binding/AbstractSyntheticBinding.java b/subprojects/groovy-swing/src/main/groovy/groovy/swing/binding/AbstractSyntheticBinding.java
index c99f46f..5ba7538 100644
--- a/subprojects/groovy-swing/src/main/groovy/groovy/swing/binding/AbstractSyntheticBinding.java
+++ b/subprojects/groovy-swing/src/main/groovy/groovy/swing/binding/AbstractSyntheticBinding.java
@@ -18,10 +18,10 @@
*/
package groovy.swing.binding;
-import org.codehaus.groovy.binding.AbstractFullBinding;
-import org.codehaus.groovy.binding.PropertyBinding;
-import org.codehaus.groovy.binding.SourceBinding;
-import org.codehaus.groovy.binding.TargetBinding;
+import org.apache.groovy.swing.binding.AbstractFullBinding;
+import org.apache.groovy.swing.binding.PropertyBinding;
+import org.apache.groovy.swing.binding.SourceBinding;
+import org.apache.groovy.swing.binding.TargetBinding;
public abstract class AbstractSyntheticBinding extends AbstractFullBinding {
boolean bound;
[groovy] 05/05: don't use deprecated version of resources
Posted by pa...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
paulk pushed a commit to branch GROOVY_3_0_X
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit 5a03bcf0463da605b15c71540d3275ad48433677
Author: Paul King <pa...@asert.com.au>
AuthorDate: Wed Sep 18 19:28:30 2019 +1000
don't use deprecated version of resources
---
.../groovy-console/src/main/groovy/groovy/console/ui/Console.groovy | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/subprojects/groovy-console/src/main/groovy/groovy/console/ui/Console.groovy b/subprojects/groovy-console/src/main/groovy/groovy/console/ui/Console.groovy
index 712a449..c5a6473 100644
--- a/subprojects/groovy-console/src/main/groovy/groovy/console/ui/Console.groovy
+++ b/subprojects/groovy-console/src/main/groovy/groovy/console/ui/Console.groovy
@@ -217,9 +217,9 @@ class Console implements CaretListener, HyperlinkListener, ComponentListener, Fo
Closure beforeExecution
Closure afterExecution
- public static URL ICON_PATH = Console.class.classLoader.getResource('groovy/ui/ConsoleIcon.png')
+ public static URL ICON_PATH = Console.class.classLoader.getResource('groovy/console/ui/ConsoleIcon.png')
// used by ObjectBrowser and AST Viewer
- public static URL NODE_ICON_PATH = Console.class.classLoader.getResource('groovy/ui/icons/bullet_green.png')
+ public static URL NODE_ICON_PATH = Console.class.classLoader.getResource('groovy/console/ui/icons/bullet_green.png')
// used by AST Viewer
static groovyFileFilter = new GroovyFileFilter()
@@ -394,7 +394,7 @@ class Console implements CaretListener, HyperlinkListener, ComponentListener, Fo
frame(
title: 'GroovyConsole',
//location: [100,100], // in groovy 2.0 use platform default location
- iconImage: imageIcon('/groovy/ui/ConsoleIcon.png').image,
+ iconImage: imageIcon('/groovy/console/ui/ConsoleIcon.png').image,
defaultCloseOperation: JFrame.DO_NOTHING_ON_CLOSE,
) {
try {