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 d5d07b5 cleanup/remove @author tags as per Apache recommended practices for groovy-ant, groovy-console, groovy-groovydoc d5d07b5 is described below commit d5d07b565d87c9cd42646d906ffac238d4449fb0 Author: Paul King <pa...@asert.com.au> AuthorDate: Thu Dec 27 20:30:06 2018 +1000 cleanup/remove @author tags as per Apache recommended practices for groovy-ant, groovy-console, groovy-groovydoc --- gradle/pomconfigurer.gradle | 8 +- .../main/groovy/groovy/util/FileNameFinder.groovy | 3 - .../src/main/java/groovy/util/AntBuilder.java | 5 - .../groovy/ant/AntProjectPropertiesDelegate.java | 3 - .../codehaus/groovy/ant/CompileTaskSupport.java | 2 - .../java/org/codehaus/groovy/ant/FileIterator.java | 2 - .../java/org/codehaus/groovy/ant/FileScanner.java | 3 - .../groovy/ant/FileSystemCompilerFacade.java | 2 - .../org/codehaus/groovy/ant/GenerateStubsTask.java | 2 - .../java/org/codehaus/groovy/ant/GroovycTask.java | 2 - .../org/codehaus/groovy/ant/LoggingHelper.java | 2 - .../org/codehaus/groovy/ant/RootLoaderRef.java | 1 - .../org/codehaus/groovy/ant/UberCompileTask.java | 25 ++--- .../groovy/org/codehaus/groovy/ant/GroovyTest.java | 2 - .../org/codehaus/groovy/ant/GroovycTest.java | 5 +- .../src/main/groovy/groovy/inspect/TextNode.groovy | 2 - .../groovy/groovy/inspect/TextTreeNodeMaker.groovy | 2 - .../groovy/inspect/swingui/ObjectBrowser.groovy | 123 +++++++++++---------- .../inspect/swingui/ScriptToTreeNodeAdapter.groovy | 3 - .../main/groovy/groovy/ui/ConsoleIvyPlugin.groovy | 3 - .../src/main/groovy/groovy/ui/ConsoleSupport.java | 2 - .../main/groovy/groovy/ui/ConsoleTextEditor.java | 5 - .../groovy/groovy/ui/text/FindReplaceUtility.java | 3 - .../main/groovy/groovy/ui/text/GroovyFilter.java | 4 - .../ui/text/StructuredSyntaxDocumentFilter.java | 4 - .../groovy/ui/text/StructuredSyntaxHandler.java | 3 - .../groovy/ui/text/StructuredSyntaxResources.java | 2 - .../src/main/groovy/groovy/ui/text/TextEditor.java | 2 - .../groovy/groovy/ui/text/TextUndoManager.java | 2 - .../swingui/ScriptToTreeNodeAdapterTest.groovy | 2 - .../ui/HistoryRecordGetTextToRunTests.groovy | 4 - .../groovy/groovy/ui/text/GroovyFilterTests.groovy | 3 - .../groovy/tools/groovydoc/GroovyDocTool.java | 3 - .../groovy-groovydoc/src/spec/doc/groovydoc.adoc | 2 - .../groovy/tools/groovydoc/CustomGroovyDoc.java | 2 - .../groovy/tools/groovydoc/GroovyDocTest.java | 3 - .../tools/groovydoc/GroovyRootDocBuilderTest.java | 3 - .../groovydoc/SimpleGroovyRootDocTests.groovy | 3 - 38 files changed, 80 insertions(+), 172 deletions(-) diff --git a/gradle/pomconfigurer.gradle b/gradle/pomconfigurer.gradle index b4d5d5c..e000950 100644 --- a/gradle/pomconfigurer.gradle +++ b/gradle/pomconfigurer.gradle @@ -449,7 +449,7 @@ project.ext.pomConfigureClosureWithoutTweaks = { name 'Edwin Tellman' } contributor { - name 'Evan A Slatis' + name 'Evan "Hippy" Slatis' } contributor { name 'Mike Dillon' @@ -657,6 +657,12 @@ project.ext.pomConfigureClosureWithoutTweaks = { name 'Tom Nichols' } contributor { + name 'Ingo Hoffmann' + } + contributor { + name 'Sergii Bondarenko' + } + contributor { name 'mgroovy' } contributor { diff --git a/subprojects/groovy-ant/src/main/groovy/groovy/util/FileNameFinder.groovy b/subprojects/groovy-ant/src/main/groovy/groovy/util/FileNameFinder.groovy index 519ccd1..f066f52 100644 --- a/subprojects/groovy-ant/src/main/groovy/groovy/util/FileNameFinder.groovy +++ b/subprojects/groovy-ant/src/main/groovy/groovy/util/FileNameFinder.groovy @@ -21,9 +21,6 @@ package groovy.util /** * Find files according to a base directory and an includes and excludes pattern. * The include and exclude patterns conform to Ant's fileset pattern conventions. - * - * @author Dierk Koenig - * @author Paul King */ class FileNameFinder implements IFileNameFinder { diff --git a/subprojects/groovy-ant/src/main/java/groovy/util/AntBuilder.java b/subprojects/groovy-ant/src/main/java/groovy/util/AntBuilder.java index 92e4f7d..ae176e0 100644 --- a/subprojects/groovy-ant/src/main/java/groovy/util/AntBuilder.java +++ b/subprojects/groovy-ant/src/main/java/groovy/util/AntBuilder.java @@ -61,11 +61,6 @@ import java.util.logging.Logger; * you will need to add one or more additional jars from the ant distribution to * your classpath - see the <a href="http://ant.apache.org/manual/install.html#librarydependencies">library * dependencies</a> for more details. - * - * @author <a href="mailto:ja...@coredevelopers.net">James Strachan</a> - * @author Dierk Koenig (dk) - * @author Marc Guillemot - * @author Paul King */ public class AntBuilder extends BuilderSupport { diff --git a/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/AntProjectPropertiesDelegate.java b/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/AntProjectPropertiesDelegate.java index 034e77d..5b511e6 100644 --- a/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/AntProjectPropertiesDelegate.java +++ b/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/AntProjectPropertiesDelegate.java @@ -26,9 +26,6 @@ import java.util.Hashtable; import java.util.Map; import java.util.Set; -/** - * @author Guillaume Laforge - */ public class AntProjectPropertiesDelegate extends Hashtable { private final Project project; diff --git a/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/CompileTaskSupport.java b/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/CompileTaskSupport.java index e7e9025..ecc8f65 100644 --- a/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/CompileTaskSupport.java +++ b/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/CompileTaskSupport.java @@ -35,8 +35,6 @@ import java.security.PrivilegedAction; /** * Support for compilation related tasks. - * - * @author <a href="mailto:ja...@planet57.com">Jason Dillon</a> */ public abstract class CompileTaskSupport extends MatchingTask diff --git a/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/FileIterator.java b/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/FileIterator.java index 86f726c..46fec99 100644 --- a/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/FileIterator.java +++ b/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/FileIterator.java @@ -29,8 +29,6 @@ import java.util.NoSuchElementException; /** * <p><code>FileIterator</code> is an iterator over a * number of files from a collection of FileSet instances. - * - * @author <a href="mailto:jstrac...@apache.org">James Strachan</a> */ public class FileIterator implements Iterator { diff --git a/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/FileScanner.java b/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/FileScanner.java index ddfb2c1..335e24c 100644 --- a/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/FileScanner.java +++ b/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/FileScanner.java @@ -29,9 +29,6 @@ import java.util.List; /** * <p><code>FileScanner</code> is a bean which allows the iteration * over a number of files from a collection of FileSet instances. - * - * @author <a href="mailto:jstrac...@apache.org">James Strachan</a> - * @author Marc Guillemot */ public class FileScanner extends Task { diff --git a/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/FileSystemCompilerFacade.java b/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/FileSystemCompilerFacade.java index e17a683..88f3041 100644 --- a/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/FileSystemCompilerFacade.java +++ b/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/FileSystemCompilerFacade.java @@ -27,8 +27,6 @@ import java.util.List; /** * This is a helper class, to provide a controlled entry point for the groovyc * ant task forked mode. - * - * @author <a href="mailto:blackd...@gmx.org">Jochen "blackdrag" Theodorou</a> */ public class FileSystemCompilerFacade { private static final String[] EMPTY_STRING_ARRAY = new String[0]; diff --git a/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/GenerateStubsTask.java b/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/GenerateStubsTask.java index f32df10..ae79737 100644 --- a/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/GenerateStubsTask.java +++ b/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/GenerateStubsTask.java @@ -27,8 +27,6 @@ import java.io.File; /** * Generates Java stubs from Groovy sources. - * - * @author <a href="mailto:ja...@planet57.com">Jason Dillon</a> */ public class GenerateStubsTask extends CompileTaskSupport diff --git a/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/GroovycTask.java b/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/GroovycTask.java index eceea41..a02015f 100644 --- a/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/GroovycTask.java +++ b/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/GroovycTask.java @@ -30,8 +30,6 @@ import java.io.File; /** * Compiles Groovy source files. - * - * @author <a href="mailto:ja...@planet57.com">Jason Dillon</a> */ public class GroovycTask extends CompileTaskSupport diff --git a/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/LoggingHelper.java b/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/LoggingHelper.java index bd33609..88016bb 100644 --- a/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/LoggingHelper.java +++ b/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/LoggingHelper.java @@ -23,8 +23,6 @@ import org.apache.tools.ant.Task; /** * Helper to make logging from Ant easier. - * - * @author <a href="mailto:ja...@planet57.com">Jason Dillon</a> */ public class LoggingHelper { private final Task owner; diff --git a/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/RootLoaderRef.java b/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/RootLoaderRef.java index 4afe725..27e7c79 100644 --- a/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/RootLoaderRef.java +++ b/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/RootLoaderRef.java @@ -54,7 +54,6 @@ import org.codehaus.groovy.tools.RootLoader; * with different classloaders are different, so ant would not be able to find the method. * * @see org.codehaus.groovy.tools.RootLoader - * @author Jochen Theodorou */ public class RootLoaderRef extends MatchingTask { private String name; diff --git a/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/UberCompileTask.java b/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/UberCompileTask.java index 8ea1c4c..9c6baba 100644 --- a/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/UberCompileTask.java +++ b/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/UberCompileTask.java @@ -33,16 +33,11 @@ import java.io.IOException; * Compiles Java and Groovy source files. * * This works by invoking the {@link GenerateStubsTask} task, then the - * {@link Javac} task and then the {@link GroovycTask}. Each task can - * be configured by creating a nested element. Common configuration - * such as the source dir and classpath is picked up from this tasks - * configuration. - * - * @author <a href="mailto:ja...@planet57.com">Jason Dillon</a> + * {@link Javac} task and then the {@link GroovycTask}. Each task can be + * configured by creating a nested element. Common configuration such as + * the source dir and classpath is picked up from this tasks configuration. */ -public class UberCompileTask - extends Task -{ +public class UberCompileTask extends Task { private Path src; private File destdir; @@ -215,9 +210,7 @@ public class UberCompileTask // Nested task adapters // - private class GenStubsAdapter - extends GenerateStubsTask - { + private class GenStubsAdapter extends GenerateStubsTask { public FileSet getFileSet() { return super.getImplicitFileSet(); } @@ -227,9 +220,7 @@ public class UberCompileTask } } - private class JavacAdapter - extends Javac - { + private class JavacAdapter extends Javac { public FileSet getFileSet() { return super.getImplicitFileSet(); } @@ -239,9 +230,7 @@ public class UberCompileTask } } - private class GroovycAdapter - extends GroovycTask - { + private class GroovycAdapter extends GroovycTask { public FileSet getFileSet() { return super.getImplicitFileSet(); } diff --git a/subprojects/groovy-ant/src/test/groovy/org/codehaus/groovy/ant/GroovyTest.java b/subprojects/groovy-ant/src/test/groovy/org/codehaus/groovy/ant/GroovyTest.java index 53c0e86..a6a6834 100644 --- a/subprojects/groovy-ant/src/test/groovy/org/codehaus/groovy/ant/GroovyTest.java +++ b/subprojects/groovy-ant/src/test/groovy/org/codehaus/groovy/ant/GroovyTest.java @@ -37,8 +37,6 @@ import java.util.regex.Pattern; * Caution: the *.groovy files used by this test should not get compiled with the rest of the * test classes compilation process otherwise they would be available in the classpath * and the tests here would be meaningless (tested by testClasspath_missing). - * - * @author Marc Guillemot */ public class GroovyTest extends GroovyTestCase { public static String FLAG = null; diff --git a/subprojects/groovy-ant/src/test/groovy/org/codehaus/groovy/ant/GroovycTest.java b/subprojects/groovy-ant/src/test/groovy/org/codehaus/groovy/ant/GroovycTest.java index 70f7b9f..e3d97bb 100644 --- a/subprojects/groovy-ant/src/test/groovy/org/codehaus/groovy/ant/GroovycTest.java +++ b/subprojects/groovy-ant/src/test/groovy/org/codehaus/groovy/ant/GroovycTest.java @@ -31,10 +31,7 @@ import java.util.regex.Pattern; * <p> * NB the *.groovy files in this directory should not get compiled with the rest of the test classes * since that would ruin the whole point of testing compilation by the Ant tasks. In fact it doesn't - * matter as the tests remove all class files that should not pre-exist from this directory at each - * step - * - * @author Russel Winder + * matter as the tests remove all class files that should not pre-exist from this directory at each step. */ public class GroovycTest extends GroovyTestCase { private final String classDirectory = "target/classes/groovy/test/org/codehaus/groovy/ant/"; 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 31b8a02..1179769 100644 --- a/subprojects/groovy-console/src/main/groovy/groovy/inspect/TextNode.groovy +++ b/subprojects/groovy-console/src/main/groovy/groovy/inspect/TextNode.groovy @@ -18,8 +18,6 @@ */ /** * Represents a plain text node for use in the AST tree made by ASTBrowser - * - * @author Roshan Dawrani */ package groovy.inspect 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 29f893e..d47db95 100644 --- a/subprojects/groovy-console/src/main/groovy/groovy/inspect/TextTreeNodeMaker.groovy +++ b/subprojects/groovy-console/src/main/groovy/groovy/inspect/TextTreeNodeMaker.groovy @@ -18,8 +18,6 @@ */ /** * A factory class for plain text nodes for use in the AST tree made by ASTBrowser - * - * @author Roshan Dawrani */ package groovy.inspect 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 52939f2..76cac96 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 @@ -24,63 +24,70 @@ import groovy.swing.SwingBuilder import javax.swing.* import java.awt.* -/** -A little GUI to show some of the Inspector capabilities. -Starting this script opens the ObjectBrowser on "some String". -Use it in groovysh or groovyConsole to inspect your object of -interest with -<code> -ObjectBrowser.inspect(myObject) -</code>. +import static groovy.inspect.Inspector.MEMBER_DECLARER_IDX +import static groovy.inspect.Inspector.MEMBER_EXCEPTIONS_IDX +import static groovy.inspect.Inspector.MEMBER_MODIFIER_IDX +import static groovy.inspect.Inspector.MEMBER_NAME_IDX +import static groovy.inspect.Inspector.MEMBER_ORIGIN_IDX +import static groovy.inspect.Inspector.MEMBER_PARAMS_IDX +import static groovy.inspect.Inspector.MEMBER_TYPE_IDX +import static groovy.inspect.Inspector.MEMBER_VALUE_IDX -@author Dierk Koenig -**/ +/** + * A little GUI to show some of the Inspector capabilities. + * Starting this script opens the ObjectBrowser on "some String". + * Use it in groovysh or groovyConsole to inspect your object of interest with: + * <code> + * ObjectBrowser.inspect(myObject) + * </code>. + */ class ObjectBrowser { - + def inspector def swing, frame, fieldTable, methodTable, itemTable, mapTable static void main(args) { inspect('some String') } - static void inspect(objectUnderInspection){ + + static void inspect(objectUnderInspection) { def browser = new ObjectBrowser() browser.inspector = new Inspector(objectUnderInspection) browser.run() } - + void run() { swing = new SwingBuilder() - - frame = swing.frame(title:'Groovy Object Browser', location:[200,200], - size:[800,600], pack: true, show:true, + + frame = swing.frame(title: 'Groovy Object Browser', location: [200, 200], + size: [800, 600], pack: true, show: true, iconImage: swing.imageIcon(groovy.ui.Console.ICON_PATH).image, - defaultCloseOperation:WindowConstants.DISPOSE_ON_CLOSE) { - + defaultCloseOperation: WindowConstants.DISPOSE_ON_CLOSE) { + menuBar { - menu(text:'Help') { - menuItem {action(name:'About', closure: this.&showAbout)} + menu(text: 'Help') { + menuItem { action(name: 'About', closure: this.&showAbout) } } } panel { borderLayout() - panel( name:'Class Info', - border: emptyBorder([5,10,5,10]), - constraints:NORTH) { - flowLayout(alignment:FlowLayout.LEFT) + panel(name: 'Class Info', + border: emptyBorder([5, 10, 5, 10]), + constraints: NORTH) { + flowLayout(alignment: FlowLayout.LEFT) def props = inspector.classProps def classLabel = '<html>' + props.join('<br>') label(classLabel) } - tabbedPane(constraints:CENTER){ + tabbedPane(constraints: CENTER) { if (inspector.object instanceof Collection) { scrollPane(name: ' Collection data ') { itemTable = table { int i = 0 def data = inspector.object.collect { val -> [i++, val] } - tableModel(list:data) { - closureColumn(header:'Index', read:{it[0]}) - closureColumn(header:'Value', read:{it[1]}) + tableModel(list: data) { + closureColumn(header: 'Index', read: { it[0] }) + closureColumn(header: 'Value', read: { it[1] }) } } } @@ -90,10 +97,10 @@ class ObjectBrowser { itemTable = table { int i = 0 def data = inspector.object.collect { key, val -> [i++, key, val] } - tableModel(list:data) { - closureColumn(header:'Index', read:{it[0]}) - closureColumn(header:'Key', read:{it[1]}) - closureColumn(header:'Value', read:{it[2]}) + tableModel(list: data) { + closureColumn(header: 'Index', read: { it[0] }) + closureColumn(header: 'Key', read: { it[1] }) + closureColumn(header: 'Value', read: { it[2] }) } } } @@ -102,45 +109,45 @@ class ObjectBrowser { fieldTable = table { def data = Inspector.sort(inspector.publicFields.toList()) data.addAll(Inspector.sort(inspector.propertyInfo.toList())) - tableModel(list:data) { - closureColumn(header:'Name', read:{it[Inspector.MEMBER_NAME_IDX]}) - closureColumn(header:'Value', read:{it[Inspector.MEMBER_VALUE_IDX]}) - closureColumn(header:'Type', read:{it[Inspector.MEMBER_TYPE_IDX]}) - closureColumn(header:'Origin', read:{it[Inspector.MEMBER_ORIGIN_IDX]}) - closureColumn(header:'Modifier', read:{it[Inspector.MEMBER_MODIFIER_IDX]}) - closureColumn(header:'Declarer', read:{it[Inspector.MEMBER_DECLARER_IDX]}) + tableModel(list: data) { + closureColumn(header: 'Name', read: { it[MEMBER_NAME_IDX] }) + closureColumn(header: 'Value', read: { it[MEMBER_VALUE_IDX] }) + closureColumn(header: 'Type', read: { it[MEMBER_TYPE_IDX] }) + closureColumn(header: 'Origin', read: { it[MEMBER_ORIGIN_IDX] }) + closureColumn(header: 'Modifier', read: { it[MEMBER_MODIFIER_IDX] }) + closureColumn(header: 'Declarer', read: { it[MEMBER_DECLARER_IDX] }) } } } - scrollPane(name:' (Meta) Methods ' ) { + scrollPane(name: ' (Meta) Methods ') { methodTable = table { def data = Inspector.sort(inspector.methods.toList()) data.addAll(Inspector.sort(inspector.metaMethods.toList())) - tableModel(list:data) { - closureColumn(header:'Name', read:{it[Inspector.MEMBER_NAME_IDX]}) - closureColumn(header:'Params', read:{it[Inspector.MEMBER_PARAMS_IDX]}) - closureColumn(header:'Type', read:{it[Inspector.MEMBER_TYPE_IDX]}) - closureColumn(header:'Origin', read:{it[Inspector.MEMBER_ORIGIN_IDX]}) - closureColumn(header:'Modifier', read:{it[Inspector.MEMBER_MODIFIER_IDX]}) - closureColumn(header:'Declarer', read:{it[Inspector.MEMBER_DECLARER_IDX]}) - closureColumn(header:'Exceptions', read:{it[Inspector.MEMBER_EXCEPTIONS_IDX]}) + tableModel(list: data) { + closureColumn(header: 'Name', read: { it[MEMBER_NAME_IDX] }) + closureColumn(header: 'Params', read: { it[MEMBER_PARAMS_IDX] }) + closureColumn(header: 'Type', read: { it[MEMBER_TYPE_IDX] }) + closureColumn(header: 'Origin', read: { it[MEMBER_ORIGIN_IDX] }) + closureColumn(header: 'Modifier', read: { it[MEMBER_MODIFIER_IDX] }) + closureColumn(header: 'Declarer', read: { it[MEMBER_DECLARER_IDX] }) + closureColumn(header: 'Exceptions', read: { it[MEMBER_EXCEPTIONS_IDX] }) } } } } } } - + // Add a bit of formatting addSorter(itemTable) addSorter(mapTable) addSorter(fieldTable) addSorter(methodTable) - + frame.toFront() } - + void addSorter(table) { if (table != null) { def sorter = new TableSorter(table.model) @@ -148,13 +155,13 @@ class ObjectBrowser { sorter.addMouseListenerToHeaderInTable(table) } } - + void showAbout(EventObject evt) { - def pane = swing.optionPane() - // work around GROOVY-1048 - def version = GroovySystem.version - pane.setMessage('An interactive GUI to explore object capabilities.\nVersion ' + version) - def dialog = pane.createDialog(frame, 'About Groovy Object Browser') - dialog.show() + def pane = swing.optionPane() + // work around GROOVY-1048 + def version = GroovySystem.version + pane.setMessage('An interactive GUI to explore object capabilities.\nVersion ' + version) + def dialog = pane.createDialog(frame, 'About Groovy Object Browser') + dialog.show() } } 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 1ffc55c..3d1b790 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 @@ -264,7 +264,6 @@ class ScriptToTreeNodeAdapter { /** * This Node Operation builds up a root tree node for the viewer. - * @author Hamlet D'Arcy */ class TreeNodeBuildingNodeOperation extends PrimaryClassNodeOperation { @@ -455,8 +454,6 @@ class TreeNodeBuildingNodeOperation extends PrimaryClassNodeOperation { /** * This AST visitor builds up a TreeNode. - * - * @author Hamlet D'Arcy */ @PackageScope class TreeNodeBuildingVisitor extends CodeVisitorSupport { 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 31aec95..c411035 100644 --- a/subprojects/groovy-console/src/main/groovy/groovy/ui/ConsoleIvyPlugin.groovy +++ b/subprojects/groovy-console/src/main/groovy/groovy/ui/ConsoleIvyPlugin.groovy @@ -28,9 +28,6 @@ import org.apache.ivy.core.event.resolve.StartResolveEvent * Groovy Swing console. * * Adds Groovy Grape feedback (via an Ivy listener). - * - * @author Guillaume Laforge - * @author Paul King */ class ConsoleIvyPlugin { Console savedConsole 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 a367696..eb6e590 100644 --- a/subprojects/groovy-console/src/main/groovy/groovy/ui/ConsoleSupport.java +++ b/subprojects/groovy-console/src/main/groovy/groovy/ui/ConsoleSupport.java @@ -29,8 +29,6 @@ import java.awt.*; /** * Base class for console - * - * @author <a href="mailto:ja...@coredevelopers.net">James Strachan</a> */ public abstract class ConsoleSupport { 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 f05f6e8..a4e9c8a 100644 --- a/subprojects/groovy-console/src/main/groovy/groovy/ui/ConsoleTextEditor.java +++ b/subprojects/groovy-console/src/main/groovy/groovy/ui/ConsoleTextEditor.java @@ -44,11 +44,6 @@ import java.util.prefs.Preferences; /** * Component which provides a styled editor for the console. - * - * @author hippy - * @author Danno Ferrin - * @author Tim Yates - * @author Guillaume Laforge */ public class ConsoleTextEditor extends JScrollPane { public String getDefaultFamily() { 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 4ac5b1e..11caad0 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 @@ -35,9 +35,6 @@ import java.awt.event.TextEvent; import java.awt.event.TextListener; import java.util.EventListener; -/** - * @author Evan "Hippy" Slatis - */ public final class FindReplaceUtility { public static final String FIND_ACTION_COMMAND = "Find"; 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 11f799a..b804235 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 @@ -32,10 +32,6 @@ import java.awt.*; import java.awt.event.ActionEvent; import java.awt.event.KeyEvent; - -/** - * @author Evan "Hippy" Slatis - */ public class GroovyFilter extends StructuredSyntaxDocumentFilter { // java tab policy action diff --git a/subprojects/groovy-console/src/main/groovy/groovy/ui/text/StructuredSyntaxDocumentFilter.java b/subprojects/groovy-console/src/main/groovy/groovy/ui/text/StructuredSyntaxDocumentFilter.java index 796aeb3..93fa288 100644 --- a/subprojects/groovy-console/src/main/groovy/groovy/ui/text/StructuredSyntaxDocumentFilter.java +++ b/subprojects/groovy-console/src/main/groovy/groovy/ui/text/StructuredSyntaxDocumentFilter.java @@ -40,10 +40,6 @@ import java.util.TreeSet; import java.util.regex.Matcher; import java.util.regex.Pattern; -/** - * - * @author Evan "Hippy" Slatis - */ public class StructuredSyntaxDocumentFilter extends DocumentFilter { public static final String TAB_REPLACEMENT = " "; diff --git a/subprojects/groovy-console/src/main/groovy/groovy/ui/text/StructuredSyntaxHandler.java b/subprojects/groovy-console/src/main/groovy/groovy/ui/text/StructuredSyntaxHandler.java index 922e89c..2979bf5 100644 --- a/subprojects/groovy-console/src/main/groovy/groovy/ui/text/StructuredSyntaxHandler.java +++ b/subprojects/groovy-console/src/main/groovy/groovy/ui/text/StructuredSyntaxHandler.java @@ -23,9 +23,6 @@ import org.xml.sax.SAXException; import org.xml.sax.SAXParseException; import org.xml.sax.helpers.DefaultHandler; -/** - * @author Evan "Hippy" Slatis - */ public class StructuredSyntaxHandler extends DefaultHandler { //StyleConstants. 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 62beed8..e04feaf 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 @@ -24,8 +24,6 @@ import java.awt.datatransfer.Clipboard; /** * Contains all the basic resources and values used by the utility frame work * framework. - * - * @author Evan "Hippy" Slatis */ public final class StructuredSyntaxResources { 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 34df868..ec30af1 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 @@ -44,8 +44,6 @@ import java.util.regex.Pattern; /** * A simple text pane that is printable and wrapping is optional. - * - * @author Evan "Hippy" Slatis */ public class TextEditor extends JTextPane implements Pageable, Printable { 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 05a9d24..7cfc89d 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 @@ -29,8 +29,6 @@ import java.beans.PropertyChangeListener; * To use this, simply drop this as an UndoableEditListener into your document, * and then create actions to call undo/redo as needed (checking can undo/redo * first, of course). - * - * @author Evan "Hippy" Slatis */ public class TextUndoManager extends UndoManager { diff --git a/subprojects/groovy-console/src/test/groovy/groovy/inspect/swingui/ScriptToTreeNodeAdapterTest.groovy b/subprojects/groovy-console/src/test/groovy/groovy/inspect/swingui/ScriptToTreeNodeAdapterTest.groovy index 371d8b4..29dff39 100644 --- a/subprojects/groovy-console/src/test/groovy/groovy/inspect/swingui/ScriptToTreeNodeAdapterTest.groovy +++ b/subprojects/groovy-console/src/test/groovy/groovy/inspect/swingui/ScriptToTreeNodeAdapterTest.groovy @@ -30,8 +30,6 @@ import junit.framework.AssertionFailedError * The assertions in this test case often assert against the toString() representation of * an object. Normally, this is bad form. However, the class under test is meant to display * toString() forms in a user interface. So in this case it is appropriate. - * - * @author Hamlet D'Arcy */ class ScriptToTreeNodeAdapterTest extends GroovyTestCase { diff --git a/subprojects/groovy-console/src/test/groovy/groovy/ui/HistoryRecordGetTextToRunTests.groovy b/subprojects/groovy-console/src/test/groovy/groovy/ui/HistoryRecordGetTextToRunTests.groovy index dde57c4..c012233 100644 --- a/subprojects/groovy-console/src/test/groovy/groovy/ui/HistoryRecordGetTextToRunTests.groovy +++ b/subprojects/groovy-console/src/test/groovy/groovy/ui/HistoryRecordGetTextToRunTests.groovy @@ -20,10 +20,6 @@ package groovy.ui import junit.framework.TestCase -/* - * @author Sergii Bondarenko - * @author Pascal Schumacher - */ class HistoryRecordGetTextToRunTests extends TestCase { void testImport() { diff --git a/subprojects/groovy-console/src/test/groovy/groovy/ui/text/GroovyFilterTests.groovy b/subprojects/groovy-console/src/test/groovy/groovy/ui/text/GroovyFilterTests.groovy index 7085053..f11c51a 100644 --- a/subprojects/groovy-console/src/test/groovy/groovy/ui/text/GroovyFilterTests.groovy +++ b/subprojects/groovy-console/src/test/groovy/groovy/ui/text/GroovyFilterTests.groovy @@ -18,9 +18,6 @@ */ package groovy.ui.text -/** - * @author Andre Steingress - */ class GroovyFilterTests extends GroovyTestCase { void testDecimalIntegerLiteral() { diff --git a/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/GroovyDocTool.java b/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/GroovyDocTool.java index 9566cea..402c41d 100644 --- a/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/GroovyDocTool.java +++ b/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/GroovyDocTool.java @@ -28,9 +28,6 @@ import java.util.ArrayList; import java.util.List; import java.util.Properties; -/** - * @author Jeremy Rayner - */ public class GroovyDocTool { private final Logger log = Logger.create(GroovyDocTool.class); private final GroovyRootDocBuilder rootDocBuilder; diff --git a/subprojects/groovy-groovydoc/src/spec/doc/groovydoc.adoc b/subprojects/groovy-groovydoc/src/spec/doc/groovydoc.adoc index 04b481b..ca44a81 100644 --- a/subprojects/groovy-groovydoc/src/spec/doc/groovydoc.adoc +++ b/subprojects/groovy-groovydoc/src/spec/doc/groovydoc.adoc @@ -199,8 +199,6 @@ import org.codehaus.groovy.ant.Groovydoc; /** * Overrides GroovyDoc's default class template - for testing purpose only. - * - * @author Andre Steingress */ public class CustomGroovyDoc extends Groovydoc { diff --git a/subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/CustomGroovyDoc.java b/subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/CustomGroovyDoc.java index 6d97d4d..619a7be 100644 --- a/subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/CustomGroovyDoc.java +++ b/subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/CustomGroovyDoc.java @@ -22,8 +22,6 @@ import org.codehaus.groovy.ant.Groovydoc; /** * Overrides GroovyDoc's default class template - for testing purpose only. - * - * @author Andre Steingress */ public class CustomGroovyDoc extends Groovydoc { diff --git a/subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/GroovyDocTest.java b/subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/GroovyDocTest.java index 42a1f15..2537f04 100644 --- a/subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/GroovyDocTest.java +++ b/subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/GroovyDocTest.java @@ -27,9 +27,6 @@ import java.io.FilenameFilter; import java.nio.charset.Charset; import java.util.List; -/** - * @author Andre Steingress - */ public class GroovyDocTest extends BuildFileTest { private static final String SRC_TESTFILES; diff --git a/subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/GroovyRootDocBuilderTest.java b/subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/GroovyRootDocBuilderTest.java index 128f7d1..22c7e51 100644 --- a/subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/GroovyRootDocBuilderTest.java +++ b/subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/GroovyRootDocBuilderTest.java @@ -22,9 +22,6 @@ import groovy.util.GroovyTestCase; import java.util.ArrayList; -/** - * @author Paul King - */ public class GroovyRootDocBuilderTest extends GroovyTestCase { private String src = "/**\n" + " * <h1>Description</h1>\n" + diff --git a/subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/SimpleGroovyRootDocTests.groovy b/subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/SimpleGroovyRootDocTests.groovy index 70b78f6..7f631c1 100644 --- a/subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/SimpleGroovyRootDocTests.groovy +++ b/subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/SimpleGroovyRootDocTests.groovy @@ -18,9 +18,6 @@ */ package org.codehaus.groovy.tools.groovydoc -/** - * @author Andre Steingress - */ class SimpleGroovyRootDocTests extends GroovyTestCase { // GROOVY-6017