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


The following commit(s) were added to refs/heads/master by this push:
     new 121d806  GROOVY-8647: Split package renaming (groovy-console 
additional deprecations)
121d806 is described below

commit 121d806e36cb3f39f531f96a5d2beebfb902a6e9
Author: Paul King <pa...@asert.com.au>
AuthorDate: Fri May 17 16:23:01 2019 +1000

    GROOVY-8647: Split package renaming (groovy-console additional deprecations)
---
 .../src/main/groovy/groovy/inspect/TextNode.groovy               | 1 +
 .../src/main/groovy/groovy/inspect/TextTreeNodeMaker.groovy      | 1 +
 .../src/main/groovy/groovy/inspect/swingui/AstBrowser.groovy     | 9 ++++++++-
 .../groovy/groovy/inspect/swingui/AstNodeToScriptAdapter.groovy  | 2 ++
 .../groovy/groovy/inspect/swingui/ButtonOrDefaultRenderer.groovy | 1 +
 .../main/groovy/groovy/inspect/swingui/ButtonOrTextEditor.groovy | 1 +
 .../src/main/groovy/groovy/inspect/swingui/ObjectBrowser.groovy  | 1 +
 .../groovy/groovy/inspect/swingui/ScriptToTreeNodeAdapter.groovy | 3 +++
 .../groovy-console/src/main/groovy/groovy/ui/Console.groovy      | 1 +
 9 files changed, 19 insertions(+), 1 deletion(-)

diff --git 
a/subprojects/groovy-console/src/main/groovy/groovy/inspect/TextNode.groovy 
b/subprojects/groovy-console/src/main/groovy/groovy/inspect/TextNode.groovy
index 1179769..d76748c 100644
--- a/subprojects/groovy-console/src/main/groovy/groovy/inspect/TextNode.groovy
+++ b/subprojects/groovy-console/src/main/groovy/groovy/inspect/TextNode.groovy
@@ -24,6 +24,7 @@ package groovy.inspect
 import groovy.transform.CompileStatic
 
 @CompileStatic
