This is an automated email from the ASF dual-hosted git repository. paulk pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/groovy.git
commit eac05bf94b4434fb626b60e670e4d5be44552264 Merge: b519420 ee30797 Author: Paul King <[email protected]> AuthorDate: Wed May 15 14:43:02 2019 +1000 Split history main/groovy/groovy/ui/ to main/groovy/groovy/console/ui - resolve conflict and keep both files .../main/groovy/groovy/console/ui/Console.groovy | 1730 ++++++++++++++++++++ .../groovy/groovy/console/ui/ConsoleActions.groovy | 428 +++++ .../groovy/groovy/console/ui/ConsoleApplet.groovy | 41 + .../groovy/console/ui/ConsoleIvyPlugin.groovy | 64 + .../groovy/console/ui/ConsolePreferences.groovy | 167 ++ .../groovy/groovy/console/ui/ConsoleSupport.java | 90 + .../groovy/console/ui/ConsoleTextEditor.java | 355 ++++ .../groovy/groovy/console/ui/ConsoleView.groovy | 181 ++ .../groovy/groovy/console/ui/HistoryRecord.groovy | 47 + .../groovy/console/ui/OutputTransforms.groovy | 109 ++ .../groovy/console/ui/SystemOutputInterceptor.java | 134 ++ .../src/main/groovy/groovy/console/ui/package.html | 28 + .../groovy/console/ui/text/AutoIndentAction.groovy | 54 + .../groovy/console/ui/text/FindReplaceUtility.java | 543 ++++++ .../groovy/console/ui/text/GroovyFilter.java | 270 +++ .../console/ui/text/MatchingHighlighter.java | 221 +++ .../console/ui/text/SmartDocumentFilter.java | 360 ++++ .../ui/text/StructuredSyntaxDocumentFilter.java | 573 +++++++ .../console/ui/text/StructuredSyntaxHandler.java | 106 ++ .../console/ui/text/StructuredSyntaxResources.java | 80 + .../groovy/groovy/console/ui/text/TextEditor.java | 499 ++++++ .../groovy/console/ui/text/TextUndoManager.java | 200 +++ .../groovy/groovy/console/ui/text/package.html | 28 + .../groovy/console/ui/view/BasicContentPane.groovy | 158 ++ .../groovy/console/ui/view/BasicMenuBar.groovy | 102 ++ .../groovy/console/ui/view/BasicStatusBar.groovy | 34 + .../groovy/console/ui/view/BasicToolBar.groovy | 46 + .../groovy/groovy/console/ui/view/Defaults.groovy | 88 + .../groovy/console/ui/view/GTKDefaults.groovy | 58 + .../groovy/console/ui/view/MacOSXDefaults.groovy | 88 + .../groovy/console/ui/view/MacOSXMenuBar.groovy | 149 ++ .../groovy/console/ui/view/WindowsDefaults.groovy | 35 + 32 files changed, 7066 insertions(+)
