Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 7379E200D4C for ; Thu, 30 Nov 2017 10:35:57 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 71E31160BEA; Thu, 30 Nov 2017 09:35:57 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 2CE15160C04 for ; Thu, 30 Nov 2017 10:35:55 +0100 (CET) Received: (qmail 22904 invoked by uid 500); 30 Nov 2017 09:35:54 -0000 Mailing-List: contact commits-help@groovy.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@groovy.apache.org Delivered-To: mailing list commits@groovy.apache.org Received: (qmail 22841 invoked by uid 99); 30 Nov 2017 09:35:54 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 30 Nov 2017 09:35:54 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 0931BE9422; Thu, 30 Nov 2017 09:35:54 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sunlan@apache.org To: commits@groovy.apache.org Date: Thu, 30 Nov 2017 09:35:55 -0000 Message-Id: <1921a2a3189145c291af35c9435f8d27@git.apache.org> In-Reply-To: <965390283b624abd8f4e22a1db7726e7@git.apache.org> References: <965390283b624abd8f4e22a1db7726e7@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [3/3] groovy git commit: Optimize imports archived-at: Thu, 30 Nov 2017 09:35:57 -0000 Optimize imports Project: http://git-wip-us.apache.org/repos/asf/groovy/repo Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/9e823116 Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/9e823116 Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/9e823116 Branch: refs/heads/GROOVY_2_5_X Commit: 9e823116b2c2a479a2aa370619e138e591a26a6e Parents: b3a83b9 Author: sunlan Authored: Thu Nov 30 17:26:51 2017 +0800 Committer: sunlan Committed: Thu Nov 30 17:26:53 2017 +0800 ---------------------------------------------------------------------- .../groovy/inspect/swingui/AstBrowser.groovy | 12 +-- .../swingui/AstNodeToScriptAdapter.groovy | 83 +++++++++++++-- .../swingui/ButtonOrDefaultRenderer.groovy | 5 +- .../inspect/swingui/ButtonOrTextEditor.groovy | 8 +- .../groovy/inspect/swingui/ObjectBrowser.groovy | 7 +- .../swingui/ScriptToTreeNodeAdapter.groovy | 77 ++++++++++++-- .../src/main/groovy/groovy/ui/Console.groovy | 48 ++++----- .../main/groovy/groovy/ui/ConsoleActions.groovy | 8 +- .../main/groovy/groovy/ui/ConsoleApplet.groovy | 2 +- .../groovy/groovy/ui/ConsoleIvyPlugin.groovy | 7 +- .../groovy/groovy/ui/ConsolePreferences.groovy | 5 +- .../main/groovy/groovy/ui/ConsoleSupport.java | 5 +- .../groovy/groovy/ui/ConsoleTextEditor.java | 14 +-- .../main/groovy/groovy/ui/ConsoleView.groovy | 12 ++- .../groovy/groovy/ui/OutputTransforms.groovy | 6 +- .../groovy/ui/text/AutoIndentAction.groovy | 4 +- .../groovy/ui/text/FindReplaceUtility.java | 34 ++---- .../groovy/groovy/ui/text/GroovyFilter.java | 15 +-- .../ui/text/StructuredSyntaxResources.java | 4 +- .../main/groovy/groovy/ui/text/TextEditor.java | 45 +++----- .../groovy/groovy/ui/text/TextUndoManager.java | 3 +- .../groovy/ui/view/BasicContentPane.groovy | 15 +-- .../groovy/groovy/ui/view/BasicMenuBar.groovy | 4 - .../groovy/groovy/ui/view/BasicStatusBar.groovy | 5 +- .../groovy/groovy/ui/view/BasicToolBar.groovy | 4 +- .../main/groovy/groovy/ui/view/Defaults.groovy | 3 +- .../groovy/groovy/ui/view/GTKDefaults.groovy | 3 - .../groovy/groovy/ui/view/MacOSXDefaults.groovy | 3 +- .../groovy/ui/view/WindowsDefaults.groovy | 3 - .../codehaus/groovy/tools/groovydoc/Main.groovy | 6 +- .../groovydoc/ClasspathResourceManager.java | 3 +- .../tools/groovydoc/ExternalGroovyClassDoc.java | 8 +- .../groovy/tools/groovydoc/GroovyDocWriter.java | 8 +- .../tools/groovydoc/GroovyRootDocBuilder.java | 8 +- .../tools/groovydoc/SimpleGroovyClassDoc.java | 21 +++- .../SimpleGroovyClassDocAssembler.java | 7 +- .../groovydoc/SimpleGroovyConstructorDoc.java | 3 +- .../groovy/tools/groovydoc/SimpleGroovyDoc.java | 4 +- .../SimpleGroovyExecutableMemberDoc.java | 8 +- .../tools/groovydoc/SimpleGroovyFieldDoc.java | 2 +- .../tools/groovydoc/SimpleGroovyMemberDoc.java | 3 +- .../tools/groovydoc/SimpleGroovyMethodDoc.java | 4 +- .../tools/groovydoc/SimpleGroovyParameter.java | 6 +- .../codehaus/groovy/tools/shell/Groovysh.groovy | 7 +- .../tools/shell/InteractiveShellRunner.groovy | 8 +- .../groovy/tools/shell/Interpreter.groovy | 3 +- .../codehaus/groovy/tools/shell/Parser.groovy | 15 ++- .../tools/shell/commands/DocCommand.groovy | 1 - .../tools/shell/commands/ExitCommand.groovy | 2 +- .../tools/shell/commands/GrabCommand.groovy | 8 +- .../tools/shell/commands/HelpCommand.groovy | 2 +- .../tools/shell/commands/InspectCommand.groovy | 10 +- .../tools/shell/commands/RegisterCommand.groovy | 2 +- .../tools/shell/commands/SetCommand.groovy | 2 +- .../tools/shell/commands/ShowCommand.groovy | 1 - .../completion/GroovySyntaxCompletor.groovy | 29 +++++- .../shell/completion/ReflectionCompletor.groovy | 54 +++++++++- .../completion/StricterArgumentCompleter.groovy | 2 - .../shell/util/ScriptVariableAnalyzer.groovy | 6 +- .../tools/shell/util/XmlCommandRegistrar.groovy | 2 +- .../groovy/jmx/builder/JmxBuilderTools.groovy | 2 +- .../groovy/jmx/builder/JmxMetaMapBuilder.groovy | 2 +- .../jmx/builder/JmxBuilderModelMBean.java | 11 +- .../src/main/java/groovy/util/GroovyMBean.java | 16 ++- .../src/main/java/groovy/json/JsonBuilder.java | 8 +- .../src/main/java/groovy/json/JsonDelegate.java | 7 +- .../src/main/java/groovy/json/JsonLexer.java | 8 +- .../src/main/java/groovy/json/JsonOutput.java | 7 +- .../src/main/java/groovy/json/JsonSlurper.java | 2 +- .../src/main/java/groovy/json/JsonToken.java | 6 +- .../java/groovy/json/StreamingJsonBuilder.java | 12 ++- .../groovy/json/internal/BaseJsonParser.java | 7 +- .../groovy/json/internal/CharSequenceValue.java | 4 +- .../main/java/groovy/json/internal/LazyMap.java | 7 +- .../java/groovy/json/internal/LazyValueMap.java | 7 +- .../java/groovy/json/internal/NumberValue.java | 4 +- .../java/groovy/json/internal/ValueMapImpl.java | 6 +- .../jsr223/GroovyScriptEngineFactory.java | 1 - .../groovy/jsr223/GroovyScriptEngineImpl.java | 7 +- .../groovy/macro/matcher/ASTFinder.java | 35 ++++++- .../groovy/macro/matcher/ASTMatcher.groovy | 48 ++++++++- .../matcher/ContextualClassCodeVisitor.java | 34 +++++- .../internal/MatchingConstraintsBuilder.groovy | 1 - .../macro/methods/MacroGroovyMethods.java | 6 +- .../transform/MacroCallTransformingVisitor.java | 13 ++- .../transform/MacroClassTransformation.java | 15 ++- .../macro/transform/MacroMethodsCache.java | 7 +- .../macro/transform/MacroTransformation.java | 4 +- .../groovy/macro/ExampleMacroMethods.java | 10 +- .../org/codehaus/groovy/macro/MacroTest.groovy | 4 +- .../groovy/runtime/NioGroovyMethods.java | 30 +++--- .../codehaus/groovy/runtime/WritablePath.java | 4 +- .../groovy/servlet/AbstractHttpServlet.java | 11 +- .../main/java/groovy/servlet/GroovyServlet.java | 6 +- .../java/groovy/servlet/ServletBinding.java | 12 ++- .../java/groovy/servlet/TemplateServlet.java | 9 +- .../sql/BatchingPreparedStatementWrapper.java | 1 - .../src/main/java/groovy/sql/DataSet.java | 4 +- .../groovy/sql/GroovyResultSetExtension.java | 7 +- .../java/groovy/sql/GroovyResultSetProxy.java | 3 +- .../groovy/sql/ResultSetMetaDataWrapper.java | 4 +- .../src/main/java/groovy/sql/Sql.java | 23 +++-- .../main/java/groovy/sql/SqlWhereVisitor.java | 6 +- .../groovy/swing/LookAndFeelHelper.groovy | 3 +- .../groovy/groovy/swing/SwingBuilder.groovy | 103 +++++++++---------- .../swing/binding/AbstractButtonProperties.java | 6 +- .../swing/binding/JComboBoxMetaMethods.groovy | 3 +- .../swing/binding/JComboBoxProperties.java | 13 ++- .../swing/binding/JComponentProperties.java | 8 +- .../swing/binding/JListMetaMethods.groovy | 3 +- .../groovy/swing/binding/JListProperties.groovy | 23 +++-- .../swing/binding/JScrollBarProperties.java | 6 +- .../groovy/swing/binding/JSliderProperties.java | 6 +- .../swing/binding/JSpinnerProperties.java | 6 +- .../swing/binding/JTableMetaMethods.groovy | 5 +- .../groovy/swing/binding/JTableProperties.java | 6 +- .../swing/binding/JTextComponentProperties.java | 6 +- .../groovy/swing/factory/ActionFactory.groovy | 5 +- .../swing/factory/BevelBorderFactory.groovy | 4 +- .../groovy/swing/factory/BindFactory.groovy | 26 +++-- .../groovy/swing/factory/BoxFactory.groovy | 5 +- .../swing/factory/BoxLayoutFactory.groovy | 5 +- .../swing/factory/ButtonGroupFactory.groovy | 3 +- .../swing/factory/CellEditorFactory.groovy | 3 +- .../groovy/swing/factory/ColumnFactory.groovy | 3 +- .../swing/factory/ColumnModelFactory.groovy | 5 +- .../groovy/swing/factory/ComboBoxFactory.groovy | 4 +- .../swing/factory/ComponentFactory.groovy | 6 +- .../groovy/swing/factory/DialogFactory.groovy | 5 +- .../swing/factory/EmptyBorderFactory.groovy | 2 +- .../swing/factory/EtchedBorderFactory.groovy | 4 +- .../swing/factory/FormattedTextFactory.groovy | 2 +- .../groovy/swing/factory/FrameFactory.groovy | 3 +- .../groovy/swing/factory/GridBagFactory.groovy | 9 +- .../swing/factory/ImageIconFactory.groovy | 4 +- .../swing/factory/InternalFrameFactory.groovy | 2 +- .../groovy/swing/factory/LayoutFactory.groovy | 4 +- .../groovy/swing/factory/ListFactory.groovy | 3 +- .../swing/factory/MatteBorderFactory.groovy | 2 +- .../groovy/swing/factory/RendererFactory.groovy | 6 +- .../factory/RichActionWidgetFactory.groovy | 3 +- .../factory/RootPaneContainerFactory.groovy | 7 +- .../swing/factory/ScrollPaneFactory.groovy | 6 +- .../swing/factory/SeparatorFactory.groovy | 4 +- .../swing/factory/SplitPaneFactory.groovy | 5 +- .../swing/factory/SwingBorderFactory.groovy | 3 +- .../swing/factory/TabbedPaneFactory.groovy | 3 +- .../groovy/swing/factory/TableFactory.groovy | 3 +- .../swing/factory/TableLayoutFactory.groovy | 7 +- .../swing/factory/TableModelFactory.groovy | 7 +- .../swing/factory/TitledBorderFactory.groovy | 3 +- .../groovy/swing/factory/WidgetFactory.groovy | 6 +- .../groovy/swing/factory/WindowFactory.groovy | 2 +- .../groovy/swing/impl/ClosureCellEditor.groovy | 5 +- .../groovy/groovy/swing/impl/DefaultAction.java | 3 +- .../groovy/groovy/swing/impl/TableLayout.java | 7 +- .../groovy/swing/impl/TableLayoutCell.java | 3 +- .../groovy/swing/impl/TableLayoutRow.java | 2 +- .../org/codehaus/groovy/binding/BindPath.java | 9 +- .../groovy/binding/PropertyBinding.java | 4 +- .../PropertyChangeProxyTargetBinding.java | 2 +- .../groovy/binding/PropertyPathFullBinding.java | 4 +- .../binding/SwingTimerTriggerBinding.java | 4 +- .../groovy/text/GStringTemplateEngine.java | 11 +- .../groovy/text/SimpleTemplateEngine.java | 11 +- .../groovy/text/StreamingTemplateEngine.java | 8 +- .../main/groovy/groovy/text/TemplateEngine.java | 6 +- .../markup/MarkupBuilderCodeTransformer.java | 2 - .../text/markup/MarkupTemplateEngine.java | 2 +- .../MarkupTemplateTypeCheckingExtension.groovy | 18 +++- .../groovy/groovy/lang/GroovyLogTestCase.groovy | 6 +- .../util/JavadocAssertionTestSuite.groovy | 2 +- .../mock/interceptor/MockProxyMetaClass.java | 9 +- .../groovy/xml/StreamingDOMBuilder.groovy | 6 +- .../groovy/xml/StreamingMarkupBuilder.groovy | 2 +- .../groovy/xml/StreamingSAXBuilder.groovy | 2 +- .../src/main/java/groovy/util/XmlSlurper.java | 34 +++--- .../groovy/util/slurpersupport/Attribute.java | 3 +- .../groovy/util/slurpersupport/Attributes.java | 4 +- .../util/slurpersupport/FilteredAttributes.java | 7 +- .../slurpersupport/FilteredNodeChildren.java | 7 +- .../groovy/util/slurpersupport/NodeChild.java | 3 +- .../util/slurpersupport/NodeChildren.java | 3 +- .../src/main/java/groovy/xml/DOMBuilder.java | 20 ++-- .../main/java/groovy/xml/FactorySupport.java | 4 +- .../src/main/java/groovy/xml/MarkupBuilder.java | 2 +- .../groovy/xml/NamespaceBuilderSupport.java | 1 - .../src/main/java/groovy/xml/SAXBuilder.java | 7 +- .../src/main/java/groovy/xml/XmlUtil.java | 16 ++- .../codehaus/groovy/tools/xml/DomToGroovy.java | 18 +++- 190 files changed, 1102 insertions(+), 636 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/groovy/blob/9e823116/subprojects/groovy-console/src/main/groovy/groovy/inspect/swingui/AstBrowser.groovy ---------------------------------------------------------------------- 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 4108fee..d826ecb 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 @@ -18,7 +18,6 @@ */ package groovy.inspect.swingui -import groovy.lang.GroovyClassLoader.ClassCollector import groovy.swing.SwingBuilder import org.codehaus.groovy.ast.ClassNode import org.codehaus.groovy.control.CompilationUnit @@ -29,21 +28,16 @@ import org.objectweb.asm.ClassReader import org.objectweb.asm.util.ASMifier import org.objectweb.asm.util.TraceClassVisitor -import javax.swing.Action -import javax.swing.JFrame -import javax.swing.JSplitPane -import javax.swing.KeyStroke -import javax.swing.UIManager -import javax.swing.WindowConstants +import javax.swing.* import javax.swing.event.TreeSelectionEvent import javax.swing.event.TreeSelectionListener import javax.swing.tree.DefaultMutableTreeNode import javax.swing.tree.DefaultTreeModel import javax.swing.tree.TreeNode import javax.swing.tree.TreeSelectionModel -import java.awt.Cursor -import java.awt.Font +import java.awt.* import java.awt.event.KeyEvent +import java.util.List import java.util.prefs.Preferences import java.util.regex.Pattern http://git-wip-us.apache.org/repos/asf/groovy/blob/9e823116/subprojects/groovy-console/src/main/groovy/groovy/inspect/swingui/AstNodeToScriptAdapter.groovy ---------------------------------------------------------------------- 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 98eddac..bf32fa4 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 @@ -18,19 +18,84 @@ */ package groovy.inspect.swingui -import org.codehaus.groovy.ast.* -import org.codehaus.groovy.ast.expr.* -import org.codehaus.groovy.ast.stmt.* +import org.codehaus.groovy.ast.AnnotationNode +import org.codehaus.groovy.ast.ClassHelper +import org.codehaus.groovy.ast.ClassNode +import org.codehaus.groovy.ast.ConstructorNode +import org.codehaus.groovy.ast.FieldNode +import org.codehaus.groovy.ast.GenericsType +import org.codehaus.groovy.ast.GroovyClassVisitor +import org.codehaus.groovy.ast.GroovyCodeVisitor +import org.codehaus.groovy.ast.ImportNode +import org.codehaus.groovy.ast.MethodNode +import org.codehaus.groovy.ast.PackageNode +import org.codehaus.groovy.ast.Parameter +import org.codehaus.groovy.ast.PropertyNode +import org.codehaus.groovy.ast.expr.ArgumentListExpression +import org.codehaus.groovy.ast.expr.ArrayExpression +import org.codehaus.groovy.ast.expr.AttributeExpression +import org.codehaus.groovy.ast.expr.BinaryExpression +import org.codehaus.groovy.ast.expr.BitwiseNegationExpression +import org.codehaus.groovy.ast.expr.BooleanExpression +import org.codehaus.groovy.ast.expr.CastExpression +import org.codehaus.groovy.ast.expr.ClassExpression +import org.codehaus.groovy.ast.expr.ClosureExpression +import org.codehaus.groovy.ast.expr.ClosureListExpression +import org.codehaus.groovy.ast.expr.ConstantExpression +import org.codehaus.groovy.ast.expr.ConstructorCallExpression +import org.codehaus.groovy.ast.expr.DeclarationExpression +import org.codehaus.groovy.ast.expr.ElvisOperatorExpression +import org.codehaus.groovy.ast.expr.EmptyExpression +import org.codehaus.groovy.ast.expr.Expression +import org.codehaus.groovy.ast.expr.FieldExpression +import org.codehaus.groovy.ast.expr.GStringExpression +import org.codehaus.groovy.ast.expr.ListExpression +import org.codehaus.groovy.ast.expr.MapEntryExpression +import org.codehaus.groovy.ast.expr.MapExpression +import org.codehaus.groovy.ast.expr.MethodCallExpression +import org.codehaus.groovy.ast.expr.MethodPointerExpression +import org.codehaus.groovy.ast.expr.NotExpression +import org.codehaus.groovy.ast.expr.PostfixExpression +import org.codehaus.groovy.ast.expr.PrefixExpression +import org.codehaus.groovy.ast.expr.PropertyExpression +import org.codehaus.groovy.ast.expr.RangeExpression +import org.codehaus.groovy.ast.expr.SpreadExpression +import org.codehaus.groovy.ast.expr.SpreadMapExpression +import org.codehaus.groovy.ast.expr.StaticMethodCallExpression +import org.codehaus.groovy.ast.expr.TernaryExpression +import org.codehaus.groovy.ast.expr.TupleExpression +import org.codehaus.groovy.ast.expr.UnaryMinusExpression +import org.codehaus.groovy.ast.expr.UnaryPlusExpression +import org.codehaus.groovy.ast.expr.VariableExpression +import org.codehaus.groovy.ast.stmt.AssertStatement +import org.codehaus.groovy.ast.stmt.BlockStatement +import org.codehaus.groovy.ast.stmt.BreakStatement +import org.codehaus.groovy.ast.stmt.CaseStatement +import org.codehaus.groovy.ast.stmt.CatchStatement +import org.codehaus.groovy.ast.stmt.ContinueStatement +import org.codehaus.groovy.ast.stmt.DoWhileStatement +import org.codehaus.groovy.ast.stmt.EmptyStatement +import org.codehaus.groovy.ast.stmt.ExpressionStatement +import org.codehaus.groovy.ast.stmt.ForStatement +import org.codehaus.groovy.ast.stmt.IfStatement +import org.codehaus.groovy.ast.stmt.ReturnStatement +import org.codehaus.groovy.ast.stmt.Statement +import org.codehaus.groovy.ast.stmt.SwitchStatement +import org.codehaus.groovy.ast.stmt.SynchronizedStatement +import org.codehaus.groovy.ast.stmt.ThrowStatement +import org.codehaus.groovy.ast.stmt.TryCatchStatement +import org.codehaus.groovy.ast.stmt.WhileStatement import org.codehaus.groovy.classgen.BytecodeExpression -import org.codehaus.groovy.control.CompilePhase -import java.lang.reflect.Modifier +import org.codehaus.groovy.classgen.GeneratorContext +import org.codehaus.groovy.classgen.Verifier +import org.codehaus.groovy.control.CompilationFailedException import org.codehaus.groovy.control.CompilationUnit +import org.codehaus.groovy.control.CompilationUnit.PrimaryClassNodeOperation +import org.codehaus.groovy.control.CompilePhase import org.codehaus.groovy.control.CompilerConfiguration -import org.codehaus.groovy.control.CompilationFailedException -import org.codehaus.groovy.classgen.GeneratorContext import org.codehaus.groovy.control.SourceUnit -import org.codehaus.groovy.control.CompilationUnit.PrimaryClassNodeOperation -import org.codehaus.groovy.classgen.Verifier + +import java.lang.reflect.Modifier /** * This class takes Groovy source code, compiles it to a specific compile phase, and then decompiles it http://git-wip-us.apache.org/repos/asf/groovy/blob/9e823116/subprojects/groovy-console/src/main/groovy/groovy/inspect/swingui/ButtonOrDefaultRenderer.groovy ---------------------------------------------------------------------- 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 00a7f0d..c63129c 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 @@ -19,10 +19,9 @@ */ package groovy.inspect.swingui -import javax.swing.JComponent -import javax.swing.JTable +import javax.swing.* import javax.swing.table.DefaultTableCellRenderer -import java.awt.Component +import java.awt.* /** * A table cell renderer that will return a component instead of drawing it, http://git-wip-us.apache.org/repos/asf/groovy/blob/9e823116/subprojects/groovy-console/src/main/groovy/groovy/inspect/swingui/ButtonOrTextEditor.groovy ---------------------------------------------------------------------- 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 6253f62..17e4fcc 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 @@ -19,13 +19,9 @@ */ package groovy.inspect.swingui -import javax.swing.AbstractCellEditor -import javax.swing.JButton -import javax.swing.JComponent -import javax.swing.JTable -import javax.swing.JTextArea +import javax.swing.* import javax.swing.table.TableCellEditor -import java.awt.Component +import java.awt.* import java.awt.event.ActionListener import java.awt.event.FocusListener http://git-wip-us.apache.org/repos/asf/groovy/blob/9e823116/subprojects/groovy-console/src/main/groovy/groovy/inspect/swingui/ObjectBrowser.groovy ---------------------------------------------------------------------- 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 5541c4e..65a3c64 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 @@ -18,10 +18,11 @@ */ package groovy.inspect.swingui -import java.awt.* -import javax.swing.* -import groovy.swing.SwingBuilder import groovy.inspect.Inspector +import groovy.swing.SwingBuilder + +import javax.swing.* +import java.awt.* /** A little GUI to show some of the Inspector capabilities. http://git-wip-us.apache.org/repos/asf/groovy/blob/9e823116/subprojects/groovy-console/src/main/groovy/groovy/inspect/swingui/ScriptToTreeNodeAdapter.groovy ---------------------------------------------------------------------- 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 b5b6e11..e00d26a 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 @@ -21,20 +21,83 @@ package groovy.inspect.swingui import groovy.text.GStringTemplateEngine import groovy.text.Template import groovy.transform.PackageScope -import org.codehaus.groovy.classgen.asm.BytecodeHelper - -import java.util.concurrent.atomic.AtomicBoolean import org.codehaus.groovy.GroovyBugError +import org.codehaus.groovy.ast.AnnotationNode +import org.codehaus.groovy.ast.ClassHelper +import org.codehaus.groovy.ast.ClassNode +import org.codehaus.groovy.ast.CodeVisitorSupport +import org.codehaus.groovy.ast.ConstructorNode +import org.codehaus.groovy.ast.DynamicVariable +import org.codehaus.groovy.ast.FieldNode +import org.codehaus.groovy.ast.InnerClassNode +import org.codehaus.groovy.ast.MethodNode +import org.codehaus.groovy.ast.ModuleNode +import org.codehaus.groovy.ast.Parameter +import org.codehaus.groovy.ast.PropertyNode +import org.codehaus.groovy.ast.expr.ArgumentListExpression +import org.codehaus.groovy.ast.expr.ArrayExpression +import org.codehaus.groovy.ast.expr.AttributeExpression +import org.codehaus.groovy.ast.expr.BinaryExpression +import org.codehaus.groovy.ast.expr.BitwiseNegationExpression +import org.codehaus.groovy.ast.expr.BooleanExpression +import org.codehaus.groovy.ast.expr.CastExpression +import org.codehaus.groovy.ast.expr.ClassExpression +import org.codehaus.groovy.ast.expr.ClosureExpression +import org.codehaus.groovy.ast.expr.ClosureListExpression +import org.codehaus.groovy.ast.expr.ConstantExpression +import org.codehaus.groovy.ast.expr.ConstructorCallExpression +import org.codehaus.groovy.ast.expr.DeclarationExpression +import org.codehaus.groovy.ast.expr.ElvisOperatorExpression +import org.codehaus.groovy.ast.expr.Expression +import org.codehaus.groovy.ast.expr.FieldExpression +import org.codehaus.groovy.ast.expr.GStringExpression +import org.codehaus.groovy.ast.expr.ListExpression +import org.codehaus.groovy.ast.expr.MapEntryExpression +import org.codehaus.groovy.ast.expr.MapExpression +import org.codehaus.groovy.ast.expr.MethodCallExpression +import org.codehaus.groovy.ast.expr.MethodPointerExpression +import org.codehaus.groovy.ast.expr.NamedArgumentListExpression +import org.codehaus.groovy.ast.expr.NotExpression +import org.codehaus.groovy.ast.expr.PostfixExpression +import org.codehaus.groovy.ast.expr.PrefixExpression +import org.codehaus.groovy.ast.expr.PropertyExpression +import org.codehaus.groovy.ast.expr.RangeExpression +import org.codehaus.groovy.ast.expr.SpreadExpression +import org.codehaus.groovy.ast.expr.SpreadMapExpression +import org.codehaus.groovy.ast.expr.StaticMethodCallExpression +import org.codehaus.groovy.ast.expr.TernaryExpression +import org.codehaus.groovy.ast.expr.TupleExpression +import org.codehaus.groovy.ast.expr.UnaryMinusExpression +import org.codehaus.groovy.ast.expr.UnaryPlusExpression +import org.codehaus.groovy.ast.expr.VariableExpression +import org.codehaus.groovy.ast.stmt.AssertStatement +import org.codehaus.groovy.ast.stmt.BlockStatement +import org.codehaus.groovy.ast.stmt.BreakStatement +import org.codehaus.groovy.ast.stmt.CaseStatement +import org.codehaus.groovy.ast.stmt.CatchStatement +import org.codehaus.groovy.ast.stmt.ContinueStatement +import org.codehaus.groovy.ast.stmt.DoWhileStatement +import org.codehaus.groovy.ast.stmt.EmptyStatement +import org.codehaus.groovy.ast.stmt.ExpressionStatement +import org.codehaus.groovy.ast.stmt.ForStatement +import org.codehaus.groovy.ast.stmt.IfStatement +import org.codehaus.groovy.ast.stmt.ReturnStatement +import org.codehaus.groovy.ast.stmt.Statement +import org.codehaus.groovy.ast.stmt.SwitchStatement +import org.codehaus.groovy.ast.stmt.SynchronizedStatement +import org.codehaus.groovy.ast.stmt.ThrowStatement +import org.codehaus.groovy.ast.stmt.TryCatchStatement +import org.codehaus.groovy.ast.stmt.WhileStatement import org.codehaus.groovy.classgen.BytecodeExpression import org.codehaus.groovy.classgen.GeneratorContext +import org.codehaus.groovy.classgen.asm.BytecodeHelper +import org.codehaus.groovy.control.CompilationFailedException import org.codehaus.groovy.control.CompilationUnit import org.codehaus.groovy.control.CompilationUnit.PrimaryClassNodeOperation import org.codehaus.groovy.control.CompilerConfiguration import org.codehaus.groovy.control.SourceUnit -import org.codehaus.groovy.ast.* -import org.codehaus.groovy.ast.expr.* -import org.codehaus.groovy.ast.stmt.* -import org.codehaus.groovy.control.CompilationFailedException + +import java.util.concurrent.atomic.AtomicBoolean /** * This class controls the conversion from a Groovy script as a String into http://git-wip-us.apache.org/repos/asf/groovy/blob/9e823116/subprojects/groovy-console/src/main/groovy/groovy/ui/Console.groovy ---------------------------------------------------------------------- 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 729e45c..18bbfed 100644 --- a/subprojects/groovy-console/src/main/groovy/groovy/ui/Console.groovy +++ b/subprojects/groovy-console/src/main/groovy/groovy/ui/Console.groovy @@ -18,52 +18,46 @@ */ package groovy.ui -import groovy.inspect.swingui.ObjectBrowser import groovy.inspect.swingui.AstBrowser +import groovy.inspect.swingui.ObjectBrowser import groovy.swing.SwingBuilder +import groovy.transform.ThreadInterrupt import groovy.ui.text.FindReplaceUtility import org.codehaus.groovy.antlr.LexerFrame +import org.codehaus.groovy.control.CompilerConfiguration +import org.codehaus.groovy.control.ErrorCollector +import org.codehaus.groovy.control.MultipleCompilationErrorsException +import org.codehaus.groovy.control.customizers.ASTTransformationCustomizer +import org.codehaus.groovy.control.messages.ExceptionMessage import org.codehaus.groovy.control.messages.SimpleMessage +import org.codehaus.groovy.control.messages.SyntaxErrorMessage +import org.codehaus.groovy.runtime.StackTraceUtils import org.codehaus.groovy.runtime.StringGroovyMethods +import org.codehaus.groovy.syntax.SyntaxException import org.codehaus.groovy.tools.shell.util.MessageSource import org.codehaus.groovy.transform.ThreadInterruptibleASTTransformation -import java.awt.Component -import java.awt.EventQueue -import java.awt.Font -import java.awt.Toolkit -import java.awt.Window -import java.awt.event.ActionEvent -import java.awt.event.ComponentEvent -import java.awt.event.ComponentListener -import java.awt.event.FocusListener -import java.awt.event.FocusEvent -import java.util.prefs.Preferences import javax.swing.* import javax.swing.event.CaretEvent import javax.swing.event.CaretListener -import javax.swing.event.HyperlinkListener +import javax.swing.event.DocumentListener import javax.swing.event.HyperlinkEvent +import javax.swing.event.HyperlinkListener +import javax.swing.filechooser.FileFilter import javax.swing.text.AttributeSet import javax.swing.text.Element import javax.swing.text.SimpleAttributeSet import javax.swing.text.Style import javax.swing.text.StyleConstants import javax.swing.text.html.HTML -import javax.swing.filechooser.FileFilter - -import org.codehaus.groovy.runtime.StackTraceUtils -import org.codehaus.groovy.control.ErrorCollector -import org.codehaus.groovy.control.MultipleCompilationErrorsException -import org.codehaus.groovy.control.messages.SyntaxErrorMessage -import org.codehaus.groovy.syntax.SyntaxException -import org.codehaus.groovy.control.messages.ExceptionMessage -import java.awt.Dimension -import java.awt.BorderLayout -import org.codehaus.groovy.control.CompilerConfiguration -import org.codehaus.groovy.control.customizers.ASTTransformationCustomizer -import groovy.transform.ThreadInterrupt -import javax.swing.event.DocumentListener +import java.awt.* +import java.awt.event.ActionEvent +import java.awt.event.ComponentEvent +import java.awt.event.ComponentListener +import java.awt.event.FocusEvent +import java.awt.event.FocusListener +import java.util.List +import java.util.prefs.Preferences /** * Groovy Swing console. http://git-wip-us.apache.org/repos/asf/groovy/blob/9e823116/subprojects/groovy-console/src/main/groovy/groovy/ui/ConsoleActions.groovy ---------------------------------------------------------------------- diff --git a/subprojects/groovy-console/src/main/groovy/groovy/ui/ConsoleActions.groovy b/subprojects/groovy-console/src/main/groovy/groovy/ui/ConsoleActions.groovy index 3382c2b..e52363d 100644 --- a/subprojects/groovy-console/src/main/groovy/groovy/ui/ConsoleActions.groovy +++ b/subprojects/groovy-console/src/main/groovy/groovy/ui/ConsoleActions.groovy @@ -18,15 +18,11 @@ */ package groovy.ui -import groovy.swing.factory.ActionFactory; - +import javax.swing.* +import java.awt.* import java.awt.event.InputEvent import java.awt.event.KeyEvent -import javax.swing.KeyStroke - -import java.awt.Toolkit - newFileAction = action( name: 'New File', closure: controller.&fileNewFile, http://git-wip-us.apache.org/repos/asf/groovy/blob/9e823116/subprojects/groovy-console/src/main/groovy/groovy/ui/ConsoleApplet.groovy ---------------------------------------------------------------------- diff --git a/subprojects/groovy-console/src/main/groovy/groovy/ui/ConsoleApplet.groovy b/subprojects/groovy-console/src/main/groovy/groovy/ui/ConsoleApplet.groovy index edef69e..f6a9f72 100644 --- a/subprojects/groovy-console/src/main/groovy/groovy/ui/ConsoleApplet.groovy +++ b/subprojects/groovy-console/src/main/groovy/groovy/ui/ConsoleApplet.groovy @@ -18,7 +18,7 @@ */ package groovy.ui -import javax.swing.JApplet +import javax.swing.* /** * ConsoleApplet http://git-wip-us.apache.org/repos/asf/groovy/blob/9e823116/subprojects/groovy-console/src/main/groovy/groovy/ui/ConsoleIvyPlugin.groovy ---------------------------------------------------------------------- diff --git a/subprojects/groovy-console/src/main/groovy/groovy/ui/ConsoleIvyPlugin.groovy b/subprojects/groovy-console/src/main/groovy/groovy/ui/ConsoleIvyPlugin.groovy index 678e421..31aec95 100644 --- a/subprojects/groovy-console/src/main/groovy/groovy/ui/ConsoleIvyPlugin.groovy +++ b/subprojects/groovy-console/src/main/groovy/groovy/ui/ConsoleIvyPlugin.groovy @@ -18,12 +18,11 @@ */ package groovy.ui -import groovy.grape.GrapeIvy import groovy.grape.Grape - -import org.apache.ivy.core.event.resolve.StartResolveEvent -import org.apache.ivy.core.event.download.PrepareDownloadEvent +import groovy.grape.GrapeIvy import org.apache.ivy.core.event.IvyListener +import org.apache.ivy.core.event.download.PrepareDownloadEvent +import org.apache.ivy.core.event.resolve.StartResolveEvent /** * Groovy Swing console. http://git-wip-us.apache.org/repos/asf/groovy/blob/9e823116/subprojects/groovy-console/src/main/groovy/groovy/ui/ConsolePreferences.groovy ---------------------------------------------------------------------- diff --git a/subprojects/groovy-console/src/main/groovy/groovy/ui/ConsolePreferences.groovy b/subprojects/groovy-console/src/main/groovy/groovy/ui/ConsolePreferences.groovy index af407f0..2bc00c7 100644 --- a/subprojects/groovy-console/src/main/groovy/groovy/ui/ConsolePreferences.groovy +++ b/subprojects/groovy-console/src/main/groovy/groovy/ui/ConsolePreferences.groovy @@ -22,9 +22,8 @@ import groovy.beans.Bindable import groovy.swing.SwingBuilder import org.codehaus.groovy.tools.shell.util.MessageSource -import java.awt.Dimension -import javax.swing.JDialog -import static java.awt.GridBagConstraints.* +import javax.swing.* +import java.awt.* class ConsolePreferences { http://git-wip-us.apache.org/repos/asf/groovy/blob/9e823116/subprojects/groovy-console/src/main/groovy/groovy/ui/ConsoleSupport.java ---------------------------------------------------------------------- diff --git a/subprojects/groovy-console/src/main/groovy/groovy/ui/ConsoleSupport.java b/subprojects/groovy-console/src/main/groovy/groovy/ui/ConsoleSupport.java index 7edf8bd..a367696 100644 --- a/subprojects/groovy-console/src/main/groovy/groovy/ui/ConsoleSupport.java +++ b/subprojects/groovy-console/src/main/groovy/groovy/ui/ConsoleSupport.java @@ -20,13 +20,12 @@ package groovy.ui; import groovy.lang.GroovyShell; -import java.awt.Color; - -import javax.swing.JTextPane; +import javax.swing.*; import javax.swing.text.Style; import javax.swing.text.StyleConstants; import javax.swing.text.StyleContext; import javax.swing.text.StyledDocument; +import java.awt.*; /** * Base class for console http://git-wip-us.apache.org/repos/asf/groovy/blob/9e823116/subprojects/groovy-console/src/main/groovy/groovy/ui/ConsoleTextEditor.java ---------------------------------------------------------------------- diff --git a/subprojects/groovy-console/src/main/groovy/groovy/ui/ConsoleTextEditor.java b/subprojects/groovy-console/src/main/groovy/groovy/ui/ConsoleTextEditor.java index c444191..b9be0ea 100644 --- a/subprojects/groovy-console/src/main/groovy/groovy/ui/ConsoleTextEditor.java +++ b/subprojects/groovy-console/src/main/groovy/groovy/ui/ConsoleTextEditor.java @@ -22,33 +22,25 @@ import groovy.ui.text.GroovyFilter; import groovy.ui.text.StructuredSyntaxResources; import groovy.ui.text.TextEditor; import groovy.ui.text.TextUndoManager; +import org.codehaus.groovy.runtime.StringGroovyMethods; -import javax.swing.AbstractAction; -import javax.swing.Action; -import javax.swing.ActionMap; -import javax.swing.InputMap; -import javax.swing.JComponent; -import javax.swing.JPanel; -import javax.swing.JScrollPane; -import javax.swing.KeyStroke; +import javax.swing.*; import javax.swing.event.DocumentEvent; import javax.swing.event.DocumentListener; import javax.swing.text.BadLocationException; import javax.swing.text.DefaultStyledDocument; import javax.swing.text.Document; +import java.awt.*; import java.awt.datatransfer.DataFlavor; import java.awt.datatransfer.Transferable; import java.awt.event.ActionEvent; import java.awt.event.InputEvent; import java.awt.event.KeyEvent; import java.awt.print.PrinterJob; -import java.awt.*; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.util.prefs.Preferences; -import org.codehaus.groovy.runtime.StringGroovyMethods; - /** * Component which provides a styled editor for the console. * http://git-wip-us.apache.org/repos/asf/groovy/blob/9e823116/subprojects/groovy-console/src/main/groovy/groovy/ui/ConsoleView.groovy ---------------------------------------------------------------------- diff --git a/subprojects/groovy-console/src/main/groovy/groovy/ui/ConsoleView.groovy b/subprojects/groovy-console/src/main/groovy/groovy/ui/ConsoleView.groovy index e50a36b..d18edc1 100644 --- a/subprojects/groovy-console/src/main/groovy/groovy/ui/ConsoleView.groovy +++ b/subprojects/groovy-console/src/main/groovy/groovy/ui/ConsoleView.groovy @@ -23,12 +23,16 @@ import groovy.ui.view.GTKDefaults import groovy.ui.view.MacOSXDefaults import groovy.ui.view.WindowsDefaults -import javax.swing.Action +import javax.swing.* +import javax.swing.event.DocumentListener import javax.swing.text.DefaultEditorKit import java.awt.datatransfer.DataFlavor -import java.awt.dnd.* -import javax.swing.UIManager -import javax.swing.event.DocumentListener +import java.awt.dnd.DnDConstants +import java.awt.dnd.DropTarget +import java.awt.dnd.DropTargetDragEvent +import java.awt.dnd.DropTargetDropEvent +import java.awt.dnd.DropTargetEvent +import java.awt.dnd.DropTargetListener switch (UIManager.getSystemLookAndFeelClassName()) { case 'com.sun.java.swing.plaf.windows.WindowsLookAndFeel': http://git-wip-us.apache.org/repos/asf/groovy/blob/9e823116/subprojects/groovy-console/src/main/groovy/groovy/ui/OutputTransforms.groovy ---------------------------------------------------------------------- diff --git a/subprojects/groovy-console/src/main/groovy/groovy/ui/OutputTransforms.groovy b/subprojects/groovy-console/src/main/groovy/groovy/ui/OutputTransforms.groovy index 0e5d831..9f804dc 100644 --- a/subprojects/groovy-console/src/main/groovy/groovy/ui/OutputTransforms.groovy +++ b/subprojects/groovy-console/src/main/groovy/groovy/ui/OutputTransforms.groovy @@ -18,11 +18,11 @@ */ package groovy.ui +import org.codehaus.groovy.runtime.InvokerHelper + +import javax.swing.* import java.awt.* import java.awt.image.BufferedImage -import javax.swing.Icon -import javax.swing.ImageIcon -import org.codehaus.groovy.runtime.InvokerHelper class OutputTransforms { http://git-wip-us.apache.org/repos/asf/groovy/blob/9e823116/subprojects/groovy-console/src/main/groovy/groovy/ui/text/AutoIndentAction.groovy ---------------------------------------------------------------------- diff --git a/subprojects/groovy-console/src/main/groovy/groovy/ui/text/AutoIndentAction.groovy b/subprojects/groovy-console/src/main/groovy/groovy/ui/text/AutoIndentAction.groovy index 8fa6a17..491e306 100644 --- a/subprojects/groovy-console/src/main/groovy/groovy/ui/text/AutoIndentAction.groovy +++ b/subprojects/groovy-console/src/main/groovy/groovy/ui/text/AutoIndentAction.groovy @@ -18,10 +18,10 @@ */ package groovy.ui.text -import java.awt.event.ActionEvent -import javax.swing.AbstractAction +import javax.swing.* import javax.swing.text.AttributeSet import javax.swing.text.SimpleAttributeSet +import java.awt.event.ActionEvent class AutoIndentAction extends AbstractAction { AttributeSet simpleAttributeSet = new SimpleAttributeSet() http://git-wip-us.apache.org/repos/asf/groovy/blob/9e823116/subprojects/groovy-console/src/main/groovy/groovy/ui/text/FindReplaceUtility.java ---------------------------------------------------------------------- diff --git a/subprojects/groovy-console/src/main/groovy/groovy/ui/text/FindReplaceUtility.java b/subprojects/groovy-console/src/main/groovy/groovy/ui/text/FindReplaceUtility.java index 4f86d90..1a6273f 100644 --- a/subprojects/groovy-console/src/main/groovy/groovy/ui/text/FindReplaceUtility.java +++ b/subprojects/groovy-console/src/main/groovy/groovy/ui/text/FindReplaceUtility.java @@ -18,11 +18,14 @@ */ package groovy.ui.text; -import java.awt.BorderLayout; -import java.awt.Dimension; -import java.awt.FlowLayout; -import java.awt.GridLayout; - +import javax.swing.*; +import javax.swing.event.EventListenerList; +import javax.swing.text.AttributeSet; +import javax.swing.text.BadLocationException; +import javax.swing.text.Document; +import javax.swing.text.JTextComponent; +import javax.swing.text.Segment; +import java.awt.*; import java.awt.event.ActionEvent; import java.awt.event.FocusAdapter; import java.awt.event.FocusEvent; @@ -30,29 +33,8 @@ import java.awt.event.KeyAdapter; import java.awt.event.KeyEvent; import java.awt.event.TextEvent; import java.awt.event.TextListener; - import java.util.EventListener; -import javax.swing.Action; -import javax.swing.AbstractAction; -import javax.swing.BoxLayout; -import javax.swing.JButton; -import javax.swing.JCheckBox; -import javax.swing.JComboBox; -import javax.swing.JDialog; -import javax.swing.JLabel; -import javax.swing.JPanel; -import javax.swing.JRootPane; -import javax.swing.KeyStroke; - -import javax.swing.event.EventListenerList; - -import javax.swing.text.AttributeSet; -import javax.swing.text.BadLocationException; -import javax.swing.text.Document; -import javax.swing.text.JTextComponent; -import javax.swing.text.Segment; - /** * @author Evan "Hippy" Slatis */ http://git-wip-us.apache.org/repos/asf/groovy/blob/9e823116/subprojects/groovy-console/src/main/groovy/groovy/ui/text/GroovyFilter.java ---------------------------------------------------------------------- diff --git a/subprojects/groovy-console/src/main/groovy/groovy/ui/text/GroovyFilter.java b/subprojects/groovy-console/src/main/groovy/groovy/ui/text/GroovyFilter.java index 96e1eb3..6eaa9e9 100644 --- a/subprojects/groovy-console/src/main/groovy/groovy/ui/text/GroovyFilter.java +++ b/subprojects/groovy-console/src/main/groovy/groovy/ui/text/GroovyFilter.java @@ -18,15 +18,7 @@ */ package groovy.ui.text; -import java.awt.Color; - -import java.awt.event.ActionEvent; -import java.awt.event.KeyEvent; - -import javax.swing.AbstractAction; -import javax.swing.Action; -import javax.swing.KeyStroke; - +import javax.swing.*; import javax.swing.text.BadLocationException; import javax.swing.text.DefaultStyledDocument; import javax.swing.text.Element; @@ -34,8 +26,11 @@ import javax.swing.text.JTextComponent; import javax.swing.text.Segment; import javax.swing.text.Style; import javax.swing.text.StyleConstants; -import javax.swing.text.StyledDocument; import javax.swing.text.StyleContext; +import javax.swing.text.StyledDocument; +import java.awt.*; +import java.awt.event.ActionEvent; +import java.awt.event.KeyEvent; /** http://git-wip-us.apache.org/repos/asf/groovy/blob/9e823116/subprojects/groovy-console/src/main/groovy/groovy/ui/text/StructuredSyntaxResources.java ---------------------------------------------------------------------- diff --git a/subprojects/groovy-console/src/main/groovy/groovy/ui/text/StructuredSyntaxResources.java b/subprojects/groovy-console/src/main/groovy/groovy/ui/text/StructuredSyntaxResources.java index 7e48cd1..1fa1792 100644 --- a/subprojects/groovy-console/src/main/groovy/groovy/ui/text/StructuredSyntaxResources.java +++ b/subprojects/groovy-console/src/main/groovy/groovy/ui/text/StructuredSyntaxResources.java @@ -18,9 +18,7 @@ */ package groovy.ui.text; -import java.awt.Font; -import java.awt.Toolkit; - +import java.awt.*; import java.awt.datatransfer.Clipboard; /** http://git-wip-us.apache.org/repos/asf/groovy/blob/9e823116/subprojects/groovy-console/src/main/groovy/groovy/ui/text/TextEditor.java ---------------------------------------------------------------------- diff --git a/subprojects/groovy-console/src/main/groovy/groovy/ui/text/TextEditor.java b/subprojects/groovy-console/src/main/groovy/groovy/ui/text/TextEditor.java index 36715c5..68ed413 100644 --- a/subprojects/groovy-console/src/main/groovy/groovy/ui/text/TextEditor.java +++ b/subprojects/groovy-console/src/main/groovy/groovy/ui/text/TextEditor.java @@ -18,51 +18,30 @@ */ package groovy.ui.text; -import java.awt.Color; -import java.awt.Component; -import java.awt.Cursor; -import java.awt.Dimension; -import java.awt.Font; -import java.awt.FontMetrics; -import java.awt.Graphics; -import java.awt.Graphics2D; -import java.awt.Rectangle; - +import javax.swing.*; +import javax.swing.plaf.ComponentUI; +import javax.swing.text.BadLocationException; +import javax.swing.text.Caret; +import javax.swing.text.DefaultCaret; +import javax.swing.text.DefaultEditorKit; +import javax.swing.text.Document; +import javax.swing.text.Element; +import javax.swing.text.JTextComponent; +import javax.swing.text.Utilities; +import java.awt.*; import java.awt.event.ActionEvent; import java.awt.event.KeyEvent; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; - -import java.awt.print.Pageable; import java.awt.print.PageFormat; +import java.awt.print.Pageable; import java.awt.print.Paper; import java.awt.print.Printable; import java.awt.print.PrinterException; import java.awt.print.PrinterJob; - import java.util.Calendar; - import java.util.regex.Pattern; -import javax.swing.Action; -import javax.swing.AbstractAction; -import javax.swing.ActionMap; -import javax.swing.InputMap; -import javax.swing.JTextPane; -import javax.swing.KeyStroke; -import javax.swing.SwingUtilities; - -import javax.swing.plaf.ComponentUI; - -import javax.swing.text.Caret; -import javax.swing.text.BadLocationException; -import javax.swing.text.DefaultCaret; -import javax.swing.text.DefaultEditorKit; -import javax.swing.text.Document; -import javax.swing.text.Element; -import javax.swing.text.JTextComponent; -import javax.swing.text.Utilities; - /** * A simple text pane that is printable and wrapping is optional. * http://git-wip-us.apache.org/repos/asf/groovy/blob/9e823116/subprojects/groovy-console/src/main/groovy/groovy/ui/text/TextUndoManager.java ---------------------------------------------------------------------- diff --git a/subprojects/groovy-console/src/main/groovy/groovy/ui/text/TextUndoManager.java b/subprojects/groovy-console/src/main/groovy/groovy/ui/text/TextUndoManager.java index 72bf5d3..0490948 100644 --- a/subprojects/groovy-console/src/main/groovy/groovy/ui/text/TextUndoManager.java +++ b/subprojects/groovy-console/src/main/groovy/groovy/ui/text/TextUndoManager.java @@ -18,13 +18,12 @@ */ package groovy.ui.text; -import java.beans.PropertyChangeListener; - import javax.swing.event.SwingPropertyChangeSupport; import javax.swing.event.UndoableEditEvent; import javax.swing.undo.CompoundEdit; import javax.swing.undo.UndoManager; import javax.swing.undo.UndoableEdit; +import java.beans.PropertyChangeListener; /** * To use this, simply drop this as an UndoableEditListener into your document, http://git-wip-us.apache.org/repos/asf/groovy/blob/9e823116/subprojects/groovy-console/src/main/groovy/groovy/ui/view/BasicContentPane.groovy ---------------------------------------------------------------------- diff --git a/subprojects/groovy-console/src/main/groovy/groovy/ui/view/BasicContentPane.groovy b/subprojects/groovy-console/src/main/groovy/groovy/ui/view/BasicContentPane.groovy index 32e819e..ce5026e 100644 --- a/subprojects/groovy-console/src/main/groovy/groovy/ui/view/BasicContentPane.groovy +++ b/subprojects/groovy-console/src/main/groovy/groovy/ui/view/BasicContentPane.groovy @@ -18,18 +18,19 @@ */ package groovy.ui.view -import groovy.ui.ConsoleTextEditor import groovy.ui.Console -import java.awt.* -import java.awt.image.BufferedImage -import static javax.swing.JSplitPane.VERTICAL_SPLIT +import groovy.ui.ConsoleTextEditor + +import javax.swing.* import javax.swing.text.Style +import javax.swing.text.StyleConstants import javax.swing.text.StyleContext import javax.swing.text.StyledDocument +import java.awt.* +import java.awt.image.BufferedImage import java.util.prefs.Preferences -import javax.swing.text.StyleConstants -import javax.swing.WindowConstants -import javax.swing.JSplitPane + +import static javax.swing.JSplitPane.VERTICAL_SPLIT def prefs = Preferences.userNodeForPackage(Console) def detachedOutputFlag = prefs.getBoolean('detachedOutput', false) http://git-wip-us.apache.org/repos/asf/groovy/blob/9e823116/subprojects/groovy-console/src/main/groovy/groovy/ui/view/BasicMenuBar.groovy ---------------------------------------------------------------------- diff --git a/subprojects/groovy-console/src/main/groovy/groovy/ui/view/BasicMenuBar.groovy b/subprojects/groovy-console/src/main/groovy/groovy/ui/view/BasicMenuBar.groovy index ea84739..6214c04 100644 --- a/subprojects/groovy-console/src/main/groovy/groovy/ui/view/BasicMenuBar.groovy +++ b/subprojects/groovy-console/src/main/groovy/groovy/ui/view/BasicMenuBar.groovy @@ -18,10 +18,6 @@ */ package groovy.ui.view -import java.awt.MenuItem; - -import groovy.swing.factory.SeparatorFactory; - menuBar { menu(text: 'File', mnemonic: 'F') { menuItem(newFileAction) http://git-wip-us.apache.org/repos/asf/groovy/blob/9e823116/subprojects/groovy-console/src/main/groovy/groovy/ui/view/BasicStatusBar.groovy ---------------------------------------------------------------------- diff --git a/subprojects/groovy-console/src/main/groovy/groovy/ui/view/BasicStatusBar.groovy b/subprojects/groovy-console/src/main/groovy/groovy/ui/view/BasicStatusBar.groovy index d3f95b2..02048f1 100644 --- a/subprojects/groovy-console/src/main/groovy/groovy/ui/view/BasicStatusBar.groovy +++ b/subprojects/groovy-console/src/main/groovy/groovy/ui/view/BasicStatusBar.groovy @@ -18,9 +18,8 @@ */ package groovy.ui.view -import java.awt.BorderLayout -import java.awt.GridBagConstraints -import javax.swing.SwingConstants +import javax.swing.* +import java.awt.* statusPanel = panel(constraints: BorderLayout.SOUTH) { gridBagLayout() http://git-wip-us.apache.org/repos/asf/groovy/blob/9e823116/subprojects/groovy-console/src/main/groovy/groovy/ui/view/BasicToolBar.groovy ---------------------------------------------------------------------- diff --git a/subprojects/groovy-console/src/main/groovy/groovy/ui/view/BasicToolBar.groovy b/subprojects/groovy-console/src/main/groovy/groovy/ui/view/BasicToolBar.groovy index daef47e..849ca16 100644 --- a/subprojects/groovy-console/src/main/groovy/groovy/ui/view/BasicToolBar.groovy +++ b/subprojects/groovy-console/src/main/groovy/groovy/ui/view/BasicToolBar.groovy @@ -18,8 +18,8 @@ */ package groovy.ui.view -import javax.swing.SwingConstants -import java.awt.BorderLayout +import javax.swing.* +import java.awt.* toolbar = toolBar(rollover:true, visible:controller.showToolbar, constraints:BorderLayout.NORTH) { button(newFileAction, text:null) http://git-wip-us.apache.org/repos/asf/groovy/blob/9e823116/subprojects/groovy-console/src/main/groovy/groovy/ui/view/Defaults.groovy ---------------------------------------------------------------------- diff --git a/subprojects/groovy-console/src/main/groovy/groovy/ui/view/Defaults.groovy b/subprojects/groovy-console/src/main/groovy/groovy/ui/view/Defaults.groovy index 250230d..254454a 100644 --- a/subprojects/groovy-console/src/main/groovy/groovy/ui/view/Defaults.groovy +++ b/subprojects/groovy-console/src/main/groovy/groovy/ui/view/Defaults.groovy @@ -19,9 +19,10 @@ package groovy.ui.view import groovy.ui.text.GroovyFilter -import java.awt.Color + import javax.swing.text.StyleConstants import javax.swing.text.StyleContext +import java.awt.* import java.util.prefs.Preferences menuBarClass = groovy.ui.view.BasicMenuBar http://git-wip-us.apache.org/repos/asf/groovy/blob/9e823116/subprojects/groovy-console/src/main/groovy/groovy/ui/view/GTKDefaults.groovy ---------------------------------------------------------------------- diff --git a/subprojects/groovy-console/src/main/groovy/groovy/ui/view/GTKDefaults.groovy b/subprojects/groovy-console/src/main/groovy/groovy/ui/view/GTKDefaults.groovy index 8e16590..59017b7 100644 --- a/subprojects/groovy-console/src/main/groovy/groovy/ui/view/GTKDefaults.groovy +++ b/subprojects/groovy-console/src/main/groovy/groovy/ui/view/GTKDefaults.groovy @@ -18,11 +18,8 @@ */ package groovy.ui.view -import javax.swing.JComponent import javax.swing.text.StyleConstants import javax.swing.text.StyleContext -import org.codehaus.groovy.runtime.InvokerHelper - import java.util.prefs.Preferences build(Defaults) http://git-wip-us.apache.org/repos/asf/groovy/blob/9e823116/subprojects/groovy-console/src/main/groovy/groovy/ui/view/MacOSXDefaults.groovy ---------------------------------------------------------------------- diff --git a/subprojects/groovy-console/src/main/groovy/groovy/ui/view/MacOSXDefaults.groovy b/subprojects/groovy-console/src/main/groovy/groovy/ui/view/MacOSXDefaults.groovy index f77e2be..15f50c0 100644 --- a/subprojects/groovy-console/src/main/groovy/groovy/ui/view/MacOSXDefaults.groovy +++ b/subprojects/groovy-console/src/main/groovy/groovy/ui/view/MacOSXDefaults.groovy @@ -19,8 +19,9 @@ package groovy.ui.view import groovy.ui.text.GroovyFilter -import java.awt.Color + import javax.swing.text.StyleConstants +import java.awt.* import java.util.prefs.Preferences build(Defaults) http://git-wip-us.apache.org/repos/asf/groovy/blob/9e823116/subprojects/groovy-console/src/main/groovy/groovy/ui/view/WindowsDefaults.groovy ---------------------------------------------------------------------- diff --git a/subprojects/groovy-console/src/main/groovy/groovy/ui/view/WindowsDefaults.groovy b/subprojects/groovy-console/src/main/groovy/groovy/ui/view/WindowsDefaults.groovy index 11efa49..14ebcd3 100644 --- a/subprojects/groovy-console/src/main/groovy/groovy/ui/view/WindowsDefaults.groovy +++ b/subprojects/groovy-console/src/main/groovy/groovy/ui/view/WindowsDefaults.groovy @@ -18,11 +18,8 @@ */ package groovy.ui.view -import javax.swing.JComponent import javax.swing.text.StyleConstants import javax.swing.text.StyleContext -import org.codehaus.groovy.runtime.InvokerHelper - import java.util.prefs.Preferences build(Defaults) http://git-wip-us.apache.org/repos/asf/groovy/blob/9e823116/subprojects/groovy-groovydoc/src/main/groovy/org/codehaus/groovy/tools/groovydoc/Main.groovy ---------------------------------------------------------------------- diff --git a/subprojects/groovy-groovydoc/src/main/groovy/org/codehaus/groovy/tools/groovydoc/Main.groovy b/subprojects/groovy-groovydoc/src/main/groovy/org/codehaus/groovy/tools/groovydoc/Main.groovy index 24b9276..8266b83 100644 --- a/subprojects/groovy-groovydoc/src/main/groovy/org/codehaus/groovy/tools/groovydoc/Main.groovy +++ b/subprojects/groovy-groovydoc/src/main/groovy/org/codehaus/groovy/tools/groovydoc/Main.groovy @@ -18,11 +18,11 @@ */ package org.codehaus.groovy.tools.groovydoc +import groovy.io.FileType +import org.codehaus.groovy.tools.groovydoc.gstringTemplates.GroovyDocTemplateInfo +import org.codehaus.groovy.tools.shell.IO import org.codehaus.groovy.tools.shell.util.Logger import org.codehaus.groovy.tools.shell.util.MessageSource -import org.codehaus.groovy.tools.shell.IO -import org.codehaus.groovy.tools.groovydoc.gstringTemplates.GroovyDocTemplateInfo -import groovy.io.FileType /** * Main CLI entry-point for groovydoc. http://git-wip-us.apache.org/repos/asf/groovy/blob/9e823116/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/ClasspathResourceManager.java ---------------------------------------------------------------------- diff --git a/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/ClasspathResourceManager.java b/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/ClasspathResourceManager.java index e3d9213..a673f9a 100644 --- a/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/ClasspathResourceManager.java +++ b/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/ClasspathResourceManager.java @@ -18,10 +18,11 @@ */ package org.codehaus.groovy.tools.groovydoc; +import org.codehaus.groovy.runtime.IOGroovyMethods; + import java.io.IOException; import java.io.InputStream; import java.io.Reader; -import org.codehaus.groovy.runtime.IOGroovyMethods; public class ClasspathResourceManager implements ResourceManager { ClassLoader classLoader; http://git-wip-us.apache.org/repos/asf/groovy/blob/9e823116/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/ExternalGroovyClassDoc.java ---------------------------------------------------------------------- diff --git a/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/ExternalGroovyClassDoc.java b/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/ExternalGroovyClassDoc.java index 0620404..d4611f7 100644 --- a/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/ExternalGroovyClassDoc.java +++ b/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/ExternalGroovyClassDoc.java @@ -18,7 +18,13 @@ */ package org.codehaus.groovy.tools.groovydoc; -import org.codehaus.groovy.groovydoc.*; +import org.codehaus.groovy.groovydoc.GroovyAnnotationRef; +import org.codehaus.groovy.groovydoc.GroovyClassDoc; +import org.codehaus.groovy.groovydoc.GroovyConstructorDoc; +import org.codehaus.groovy.groovydoc.GroovyFieldDoc; +import org.codehaus.groovy.groovydoc.GroovyMethodDoc; +import org.codehaus.groovy.groovydoc.GroovyPackageDoc; +import org.codehaus.groovy.groovydoc.GroovyType; import java.util.ArrayList; import java.util.List; http://git-wip-us.apache.org/repos/asf/groovy/blob/9e823116/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/GroovyDocWriter.java ---------------------------------------------------------------------- diff --git a/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/GroovyDocWriter.java b/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/GroovyDocWriter.java index d18955b..ee3cdf2 100644 --- a/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/GroovyDocWriter.java +++ b/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/GroovyDocWriter.java @@ -18,15 +18,15 @@ */ package org.codehaus.groovy.tools.groovydoc; -import java.io.File; -import java.util.Iterator; -import java.util.Properties; - import org.codehaus.groovy.groovydoc.GroovyClassDoc; import org.codehaus.groovy.groovydoc.GroovyPackageDoc; import org.codehaus.groovy.groovydoc.GroovyRootDoc; import org.codehaus.groovy.tools.shell.util.Logger; +import java.io.File; +import java.util.Iterator; +import java.util.Properties; + /** * Write GroovyDoc resources to destination. */ http://git-wip-us.apache.org/repos/asf/groovy/blob/9e823116/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/GroovyRootDocBuilder.java ---------------------------------------------------------------------- diff --git a/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/GroovyRootDocBuilder.java b/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/GroovyRootDocBuilder.java index 28aeee4..c5664e5 100644 --- a/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/GroovyRootDocBuilder.java +++ b/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/GroovyRootDocBuilder.java @@ -41,12 +41,16 @@ import org.codehaus.groovy.tools.shell.util.Logger; import java.io.File; import java.io.IOException; import java.io.StringReader; -import java.util.*; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Properties; import java.util.regex.Pattern; +import static org.codehaus.groovy.tools.groovydoc.SimpleGroovyClassDoc.CODE_REGEX; import static org.codehaus.groovy.tools.groovydoc.SimpleGroovyClassDoc.LINK_REGEX; import static org.codehaus.groovy.tools.groovydoc.SimpleGroovyClassDoc.TAG_REGEX; -import static org.codehaus.groovy.tools.groovydoc.SimpleGroovyClassDoc.CODE_REGEX; /* * todo: order methods alphabetically (implement compareTo enough?) http://git-wip-us.apache.org/repos/asf/groovy/blob/9e823116/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyClassDoc.java ---------------------------------------------------------------------- diff --git a/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyClassDoc.java b/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyClassDoc.java index f81f08e..a7c8687 100644 --- a/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyClassDoc.java +++ b/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyClassDoc.java @@ -18,10 +18,27 @@ */ package org.codehaus.groovy.tools.groovydoc; -import org.codehaus.groovy.groovydoc.*; +import org.codehaus.groovy.groovydoc.GroovyAnnotationRef; +import org.codehaus.groovy.groovydoc.GroovyClassDoc; +import org.codehaus.groovy.groovydoc.GroovyConstructorDoc; +import org.codehaus.groovy.groovydoc.GroovyFieldDoc; +import org.codehaus.groovy.groovydoc.GroovyMethodDoc; +import org.codehaus.groovy.groovydoc.GroovyPackageDoc; +import org.codehaus.groovy.groovydoc.GroovyParameter; +import org.codehaus.groovy.groovydoc.GroovyRootDoc; +import org.codehaus.groovy.groovydoc.GroovyType; import org.codehaus.groovy.runtime.DefaultGroovyMethods; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.LinkedHashMap; +import java.util.LinkedHashSet; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.StringTokenizer; import java.util.regex.Matcher; import java.util.regex.Pattern; http://git-wip-us.apache.org/repos/asf/groovy/blob/9e823116/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyClassDocAssembler.java ---------------------------------------------------------------------- diff --git a/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyClassDocAssembler.java b/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyClassDocAssembler.java index 3836dc4..7d7855e 100644 --- a/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyClassDocAssembler.java +++ b/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyClassDocAssembler.java @@ -25,7 +25,12 @@ import org.codehaus.groovy.antlr.SourceBuffer; import org.codehaus.groovy.antlr.parser.GroovyTokenTypes; import org.codehaus.groovy.antlr.treewalker.VisitorAdapter; import org.codehaus.groovy.control.ResolveVisitor; -import org.codehaus.groovy.groovydoc.*; +import org.codehaus.groovy.groovydoc.GroovyAnnotationRef; +import org.codehaus.groovy.groovydoc.GroovyClassDoc; +import org.codehaus.groovy.groovydoc.GroovyConstructorDoc; +import org.codehaus.groovy.groovydoc.GroovyFieldDoc; +import org.codehaus.groovy.groovydoc.GroovyMethodDoc; +import org.codehaus.groovy.groovydoc.GroovyType; import org.codehaus.groovy.runtime.DefaultGroovyMethods; import java.util.ArrayList; http://git-wip-us.apache.org/repos/asf/groovy/blob/9e823116/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyConstructorDoc.java ---------------------------------------------------------------------- diff --git a/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyConstructorDoc.java b/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyConstructorDoc.java index 003cb67..b781407 100644 --- a/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyConstructorDoc.java +++ b/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyConstructorDoc.java @@ -18,7 +18,8 @@ */ package org.codehaus.groovy.tools.groovydoc; -import org.codehaus.groovy.groovydoc.*; +import org.codehaus.groovy.groovydoc.GroovyClassDoc; +import org.codehaus.groovy.groovydoc.GroovyConstructorDoc; public class SimpleGroovyConstructorDoc extends SimpleGroovyExecutableMemberDoc implements GroovyConstructorDoc { public SimpleGroovyConstructorDoc(String name, GroovyClassDoc belongsToClass) { http://git-wip-us.apache.org/repos/asf/groovy/blob/9e823116/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyDoc.java ---------------------------------------------------------------------- diff --git a/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyDoc.java b/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyDoc.java index 6e9abd5..f87c7cd 100644 --- a/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyDoc.java +++ b/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyDoc.java @@ -23,7 +23,9 @@ import org.codehaus.groovy.groovydoc.GroovyDoc; import org.codehaus.groovy.groovydoc.GroovyTag; import java.text.BreakIterator; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Locale; import java.util.regex.Matcher; import java.util.regex.Pattern; http://git-wip-us.apache.org/repos/asf/groovy/blob/9e823116/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyExecutableMemberDoc.java ---------------------------------------------------------------------- diff --git a/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyExecutableMemberDoc.java b/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyExecutableMemberDoc.java index 5e621c0..53219c1 100644 --- a/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyExecutableMemberDoc.java +++ b/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyExecutableMemberDoc.java @@ -18,9 +18,13 @@ */ package org.codehaus.groovy.tools.groovydoc; -import java.util.*; +import org.codehaus.groovy.groovydoc.GroovyClassDoc; +import org.codehaus.groovy.groovydoc.GroovyExecutableMemberDoc; +import org.codehaus.groovy.groovydoc.GroovyParameter; +import org.codehaus.groovy.groovydoc.GroovyType; -import org.codehaus.groovy.groovydoc.*; +import java.util.ArrayList; +import java.util.List; public class SimpleGroovyExecutableMemberDoc extends SimpleGroovyMemberDoc implements GroovyExecutableMemberDoc { List parameters; http://git-wip-us.apache.org/repos/asf/groovy/blob/9e823116/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyFieldDoc.java ---------------------------------------------------------------------- diff --git a/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyFieldDoc.java b/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyFieldDoc.java index b213cb8..4f02eb5 100644 --- a/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyFieldDoc.java +++ b/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyFieldDoc.java @@ -18,9 +18,9 @@ */ package org.codehaus.groovy.tools.groovydoc; +import org.codehaus.groovy.groovydoc.GroovyClassDoc; import org.codehaus.groovy.groovydoc.GroovyFieldDoc; import org.codehaus.groovy.groovydoc.GroovyType; -import org.codehaus.groovy.groovydoc.GroovyClassDoc; public class SimpleGroovyFieldDoc extends SimpleGroovyMemberDoc implements GroovyFieldDoc { private GroovyType type; http://git-wip-us.apache.org/repos/asf/groovy/blob/9e823116/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyMemberDoc.java ---------------------------------------------------------------------- diff --git a/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyMemberDoc.java b/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyMemberDoc.java index da244a2..e05b6c5 100644 --- a/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyMemberDoc.java +++ b/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyMemberDoc.java @@ -18,7 +18,8 @@ */ package org.codehaus.groovy.tools.groovydoc; -import org.codehaus.groovy.groovydoc.*; +import org.codehaus.groovy.groovydoc.GroovyClassDoc; +import org.codehaus.groovy.groovydoc.GroovyMemberDoc; public class SimpleGroovyMemberDoc extends SimpleGroovyAbstractableElementDoc implements GroovyMemberDoc { protected GroovyClassDoc belongsToClass; http://git-wip-us.apache.org/repos/asf/groovy/blob/9e823116/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyMethodDoc.java ---------------------------------------------------------------------- diff --git a/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyMethodDoc.java b/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyMethodDoc.java index 60cbbc5..19db0c7 100644 --- a/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyMethodDoc.java +++ b/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyMethodDoc.java @@ -18,7 +18,9 @@ */ package org.codehaus.groovy.tools.groovydoc; -import org.codehaus.groovy.groovydoc.*; +import org.codehaus.groovy.groovydoc.GroovyClassDoc; +import org.codehaus.groovy.groovydoc.GroovyMethodDoc; +import org.codehaus.groovy.groovydoc.GroovyType; public class SimpleGroovyMethodDoc extends SimpleGroovyExecutableMemberDoc implements GroovyMethodDoc { private GroovyType returnType; http://git-wip-us.apache.org/repos/asf/groovy/blob/9e823116/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyParameter.java ---------------------------------------------------------------------- diff --git a/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyParameter.java b/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyParameter.java index 56bf450..947d48c 100644 --- a/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyParameter.java +++ b/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyParameter.java @@ -18,10 +18,12 @@ */ package org.codehaus.groovy.tools.groovydoc; -import org.codehaus.groovy.groovydoc.*; +import org.codehaus.groovy.groovydoc.GroovyAnnotationRef; +import org.codehaus.groovy.groovydoc.GroovyParameter; +import org.codehaus.groovy.groovydoc.GroovyType; -import java.util.List; import java.util.ArrayList; +import java.util.List; public class SimpleGroovyParameter implements GroovyParameter { private final String name; http://git-wip-us.apache.org/repos/asf/groovy/blob/9e823116/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/Groovysh.groovy ---------------------------------------------------------------------- diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/Groovysh.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/Groovysh.groovy index ee805ab..71950dd 100644 --- a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/Groovysh.groovy +++ b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/Groovysh.groovy @@ -32,9 +32,14 @@ import org.codehaus.groovy.runtime.InvokerHelper import org.codehaus.groovy.runtime.StackTraceUtils import org.codehaus.groovy.tools.shell.commands.LoadCommand import org.codehaus.groovy.tools.shell.commands.RecordCommand -import org.codehaus.groovy.tools.shell.util.* +import org.codehaus.groovy.tools.shell.util.CurlyCountingGroovyLexer +import org.codehaus.groovy.tools.shell.util.DefaultCommandsRegistrar +import org.codehaus.groovy.tools.shell.util.MessageSource import org.codehaus.groovy.tools.shell.util.PackageHelper +import org.codehaus.groovy.tools.shell.util.PackageHelperImpl +import org.codehaus.groovy.tools.shell.util.Preferences import org.codehaus.groovy.tools.shell.util.ScriptVariableAnalyzer +import org.codehaus.groovy.tools.shell.util.XmlCommandRegistrar import org.fusesource.jansi.AnsiRenderer import java.util.regex.Pattern http://git-wip-us.apache.org/repos/asf/groovy/blob/9e823116/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/InteractiveShellRunner.groovy ---------------------------------------------------------------------- diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/InteractiveShellRunner.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/InteractiveShellRunner.groovy index 3164bc3..599c63f 100644 --- a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/InteractiveShellRunner.groovy +++ b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/InteractiveShellRunner.groovy @@ -23,7 +23,13 @@ import jline.console.completer.AggregateCompleter import jline.console.completer.CandidateListCompletionHandler import jline.console.completer.CompletionHandler import jline.console.history.FileHistory -import org.codehaus.groovy.tools.shell.completion.* +import org.codehaus.groovy.tools.shell.completion.CustomClassSyntaxCompletor +import org.codehaus.groovy.tools.shell.completion.FileNameCompleter +import org.codehaus.groovy.tools.shell.completion.GroovySyntaxCompletor +import org.codehaus.groovy.tools.shell.completion.ImportsSyntaxCompletor +import org.codehaus.groovy.tools.shell.completion.KeywordSyntaxCompletor +import org.codehaus.groovy.tools.shell.completion.ReflectionCompletor +import org.codehaus.groovy.tools.shell.completion.VariableSyntaxCompletor import org.codehaus.groovy.tools.shell.util.Logger import org.codehaus.groovy.tools.shell.util.Preferences import org.codehaus.groovy.tools.shell.util.WrappedInputStream http://git-wip-us.apache.org/repos/asf/groovy/blob/9e823116/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/Interpreter.groovy ---------------------------------------------------------------------- diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/Interpreter.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/Interpreter.groovy index c9a4831..316dab3 100644 --- a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/Interpreter.groovy +++ b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/Interpreter.groovy @@ -20,8 +20,9 @@ package org.codehaus.groovy.tools.shell import org.codehaus.groovy.control.CompilerConfiguration import org.codehaus.groovy.runtime.InvokerHelper -import org.codehaus.groovy.tools.shell.util.Logger import org.codehaus.groovy.runtime.MethodClosure +import org.codehaus.groovy.tools.shell.util.Logger + import java.lang.reflect.Method /** http://git-wip-us.apache.org/repos/asf/groovy/blob/9e823116/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/Parser.groovy ---------------------------------------------------------------------- diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/Parser.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/Parser.groovy index ecb8477..f6dcc99 100644 --- a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/Parser.groovy +++ b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/Parser.groovy @@ -18,21 +18,20 @@ */ package org.codehaus.groovy.tools.shell -import org.codehaus.groovy.control.SourceUnit -import org.codehaus.groovy.control.CompilationFailedException -import org.codehaus.groovy.tools.shell.util.Logger -import org.codehaus.groovy.tools.shell.util.Preferences +import antlr.RecognitionException +import antlr.TokenStreamException +import antlr.collections.AST import org.codehaus.groovy.antlr.SourceBuffer import org.codehaus.groovy.antlr.UnicodeEscapingReader import org.codehaus.groovy.antlr.parser.GroovyLexer import org.codehaus.groovy.antlr.parser.GroovyRecognizer -import antlr.collections.AST -import antlr.RecognitionException -import antlr.TokenStreamException +import org.codehaus.groovy.control.CompilationFailedException +import org.codehaus.groovy.control.SourceUnit +import org.codehaus.groovy.tools.shell.util.Logger +import org.codehaus.groovy.tools.shell.util.Preferences import java.util.regex.Pattern - interface Parsing { ParseStatus parse(final Collection buffer) } http://git-wip-us.apache.org/repos/asf/groovy/blob/9e823116/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/DocCommand.groovy ---------------------------------------------------------------------- diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/DocCommand.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/DocCommand.groovy index 40dadbf..9a8a48f 100644 --- a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/DocCommand.groovy +++ b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/DocCommand.groovy @@ -19,7 +19,6 @@ package org.codehaus.groovy.tools.shell.commands import jline.console.completer.Completer - import org.codehaus.groovy.tools.shell.CommandSupport import org.codehaus.groovy.tools.shell.Groovysh http://git-wip-us.apache.org/repos/asf/groovy/blob/9e823116/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/ExitCommand.groovy ---------------------------------------------------------------------- diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/ExitCommand.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/ExitCommand.groovy index 4cd8bb6..194284e 100644 --- a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/ExitCommand.groovy +++ b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/ExitCommand.groovy @@ -19,8 +19,8 @@ package org.codehaus.groovy.tools.shell.commands import org.codehaus.groovy.tools.shell.CommandSupport -import org.codehaus.groovy.tools.shell.Groovysh import org.codehaus.groovy.tools.shell.ExitNotification +import org.codehaus.groovy.tools.shell.Groovysh /** * The 'exit' command. http://git-wip-us.apache.org/repos/asf/groovy/blob/9e823116/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/GrabCommand.groovy ---------------------------------------------------------------------- diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/GrabCommand.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/GrabCommand.groovy index 765438f..53cc20c 100644 --- a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/GrabCommand.groovy +++ b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/GrabCommand.groovy @@ -19,13 +19,9 @@ package org.codehaus.groovy.tools.shell.commands import groovy.grape.Grape -import jline.console.completer.Completer; - -import org.codehaus.groovy.tools.shell.CommandSupport - -import java.util.List; - +import jline.console.completer.Completer import org.codehaus.groovy.tools.GrapeUtil +import org.codehaus.groovy.tools.shell.CommandSupport import org.codehaus.groovy.tools.shell.Groovysh /** http://git-wip-us.apache.org/repos/asf/groovy/blob/9e823116/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/HelpCommand.groovy ---------------------------------------------------------------------- diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/HelpCommand.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/HelpCommand.groovy index e98814d..4e13adc 100644 --- a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/HelpCommand.groovy +++ b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/HelpCommand.groovy @@ -19,8 +19,8 @@ package org.codehaus.groovy.tools.shell.commands import jline.console.completer.Completer -import org.codehaus.groovy.tools.shell.CommandSupport import org.codehaus.groovy.tools.shell.Command +import org.codehaus.groovy.tools.shell.CommandSupport import org.codehaus.groovy.tools.shell.Groovysh import org.codehaus.groovy.tools.shell.completion.CommandNameCompleter http://git-wip-us.apache.org/repos/asf/groovy/blob/9e823116/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/InspectCommand.groovy ---------------------------------------------------------------------- diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/InspectCommand.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/InspectCommand.groovy index f7f7cff..6c917dd 100644 --- a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/InspectCommand.groovy +++ b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/InspectCommand.groovy @@ -20,14 +20,14 @@ package org.codehaus.groovy.tools.shell.commands import groovy.inspect.swingui.ObjectBrowser import jline.console.completer.Completer -import org.codehaus.groovy.tools.shell.Groovysh - -import java.awt.HeadlessException -import javax.swing.UIManager - import org.codehaus.groovy.tools.shell.CommandSupport +import org.codehaus.groovy.tools.shell.Groovysh import org.codehaus.groovy.tools.shell.util.SimpleCompletor +import javax.swing.* +import java.awt.* +import java.util.List + /** * The 'inspect' command. * http://git-wip-us.apache.org/repos/asf/groovy/blob/9e823116/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/RegisterCommand.groovy ---------------------------------------------------------------------- diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/RegisterCommand.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/RegisterCommand.groovy index 784ae74..9aa25be 100644 --- a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/RegisterCommand.groovy +++ b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/RegisterCommand.groovy @@ -18,9 +18,9 @@ */ package org.codehaus.groovy.tools.shell.commands +import org.codehaus.groovy.tools.shell.Command import org.codehaus.groovy.tools.shell.CommandSupport import org.codehaus.groovy.tools.shell.Groovysh -import org.codehaus.groovy.tools.shell.Command /** * The 'register' command. http://git-wip-us.apache.org/repos/asf/groovy/blob/9e823116/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/SetCommand.groovy ---------------------------------------------------------------------- diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/SetCommand.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/SetCommand.groovy index 1a07584..d21e894 100644 --- a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/SetCommand.groovy +++ b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/SetCommand.groovy @@ -22,8 +22,8 @@ import jline.console.completer.Completer import org.codehaus.groovy.tools.shell.CommandSupport import org.codehaus.groovy.tools.shell.Groovysh import org.codehaus.groovy.tools.shell.util.PackageHelper -import org.codehaus.groovy.tools.shell.util.SimpleCompletor import org.codehaus.groovy.tools.shell.util.Preferences +import org.codehaus.groovy.tools.shell.util.SimpleCompletor /** * The 'set' command, used to set preferences. http://git-wip-us.apache.org/repos/asf/groovy/blob/9e823116/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/ShowCommand.groovy ---------------------------------------------------------------------- diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/ShowCommand.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/ShowCommand.groovy index 711d9bb..e526fef 100644 --- a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/ShowCommand.groovy +++ b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/ShowCommand.groovy @@ -20,7 +20,6 @@ package org.codehaus.groovy.tools.shell.commands import org.codehaus.groovy.runtime.InvokerHelper import org.codehaus.groovy.runtime.MethodClosure - import org.codehaus.groovy.tools.shell.ComplexCommandSupport import org.codehaus.groovy.tools.shell.Groovysh import org.codehaus.groovy.tools.shell.util.Preferences