+@Deprecated
 class TextNode {
     Object userObject
     List<List<String>> properties
diff --git 
a/subprojects/groovy-console/src/main/groovy/groovy/inspect/TextTreeNodeMaker.groovy
 
b/subprojects/groovy-console/src/main/groovy/groovy/inspect/TextTreeNodeMaker.groovy
index d47db95..fa24403 100644
--- 
a/subprojects/groovy-console/src/main/groovy/groovy/inspect/TextTreeNodeMaker.groovy
+++ 
b/subprojects/groovy-console/src/main/groovy/groovy/inspect/TextTreeNodeMaker.groovy
@@ -25,6 +25,7 @@ import groovy.inspect.swingui.AstBrowserNodeMaker
 import groovy.transform.CompileStatic
 
 @CompileStatic
+@Deprecated
 class TextTreeNodeMaker implements AstBrowserNodeMaker<TextNode> {
     TextNode makeNode(Object userObject) {
         new TextNode(userObject)
diff --git 
a/subprojects/groovy-console/src/main/groovy/groovy/inspect/swingui/AstBrowser.groovy
 
b/subprojects/groovy-console/src/main/groovy/groovy/inspect/swingui/AstBrowser.groovy
index 87001af..03cf944 100644
--- 
a/subprojects/groovy-console/src/main/groovy/groovy/inspect/swingui/AstBrowser.groovy
+++ 
b/subprojects/groovy-console/src/main/groovy/groovy/inspect/swingui/AstBrowser.groovy
@@ -57,7 +57,7 @@ import static java.awt.GridBagConstraints.WEST
  * Usage: java groovy.inspect.swingui.AstBrowser [filename]
  *         where [filename] is an existing Groovy script. 
  */
-
+@Deprecated
 class AstBrowser {
 
     private static final String BYTECODE_MSG_SELECT_NODE = '// Please select a 
class node in the tree view.'
@@ -500,6 +500,7 @@ class AstBrowser {
 /**
  * This class sets and restores control positions in the browser.
  */
+@Deprecated
 class AstBrowserUiPreferences {
 
     final frameLocation
@@ -559,6 +560,7 @@ class AstBrowserUiPreferences {
  * An adapter for the CompilePhase enum that can be entered into a Swing 
combobox.
  */
 @CompileStatic
+@Deprecated
 enum CompilePhaseAdapter {
     INITIALIZATION(Phases.INITIALIZATION, 'Initialization'),
     PARSING(Phases.PARSING, 'Parsing'),
@@ -587,6 +589,7 @@ enum CompilePhaseAdapter {
  * This class is a TreeNode and you can store additional properties on it.
  */
 @CompileStatic
+@Deprecated
 class TreeNodeWithProperties extends DefaultMutableTreeNode {
 
     List<List<String>> properties
@@ -619,6 +622,7 @@ class TreeNodeWithProperties extends DefaultMutableTreeNode 
{
  * This interface is used to create tree nodes of various types 
  */
 @CompileStatic
+@Deprecated
 interface AstBrowserNodeMaker<T> {
     T makeNode(Object userObject)
 
@@ -629,6 +633,7 @@ interface AstBrowserNodeMaker<T> {
  * Creates tree nodes for swing UI  
  */
 @CompileStatic
+@Deprecated
 class SwingTreeNodeMaker implements 
AstBrowserNodeMaker<DefaultMutableTreeNode> {
     DefaultMutableTreeNode makeNode(Object userObject) {
         new DefaultMutableTreeNode(userObject)
@@ -639,6 +644,7 @@ class SwingTreeNodeMaker implements 
AstBrowserNodeMaker<DefaultMutableTreeNode>
     }
 }
 
+@Deprecated
 class BytecodeCollector extends ClassCollector {
 
     Map<String, byte[]> bytecode
@@ -657,6 +663,7 @@ class BytecodeCollector extends ClassCollector {
 }
 
 @CompileStatic
+@Deprecated
 class GeneratedBytecodeAwareGroovyClassLoader extends GroovyClassLoader {
 
     private final Map<String, byte[]> bytecode = new HashMap<String, byte[]>()
diff --git 
a/subprojects/groovy-console/src/main/groovy/groovy/inspect/swingui/AstNodeToScriptAdapter.groovy
 
b/subprojects/groovy-console/src/main/groovy/groovy/inspect/swingui/AstNodeToScriptAdapter.groovy
index 52489ff..9f75dcd 100644
--- 
a/subprojects/groovy-console/src/main/groovy/groovy/inspect/swingui/AstNodeToScriptAdapter.groovy
+++ 
b/subprojects/groovy-console/src/main/groovy/groovy/inspect/swingui/AstNodeToScriptAdapter.groovy
@@ -110,6 +110,7 @@ import java.security.CodeSource
  * the command line.
  */
 @CompileStatic
+@Deprecated
 class AstNodeToScriptAdapter {
 
     /**
@@ -189,6 +190,7 @@ and [compilephase] is a valid Integer based 
org.codehaus.groovy.control.CompileP
  * An adapter from ASTNode tree to source code.
  */
 @CompileStatic
+@Deprecated
 class AstNodeToScriptVisitor extends PrimaryClassNodeOperation implements 
GroovyCodeVisitor, GroovyClassVisitor {
 
     private final Writer _out
diff --git 
a/subprojects/groovy-console/src/main/groovy/groovy/inspect/swingui/ButtonOrDefaultRenderer.groovy
 
b/subprojects/groovy-console/src/main/groovy/groovy/inspect/swingui/ButtonOrDefaultRenderer.groovy
index 95348c8..4ab4ab0 100644
--- 
a/subprojects/groovy-console/src/main/groovy/groovy/inspect/swingui/ButtonOrDefaultRenderer.groovy
+++ 
b/subprojects/groovy-console/src/main/groovy/groovy/inspect/swingui/ButtonOrDefaultRenderer.groovy
@@ -31,6 +31,7 @@ import java.awt.*
  * This hack allows to render a button shape in a table cell.
  */
 @CompileStatic
+@Deprecated
 class ButtonOrDefaultRenderer extends DefaultTableCellRenderer {
     Component getTableCellRendererComponent(JTable table, Object value, 
boolean isSelected, boolean hasFocus, int row, int column) {
         if (value instanceof JComponent) {
diff --git 
a/subprojects/groovy-console/src/main/groovy/groovy/inspect/swingui/ButtonOrTextEditor.groovy
 
b/subprojects/groovy-console/src/main/groovy/groovy/inspect/swingui/ButtonOrTextEditor.groovy
index 1045b36..2d8dbb3 100644
--- 
a/subprojects/groovy-console/src/main/groovy/groovy/inspect/swingui/ButtonOrTextEditor.groovy
+++ 
b/subprojects/groovy-console/src/main/groovy/groovy/inspect/swingui/ButtonOrTextEditor.groovy
@@ -33,6 +33,7 @@ import java.awt.event.FocusListener
  * This hack allows to interact with buttons in a cell.
  */
 @CompileStatic
+@Deprecated
 class ButtonOrTextEditor extends AbstractCellEditor implements TableCellEditor 
{
     /** The Swing component being edited. */
     protected JComponent editorComponent
diff --git 
a/subprojects/groovy-console/src/main/groovy/groovy/inspect/swingui/ObjectBrowser.groovy
 
b/subprojects/groovy-console/src/main/groovy/groovy/inspect/swingui/ObjectBrowser.groovy
index 76cac96..92f44aa 100644
--- 
a/subprojects/groovy-console/src/main/groovy/groovy/inspect/swingui/ObjectBrowser.groovy
+++ 
b/subprojects/groovy-console/src/main/groovy/groovy/inspect/swingui/ObjectBrowser.groovy
@@ -41,6 +41,7 @@ import static groovy.inspect.Inspector.MEMBER_VALUE_IDX
  * ObjectBrowser.inspect(myObject)
  * </code>.
  */
+@Deprecated
 class ObjectBrowser {
 
     def inspector
diff --git 
a/subprojects/groovy-console/src/main/groovy/groovy/inspect/swingui/ScriptToTreeNodeAdapter.groovy
 
b/subprojects/groovy-console/src/main/groovy/groovy/inspect/swingui/ScriptToTreeNodeAdapter.groovy
index 7a460ba..7290d98 100644
--- 
a/subprojects/groovy-console/src/main/groovy/groovy/inspect/swingui/ScriptToTreeNodeAdapter.groovy
+++ 
b/subprojects/groovy-console/src/main/groovy/groovy/inspect/swingui/ScriptToTreeNodeAdapter.groovy
@@ -114,6 +114,7 @@ import java.util.concurrent.atomic.AtomicBoolean
  *
  * The String label of a tree node is defined by classname in 
AstBrowserProperties.properties.
  */
+@Deprecated
 class ScriptToTreeNodeAdapter {
 
     static Properties classNameToStringForm
@@ -274,6 +275,7 @@ class ScriptToTreeNodeAdapter {
 /**
  * This Node Operation builds up a root tree node for the viewer.
  */
+@Deprecated
 class TreeNodeBuildingNodeOperation extends PrimaryClassNodeOperation {
 
     final root
@@ -465,6 +467,7 @@ class TreeNodeBuildingNodeOperation extends 
PrimaryClassNodeOperation {
 * This AST visitor builds up a TreeNode.
 */
 @PackageScope
+@Deprecated
 class TreeNodeBuildingVisitor extends CodeVisitorSupport {
 
     def currentNode
diff --git 
a/subprojects/groovy-console/src/main/groovy/groovy/ui/Console.groovy 
b/subprojects/groovy-console/src/main/groovy/groovy/ui/Console.groovy
index 09049ff..20a6e5a 100644
--- a/subprojects/groovy-console/src/main/groovy/groovy/ui/Console.groovy
+++ b/subprojects/groovy-console/src/main/groovy/groovy/ui/Console.groovy
@@ -1704,6 +1704,7 @@ class Console implements CaretListener, 
HyperlinkListener, ComponentListener, Fo
 }
 
 @CompileStatic
+@Deprecated
 class GroovyFileFilter extends FileFilter {
     private static final List GROOVY_SOURCE_EXTENSIONS = ['*.groovy', '*.gvy', 
'*.gy', '*.gsh', '*.story', '*.gpp', '*.grunit']
     private static final GROOVY_SOURCE_EXT_DESC = 
GROOVY_SOURCE_EXTENSIONS.join(',')

Reply via email to