Skip to content

Commit

Permalink
Update the Groovy plugin to 2.5.18
Browse files Browse the repository at this point in the history 
for #1379
  • Loading branch information
@eric-milles
eric-milles committed Jul 20, 2022
1 parent 0d91486 commit 6b30263
Show file tree
Hide file tree
Showing 40 changed files with 483 additions and 719 deletions.
2 changes: 1 addition & 1 deletion ...e.tests.compiler/src/org/eclipse/jdt/groovy/core/tests/basic/GroovyCompilerTestSuite.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ protected String[] getDefaultClassPaths() {
String[] cps = super.getDefaultClassPaths();
String[] newcps = Arrays.copyOf(cps, cps.length + 2);

String[] groovyVersions = {"4.0.3", "3.0.11-indy", "2.5.17-indy"};
String[] groovyVersions = {"4.0.3", "3.0.11-indy", "2.5.18-indy"};
String[] ivyVersions = {"2.5.0", "2.4.0"};
try {
URL groovyJar = null;
Expand Down
8 changes: 4 additions & 4 deletions base/org.codehaus.groovy25/.classpath
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@
<attribute name="javadoc_location" value="jar:platform:/resource/org.codehaus.groovy25/lib/ivy-2.5.0-javadoc.jar!/" />
</attributes>
</classpathentry>
<classpathentry kind="lib" path="lib/groovy-2.5.17-indy.jar" sourcepath="lib/groovy-2.5.17-sources.jar" exported="true">
<classpathentry kind="lib" path="lib/groovy-2.5.18-indy.jar" sourcepath="lib/groovy-2.5.18-sources.jar" exported="true">
<attributes>
<attribute name="javadoc_location" value="jar:platform:/resource/org.codehaus.groovy25/lib/groovy-2.5.17-javadoc.jar!/" />
<attribute name="javadoc_location" value="jar:platform:/resource/org.codehaus.groovy25/lib/groovy-2.5.18-javadoc.jar!/" />
</attributes>
</classpathentry>
<classpathentry kind="lib" path="lib/groovy-test-2.5.17-indy.jar" sourcepath="lib/groovy-test-2.5.17-sources.jar" exported="true">
<classpathentry kind="lib" path="lib/groovy-test-2.5.18-indy.jar" sourcepath="lib/groovy-test-2.5.18-sources.jar" exported="true">
<attributes>
<attribute name="javadoc_location" value="jar:platform:/resource/org.codehaus.groovy25/lib/groovy-test-2.5.17-javadoc.jar!/" />
<attribute name="javadoc_location" value="jar:platform:/resource/org.codehaus.groovy25/lib/groovy-test-2.5.18-javadoc.jar!/" />
</attributes>
</classpathentry>

Expand Down
166 changes: 83 additions & 83 deletions base/org.codehaus.groovy25/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,94 +4,94 @@ Bundle-SymbolicName: org.codehaus.groovy
Automatic-Module-Name: org.codehaus.groovy
Bundle-Name: Apache Groovy
Bundle-Vendor: Pivotal Software, Inc.
Bundle-Version: 2.5.17.qualifier
Bundle-Version: 2.5.18.qualifier
Bundle-ClassPath: eclipse-trace.jar,
groovy-eclipse.jar,
lib/ivy-2.5.0.jar,
lib/groovy-2.5.17-indy.jar,
lib/groovy-test-2.5.17-indy.jar
Export-Package: groovy.beans;version="2.5.17",
groovy.cli;version="2.5.17",
groovy.grape;version="2.5.17",
groovy.inspect;version="2.5.17",
groovy.io;version="2.5.17",
groovy.lang;version="2.5.17",
groovy.mock.interceptor;version="2.5.17",
groovy.security;version="2.5.17",
groovy.test;version="2.5.17",
groovy.time;version="2.5.17",
groovy.transform;version="2.5.17",
groovy.transform.builder;version="2.5.17",
groovy.transform.options;version="2.5.17",
groovy.transform.stc;version="2.5.17",
groovy.ui;version="2.5.17",
groovy.util;version="2.5.17",
groovy.util.logging;version="2.5.17",
groovy.xml;version="2.5.17",
lib/groovy-2.5.18-indy.jar,
lib/groovy-test-2.5.18-indy.jar
Export-Package: groovy.beans;version="2.5.18",
groovy.cli;version="2.5.18",
groovy.grape;version="2.5.18",
groovy.inspect;version="2.5.18",
groovy.io;version="2.5.18",
groovy.lang;version="2.5.18",
groovy.mock.interceptor;version="2.5.18",
groovy.security;version="2.5.18",
groovy.test;version="2.5.18",
groovy.time;version="2.5.18",
groovy.transform;version="2.5.18",
groovy.transform.builder;version="2.5.18",
groovy.transform.options;version="2.5.18",
groovy.transform.stc;version="2.5.18",
groovy.ui;version="2.5.18",
groovy.util;version="2.5.18",
groovy.util.logging;version="2.5.18",
groovy.xml;version="2.5.18",
groovyjarjarantlr;x-friends:="org.codehaus.groovy.eclipse.refactoring",
org.apache.groovy.ast.tools;version="2.5.17",
org.apache.groovy.io;version="2.5.17",
org.apache.groovy.lang.annotation;version="2.5.17",
org.apache.groovy.metaclass;version="2.5.17",
org.apache.groovy.plugin;version="2.5.17",
org.apache.groovy.util;version="2.5.17",
org.apache.groovy.util.concurrentlinkedhashmap;version="2.5.17",
org.codehaus.groovy;version="2.5.17",
org.codehaus.groovy.antlr;version="2.5.17",
org.codehaus.groovy.antlr.parser;version="2.5.17",
org.codehaus.groovy.ast;version="2.5.17",
org.codehaus.groovy.ast.builder;version="2.5.17",
org.codehaus.groovy.ast.decompiled;version="2.5.17",
org.codehaus.groovy.ast.expr;version="2.5.17",
org.codehaus.groovy.ast.stmt;version="2.5.17",
org.codehaus.groovy.ast.tools;version="2.5.17",
org.codehaus.groovy.classgen;version="2.5.17",
org.codehaus.groovy.classgen.asm;version="2.5.17",
org.codehaus.groovy.classgen.asm.indy;version="2.5.17",
org.codehaus.groovy.classgen.asm.indy.sc;version="2.5.17",
org.codehaus.groovy.classgen.asm.sc;version="2.5.17",
org.codehaus.groovy.classgen.asm.util;version="2.5.17",
org.codehaus.groovy.control;version="2.5.17",
org.codehaus.groovy.control.customizers;version="2.5.17",
org.codehaus.groovy.control.customizers.builder;version="2.5.17",
org.codehaus.groovy.control.io;version="2.5.17",
org.codehaus.groovy.control.messages;version="2.5.17",
org.apache.groovy.ast.tools;version="2.5.18",
org.apache.groovy.io;version="2.5.18",
org.apache.groovy.lang.annotation;version="2.5.18",
org.apache.groovy.metaclass;version="2.5.18",
org.apache.groovy.plugin;version="2.5.18",
org.apache.groovy.util;version="2.5.18",
org.apache.groovy.util.concurrentlinkedhashmap;version="2.5.18",
org.codehaus.groovy;version="2.5.18",
org.codehaus.groovy.antlr;version="2.5.18",
org.codehaus.groovy.antlr.parser;version="2.5.18",
org.codehaus.groovy.ast;version="2.5.18",
org.codehaus.groovy.ast.builder;version="2.5.18",
org.codehaus.groovy.ast.decompiled;version="2.5.18",
org.codehaus.groovy.ast.expr;version="2.5.18",
org.codehaus.groovy.ast.stmt;version="2.5.18",
org.codehaus.groovy.ast.tools;version="2.5.18",
org.codehaus.groovy.classgen;version="2.5.18",
org.codehaus.groovy.classgen.asm;version="2.5.18",
org.codehaus.groovy.classgen.asm.indy;version="2.5.18",
org.codehaus.groovy.classgen.asm.indy.sc;version="2.5.18",
org.codehaus.groovy.classgen.asm.sc;version="2.5.18",
org.codehaus.groovy.classgen.asm.util;version="2.5.18",
org.codehaus.groovy.control;version="2.5.18",
org.codehaus.groovy.control.customizers;version="2.5.18",
org.codehaus.groovy.control.customizers.builder;version="2.5.18",
org.codehaus.groovy.control.io;version="2.5.18",
org.codehaus.groovy.control.messages;version="2.5.18",
org.codehaus.groovy.eclipse,
org.codehaus.groovy.plugin;version="2.5.17",
org.codehaus.groovy.reflection;version="2.5.17",
org.codehaus.groovy.reflection.android;version="2.5.17",
org.codehaus.groovy.reflection.stdclasses;version="2.5.17",
org.codehaus.groovy.reflection.v7;version="2.5.17",
org.codehaus.groovy.runtime;version="2.5.17",
org.codehaus.groovy.runtime.callsite;version="2.5.17",
org.codehaus.groovy.runtime.dgmimpl;version="2.5.17",
org.codehaus.groovy.runtime.dgmimpl.arrays;version="2.5.17",
org.codehaus.groovy.runtime.m12n;version="2.5.17",
org.codehaus.groovy.runtime.memoize;version="2.5.17",
org.codehaus.groovy.runtime.metaclass;version="2.5.17",
org.codehaus.groovy.runtime.powerassert;version="2.5.17",
org.codehaus.groovy.runtime.typehandling;version="2.5.17",
org.codehaus.groovy.runtime.wrappers;version="2.5.17",
org.codehaus.groovy.syntax;version="2.5.17",
org.codehaus.groovy.tools;version="2.5.17",
org.codehaus.groovy.tools.ast;version="2.5.17",
org.codehaus.groovy.tools.gse;version="2.5.17",
org.codehaus.groovy.tools.javac;version="2.5.17",
org.codehaus.groovy.tools.shell;version="2.5.17",
org.codehaus.groovy.tools.shell.util;version="2.5.17",
org.codehaus.groovy.transform;version="2.5.17",
org.codehaus.groovy.transform.sc;version="2.5.17",
org.codehaus.groovy.transform.sc.transformers;version="2.5.17",
org.codehaus.groovy.transform.stc;version="2.5.17",
org.codehaus.groovy.transform.tailrec;version="2.5.17",
org.codehaus.groovy.transform.trait;version="2.5.17",
org.codehaus.groovy.util;version="2.5.17",
org.codehaus.groovy.vmplugin;version="2.5.17",
org.codehaus.groovy.vmplugin.v5;version="2.5.17",
org.codehaus.groovy.vmplugin.v6;version="2.5.17",
org.codehaus.groovy.vmplugin.v7;version="2.5.17",
org.codehaus.groovy.vmplugin.v8;version="2.5.17",
org.codehaus.groovy.vmplugin.v9;version="2.5.17"
org.codehaus.groovy.plugin;version="2.5.18",
org.codehaus.groovy.reflection;version="2.5.18",
org.codehaus.groovy.reflection.android;version="2.5.18",
org.codehaus.groovy.reflection.stdclasses;version="2.5.18",
org.codehaus.groovy.reflection.v7;version="2.5.18",
org.codehaus.groovy.runtime;version="2.5.18",
org.codehaus.groovy.runtime.callsite;version="2.5.18",
org.codehaus.groovy.runtime.dgmimpl;version="2.5.18",
org.codehaus.groovy.runtime.dgmimpl.arrays;version="2.5.18",
org.codehaus.groovy.runtime.m12n;version="2.5.18",
org.codehaus.groovy.runtime.memoize;version="2.5.18",
org.codehaus.groovy.runtime.metaclass;version="2.5.18",
org.codehaus.groovy.runtime.powerassert;version="2.5.18",
org.codehaus.groovy.runtime.typehandling;version="2.5.18",
org.codehaus.groovy.runtime.wrappers;version="2.5.18",
org.codehaus.groovy.syntax;version="2.5.18",
org.codehaus.groovy.tools;version="2.5.18",
org.codehaus.groovy.tools.ast;version="2.5.18",
org.codehaus.groovy.tools.gse;version="2.5.18",
org.codehaus.groovy.tools.javac;version="2.5.18",
org.codehaus.groovy.tools.shell;version="2.5.18",
org.codehaus.groovy.tools.shell.util;version="2.5.18",
org.codehaus.groovy.transform;version="2.5.18",
org.codehaus.groovy.transform.sc;version="2.5.18",
org.codehaus.groovy.transform.sc.transformers;version="2.5.18",
org.codehaus.groovy.transform.stc;version="2.5.18",
org.codehaus.groovy.transform.tailrec;version="2.5.18",
org.codehaus.groovy.transform.trait;version="2.5.18",
org.codehaus.groovy.util;version="2.5.18",
org.codehaus.groovy.vmplugin;version="2.5.18",
org.codehaus.groovy.vmplugin.v5;version="2.5.18",
org.codehaus.groovy.vmplugin.v6;version="2.5.18",
org.codehaus.groovy.vmplugin.v7;version="2.5.18",
org.codehaus.groovy.vmplugin.v8;version="2.5.18",
org.codehaus.groovy.vmplugin.v9;version="2.5.18"
Require-Bundle: org.eclipse.core.runtime,
org.junit;resolution:=optional
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Expand Down
1 change: 1 addition & 0 deletions base/org.codehaus.groovy25/VERSION
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,4 @@
2021-09-06: GROOVY_2_5_15
2022-03-02: GROOVY_2_5_16
2022-05-31: GROOVY_2_5_17
2022-07-20: GROOVY_2_5_18
24 changes: 12 additions & 12 deletions base/org.codehaus.groovy25/about.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,12 @@ <h3>License</h3>

<h3>Third Party Content</h3>

<h4>groovy-2.5.17-indy.jar</h4>
<h4>groovy-test-2.5.17-indy.jar</h4>
<h4>groovy-2.5.18-indy.jar</h4>
<h4>groovy-test-2.5.18-indy.jar</h4>

<ul>
<li>Obtained from: <a href="https://dist.apache.org/repos/dist/release/groovy/2.5.17/distribution/apache-groovy-binary-2.5.17.zip">https://dist.apache.org/repos/dist/release/groovy/2.5.17/distribution/apache-groovy-binary-2.5.17.zip</a></li>
<li>Sources available at: <a href="https://dist.apache.org/repos/dist/release/groovy/2.5.17/sources/apache-groovy-src-2.5.17.zip">https://dist.apache.org/repos/dist/release/groovy/2.5.17/sources/apache-groovy-src-2.5.17.zip</a></li>
<li>Obtained from: <a href="https://dist.apache.org/repos/dist/release/groovy/2.5.18/distribution/apache-groovy-binary-2.5.18.zip">https://dist.apache.org/repos/dist/release/groovy/2.5.18/distribution/apache-groovy-binary-2.5.18.zip</a></li>
<li>Sources available at: <a href="https://dist.apache.org/repos/dist/release/groovy/2.5.18/sources/apache-groovy-src-2.5.18.zip">https://dist.apache.org/repos/dist/release/groovy/2.5.18/sources/apache-groovy-src-2.5.18.zip</a></li>
<li>License kind: ASL</li>
<li>License URL: <a href="https://www.apache.org/licenses/LICENSE-2.0.html">https://www.apache.org/licenses/LICENSE-2.0.html</a></li>
<li>License text: <a href="about_files/asl2-license.txt">asl2-license.txt</a></li>
Expand All @@ -45,16 +45,16 @@ <h4>ivy-2.5.0.jar</h4>
<li>License text: <a href="about_files/asl2-license.txt">asl2-license.txt</a></li>
</ul>

<h4>groovy-cli-picocli-2.5.17.jar</h4>
<h4>groovy-console-2.5.17.jar</h4>
<h4>groovy-groovysh-2.5.17.jar</h4>
<h4>groovy-swing-2.5.17.jar</h4>
<h4>groovy-templates-2.5.17.jar</h4>
<h4>groovy-xml-2.5.17.jar</h4>
<h4>groovy-cli-picocli-2.5.18.jar</h4>
<h4>groovy-console-2.5.18.jar</h4>
<h4>groovy-groovysh-2.5.18.jar</h4>
<h4>groovy-swing-2.5.18.jar</h4>
<h4>groovy-templates-2.5.18.jar</h4>
<h4>groovy-xml-2.5.18.jar</h4>
<h4>picocli-4.3.2.jar</h4>

<ul>
<li>Obtained from: <a href="https://dist.apache.org/repos/dist/release/groovy/2.5.17/distribution/apache-groovy-binary-2.5.17.zip">https://dist.apache.org/repos/dist/release/groovy/2.5.17/distribution/apache-groovy-binary-2.5.17.zip</a></li>
<li>Obtained from: <a href="https://dist.apache.org/repos/dist/release/groovy/2.5.18/distribution/apache-groovy-binary-2.5.18.zip">https://dist.apache.org/repos/dist/release/groovy/2.5.18/distribution/apache-groovy-binary-2.5.18.zip</a></li>
<li>License kind: ASL</li>
<li>License URL: <a href="https://www.apache.org/licenses/LICENSE-2.0.html">https://www.apache.org/licenses/LICENSE-2.0.html</a></li>
<li>License text: <a href="about_files/asl2-license.txt">asl2-license.txt</a></li>
Expand All @@ -63,7 +63,7 @@ <h4>picocli-4.3.2.jar</h4>
<h4>jline-2.14.6.jar</h4>

<ul>
<li>Obtained from: <a href="https://dist.apache.org/repos/dist/release/groovy/2.5.17/distribution/apache-groovy-binary-2.5.17.zip">https://dist.apache.org/repos/dist/release/groovy/2.5.17/distribution/apache-groovy-binary-2.5.17.zip</a></li>
<li>Obtained from: <a href="https://dist.apache.org/repos/dist/release/groovy/2.5.18/distribution/apache-groovy-binary-2.5.18.zip">https://dist.apache.org/repos/dist/release/groovy/2.5.18/distribution/apache-groovy-binary-2.5.18.zip</a></li>
<li>License kind: BSD</li>
<li>License URL: <a href="https://www.opensource.org/licenses/bsd-license.php">https://www.opensource.org/licenses/bsd-license.php</a></li>
<li>License text: <a href="about_files/jline2-license.txt">jline2-license.txt</a></li>
Expand Down
2 changes: 1 addition & 1 deletion base/org.codehaus.groovy25/build.antlr2x
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<project default="build">

<target name="build" depends="clean">
<java classname="groovyjarjarantlr.Tool" classpath="../../../../../lib/groovy-2.5.17-indy.jar" dir="${basedir}" fork="true">
<java classname="groovyjarjarantlr.Tool" classpath="../../../../../lib/groovy-2.5.18-indy.jar" dir="${basedir}" fork="true">
<arg line="-o parser groovy.g" />
</java>
<replaceregexp byline="true" flags="g" match="\bimport antlr." replace="import groovyjarjarantlr.">
Expand Down
Binary file renamed ...lib/console/groovy-cli-picocli-2.5.17.jar → ...lib/console/groovy-cli-picocli-2.5.18.jar
View file
Binary file not shown.
Binary file renamed ...y25/lib/console/groovy-console-2.5.17.jar → ...y25/lib/console/groovy-console-2.5.18.jar
View file
Binary file not shown.
Binary file renamed ...ovy25/lib/console/groovy-swing-2.5.17.jar → ...ovy25/lib/console/groovy-swing-2.5.18.jar
View file
Binary file not shown.
Binary file renamed ...5/lib/console/groovy-templates-2.5.17.jar → ...5/lib/console/groovy-templates-2.5.18.jar
View file
Binary file not shown.
Binary file renamed ...roovy25/lib/console/groovy-xml-2.5.17.jar → ...roovy25/lib/console/groovy-xml-2.5.18.jar
View file
Binary file not shown.
Binary file renamed ...ehaus.groovy25/lib/groovy-2.5.17-indy.jar → ...ehaus.groovy25/lib/groovy-2.5.18-indy.jar
View file
Binary file not shown.
Binary file renamed ...us.groovy25/lib/groovy-2.5.17-javadoc.jar → ...us.groovy25/lib/groovy-2.5.18-javadoc.jar
View file
Binary file not shown.
Binary file renamed ...us.groovy25/lib/groovy-2.5.17-sources.jar → ...us.groovy25/lib/groovy-2.5.18-sources.jar
View file
Binary file not shown.
Binary file renamed ....groovy25/lib/groovy-test-2.5.17-indy.jar → ....groovy25/lib/groovy-test-2.5.18-indy.jar
View file
Binary file not shown.
Binary file renamed ...oovy25/lib/groovy-test-2.5.17-javadoc.jar → ...oovy25/lib/groovy-test-2.5.18-javadoc.jar
View file
Binary file not shown.
Binary file renamed ...oovy25/lib/groovy-test-2.5.17-sources.jar → ...oovy25/lib/groovy-test-2.5.18-sources.jar
View file
Binary file not shown.
Binary file renamed ...5/lib/shell/groovy-cli-picocli-2.5.17.jar → ...5/lib/shell/groovy-cli-picocli-2.5.18.jar
View file
Binary file not shown.
Binary file renamed ...vy25/lib/shell/groovy-groovysh-2.5.17.jar → ...vy25/lib/shell/groovy-groovysh-2.5.18.jar
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion base/org.codehaus.groovy25/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
</parent>
<groupId>org.codehaus.groovy.eclipse</groupId>
<artifactId>org.codehaus.groovy</artifactId>
<version>2.5.17-SNAPSHOT</version>
<version>2.5.18-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>

<build>
Expand Down
20 changes: 15 additions & 5 deletions base/org.codehaus.groovy25/src/org/codehaus/groovy/antlr/AntlrParserPlugin.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -552,7 +552,9 @@ protected void importDef(AST importNode) {
// GRECLIPSE end
addImport(type, name, alias, annotations);
imp = last(output.getImports());
// GRECLIPSE edit
/* GRECLIPSE edit
configureAST(imp, importNode);
*/
configureAST(imp, importNode, node, null);
// GRECLIPSE end
return;
Expand All @@ -574,14 +576,18 @@ protected void importDef(AST importNode) {
// GRECLIPSE end
addStaticStarImport(type, packageName, annotations);
imp = output.getStaticStarImports().get(packageName);
// GRECLIPSE edit
/* GRECLIPSE edit
configureAST(imp, importNode);
*/
configureAST(imp, importNode, packageNode, null);
// GRECLIPSE end
} else {
// import is like "import foo.*"
addStarImport(packageName, annotations);
imp = last(output.getStarImports());
// GRECLIPSE edit
/* GRECLIPSE edit
configureAST(imp, importNode);
*/
configureAST(imp, importNode, packageNode, null);
// GRECLIPSE end
}
Expand All @@ -602,7 +608,9 @@ protected void importDef(AST importNode) {
// GRECLIPSE end
addStaticImport(type, name, alias, annotations);
imp = output.getStaticImports().get(alias == null ? name : alias);
// GRECLIPSE edit
/* GRECLIPSE edit
configureAST(imp, importNode);
*/
imp.setFieldNameExpr(literalExpression(nameNode, name));
configureAST(imp, importNode, packageNode, nameNode);
// GRECLIPSE end
Expand All @@ -622,7 +630,9 @@ protected void importDef(AST importNode) {
// GRECLIPSE end
addImport(type, name, alias, annotations);
imp = last(output.getImports());
// GRECLIPSE edit
/* GRECLIPSE edit
configureAST(imp, importNode);
*/
configureAST(imp, importNode, packageNode, nameNode);
// GRECLIPSE end
}
Expand Down
9 changes: 1 addition & 8 deletions base/org.codehaus.groovy25/src/org/codehaus/groovy/ast/ASTNode.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -175,15 +175,8 @@ public void copyNodeMetaData(ASTNode other) {
* data under that key
*/
public void setNodeMetaData(Object key, Object value) {
/* GRECLIPSE edit
if (key==null) throw new GroovyBugError("Tried to set meta data with null key on "+this+".");
if (metaDataMap == null) {
metaDataMap = new ListHashMap();
}
Object old = metaDataMap.put(key,value);
*/
Object old = putNodeMetaData(key,value);
if (old!=null) throw new GroovyBugError("Tried to overwrite existing meta data "+this+".");
if (old != null) throw new GroovyBugError("Tried to replace existing meta data on " + this + ".");
}

/**
Expand Down
17 changes: 0 additions & 17 deletions base/org.codehaus.groovy25/src/org/codehaus/groovy/ast/ClassNode.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -752,22 +752,6 @@ public FieldNode addFieldFirst(String name, int modifiers, ClassNode type, Expre
}

public void addInterface(ClassNode type) {
/* GRECLIPSE edit
boolean skip = false;
ClassNode[] interfaces = redirect().interfaces;
for (ClassNode existing : interfaces) {
if (type.equals(existing)) {
skip = true;
break;
}
}
if (!skip) {
ClassNode[] newInterfaces = new ClassNode[interfaces.length + 1];
System.arraycopy(interfaces, 0, newInterfaces, 0, interfaces.length);
newInterfaces[interfaces.length] = type;
redirect().interfaces = newInterfaces;
}
*/
ClassNode[] interfaces = getInterfaces();
for (ClassNode face : interfaces) {
if (face.equals(type)) return;
Expand All @@ -777,7 +761,6 @@ public void addInterface(ClassNode type) {
System.arraycopy(interfaces, 0, interfaces = new ClassNode[n + 1], 0, n);
interfaces[n] = type; // append interface
setInterfaces(interfaces);
// GRECLIPSE end
}

public boolean equals(Object that) {
Expand Down
Loading

0 comments on commit 6b30263

Please sign in to comment.