diff --git a/base-test/org.eclipse.jdt.groovy.core.tests.compiler/src/org/eclipse/jdt/groovy/core/tests/basic/GroovyCompilerTestSuite.java b/base-test/org.eclipse.jdt.groovy.core.tests.compiler/src/org/eclipse/jdt/groovy/core/tests/basic/GroovyCompilerTestSuite.java
index 3c18a03d8f..580e9026d2 100644
--- a/base-test/org.eclipse.jdt.groovy.core.tests.compiler/src/org/eclipse/jdt/groovy/core/tests/basic/GroovyCompilerTestSuite.java
+++ b/base-test/org.eclipse.jdt.groovy.core.tests.compiler/src/org/eclipse/jdt/groovy/core/tests/basic/GroovyCompilerTestSuite.java
@@ -124,7 +124,7 @@ protected String[] getDefaultClassPaths() {
System.arraycopy(cps, 0, newcps, 0, cps.length);
String[] ivyVersions = {"2.5.0", "2.4.0"};
- String[] groovyVersions = {"2.6.0-indy", "2.5.0-indy", "2.4.14"};
+ String[] groovyVersions = {"2.6.0-indy", "2.5.0-indy", "2.4.15"};
try {
URL groovyJar = null;
for (String groovyVer : groovyVersions) {
diff --git a/base/org.codehaus.groovy24/.classpath b/base/org.codehaus.groovy24/.classpath
index 113552f736..9f62ee85a4 100644
--- a/base/org.codehaus.groovy24/.classpath
+++ b/base/org.codehaus.groovy24/.classpath
@@ -9,9 +9,9 @@
-
+
-
+
diff --git a/base/org.codehaus.groovy24/META-INF/MANIFEST.MF b/base/org.codehaus.groovy24/META-INF/MANIFEST.MF
index 5bda89b3ba..1845c79e41 100644
--- a/base/org.codehaus.groovy24/META-INF/MANIFEST.MF
+++ b/base/org.codehaus.groovy24/META-INF/MANIFEST.MF
@@ -3,120 +3,121 @@ Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.codehaus.groovy
Bundle-Name: Groovy
Bundle-Vendor: Codehaus.org
-Bundle-Version: 2.4.14.qualifier
+Bundle-Version: 2.4.15.qualifier
Bundle-ClassPath: eclipse-trace.jar,
groovy-eclipse.jar,
lib/ivy-2.4.0.jar,
- lib/groovy-all-2.4.14.jar
-Export-Package: groovy.beans;version="2.4.14",
- groovy.grape;version="2.4.14",
- groovy.inspect;version="2.4.14",
- groovy.inspect.swingui;version="2.4.14",
- groovy.io;version="2.4.14",
- groovy.jmx.builder;version="2.4.14",
- groovy.json;version="2.4.14",
- groovy.json.internal;version="2.4.14",
- groovy.lang;version="2.4.14",
- groovy.mock.interceptor;version="2.4.14",
- groovy.model;version="2.4.14",
- groovy.security;version="2.4.14",
- groovy.servlet;version="2.4.14",
- groovy.sql;version="2.4.14",
- groovy.swing;version="2.4.14",
- groovy.swing.binding;version="2.4.14",
- groovy.swing.factory;version="2.4.14",
- groovy.swing.impl;version="2.4.14",
- groovy.test;version="2.4.14",
- groovy.text;version="2.4.14",
- groovy.text.markup;version="2.4.14",
- groovy.time;version="2.4.14",
- groovy.transform;version="2.4.14",
- groovy.transform.builder;version="2.4.14",
- groovy.transform.stc;version="2.4.14",
- groovy.ui;version="2.4.14",
- groovy.ui.icons;version="2.4.14",
- groovy.ui.text;version="2.4.14",
- groovy.ui.view;version="2.4.14",
- groovy.util;version="2.4.14",
- groovy.util.logging;version="2.4.14",
- groovy.util.slurpersupport;version="2.4.14",
- groovy.xml;version="2.4.14",
- groovy.xml.dom;version="2.4.14",
- groovy.xml.streamingmarkupsupport;version="2.4.14",
+ lib/groovy-all-2.4.15.jar
+Export-Package: groovy.beans;version="2.4.15",
+ groovy.grape;version="2.4.15",
+ groovy.inspect;version="2.4.15",
+ groovy.inspect.swingui;version="2.4.15",
+ groovy.io;version="2.4.15",
+ groovy.jmx.builder;version="2.4.15",
+ groovy.json;version="2.4.15",
+ groovy.json.internal;version="2.4.15",
+ groovy.lang;version="2.4.15",
+ groovy.mock.interceptor;version="2.4.15",
+ groovy.model;version="2.4.15",
+ groovy.security;version="2.4.15",
+ groovy.servlet;version="2.4.15",
+ groovy.sql;version="2.4.15",
+ groovy.swing;version="2.4.15",
+ groovy.swing.binding;version="2.4.15",
+ groovy.swing.factory;version="2.4.15",
+ groovy.swing.impl;version="2.4.15",
+ groovy.test;version="2.4.15",
+ groovy.text;version="2.4.15",
+ groovy.text.markup;version="2.4.15",
+ groovy.time;version="2.4.15",
+ groovy.transform;version="2.4.15",
+ groovy.transform.builder;version="2.4.15",
+ groovy.transform.stc;version="2.4.15",
+ groovy.ui;version="2.4.15",
+ groovy.ui.icons;version="2.4.15",
+ groovy.ui.text;version="2.4.15",
+ groovy.ui.view;version="2.4.15",
+ groovy.util;version="2.4.15",
+ groovy.util.logging;version="2.4.15",
+ groovy.util.slurpersupport;version="2.4.15",
+ groovy.xml;version="2.4.15",
+ groovy.xml.dom;version="2.4.15",
+ groovy.xml.streamingmarkupsupport;version="2.4.15",
groovyjarjarantlr;x-internal:=true,
groovyjarjarasm.asm;x-internal:=true,
- org.apache.groovy.io;version="2.4.14",
- org.apache.groovy.util;version="2.4.14",
+ org.apache.groovy.io;version="2.4.15",
+ org.apache.groovy.util;version="2.4.15",
org.codehaus.greclipse;x-internal:=true,
- org.codehaus.groovy;version="2.4.14",
+ org.codehaus.groovy;version="2.4.15",
org.codehaus.groovy.activator,
- org.codehaus.groovy.ant;version="2.4.14",
- org.codehaus.groovy.antlr;version="2.4.14",
- org.codehaus.groovy.antlr.java;version="2.4.14",
- org.codehaus.groovy.antlr.parser;version="2.4.14",
- org.codehaus.groovy.antlr.treewalker;version="2.4.14",
- org.codehaus.groovy.ast;version="2.4.14",
- org.codehaus.groovy.ast.builder;version="2.4.14",
- org.codehaus.groovy.ast.expr;version="2.4.14",
- org.codehaus.groovy.ast.stmt;version="2.4.14",
- org.codehaus.groovy.ast.tools;version="2.4.14",
- org.codehaus.groovy.binding;version="2.4.14",
- org.codehaus.groovy.bsf;version="2.4.14",
- org.codehaus.groovy.classgen;version="2.4.14",
- org.codehaus.groovy.classgen.asm;version="2.4.14",
- org.codehaus.groovy.classgen.asm.indy;version="2.4.14",
- org.codehaus.groovy.classgen.asm.sc;version="2.4.14",
- org.codehaus.groovy.cli;version="2.4.14",
- org.codehaus.groovy.control;version="2.4.14",
- org.codehaus.groovy.control.customizers;version="2.4.14",
- org.codehaus.groovy.control.customizers.builder;version="2.4.14",
- org.codehaus.groovy.control.io;version="2.4.14",
- org.codehaus.groovy.control.messages;version="2.4.14",
+ org.codehaus.groovy.ant;version="2.4.15",
+ org.codehaus.groovy.antlr;version="2.4.15",
+ org.codehaus.groovy.antlr.java;version="2.4.15",
+ org.codehaus.groovy.antlr.parser;version="2.4.15",
+ org.codehaus.groovy.antlr.treewalker;version="2.4.15",
+ org.codehaus.groovy.ast;version="2.4.15",
+ org.codehaus.groovy.ast.builder;version="2.4.15",
+ org.codehaus.groovy.ast.expr;version="2.4.15",
+ org.codehaus.groovy.ast.stmt;version="2.4.15",
+ org.codehaus.groovy.ast.tools;version="2.4.15",
+ org.codehaus.groovy.binding;version="2.4.15",
+ org.codehaus.groovy.bsf;version="2.4.15",
+ org.codehaus.groovy.classgen;version="2.4.15",
+ org.codehaus.groovy.classgen.asm;version="2.4.15",
+ org.codehaus.groovy.classgen.asm.indy;version="2.4.15",
+ org.codehaus.groovy.classgen.asm.sc;version="2.4.15",
+ org.codehaus.groovy.cli;version="2.4.15",
+ org.codehaus.groovy.control;version="2.4.15",
+ org.codehaus.groovy.control.customizers;version="2.4.15",
+ org.codehaus.groovy.control.customizers.builder;version="2.4.15",
+ org.codehaus.groovy.control.io;version="2.4.15",
+ org.codehaus.groovy.control.messages;version="2.4.15",
org.codehaus.groovy.eclipse,
- org.codehaus.groovy.groovydoc;version="2.4.14",
- org.codehaus.groovy.jsr223;version="2.4.14",
- org.codehaus.groovy.plugin;version="2.4.14",
- org.codehaus.groovy.reflection;version="2.4.14",
- org.codehaus.groovy.reflection.android;version="2.4.14",
- org.codehaus.groovy.reflection.stdclasses;version="2.4.14",
- org.codehaus.groovy.reflection.v7;version="2.4.14",
- org.codehaus.groovy.runtime;version="2.4.14",
- org.codehaus.groovy.runtime.callsite;version="2.4.14",
- org.codehaus.groovy.runtime.dgmimpl;version="2.4.14",
- org.codehaus.groovy.runtime.dgmimpl.arrays;version="2.4.14",
- org.codehaus.groovy.runtime.m12n;version="2.4.14",
- org.codehaus.groovy.runtime.memoize;version="2.4.14",
- org.codehaus.groovy.runtime.metaclass;version="2.4.14",
- org.codehaus.groovy.runtime.powerassert;version="2.4.14",
- org.codehaus.groovy.runtime.typehandling;version="2.4.14",
- org.codehaus.groovy.runtime.wrappers;version="2.4.14",
- org.codehaus.groovy.syntax;version="2.4.14",
- org.codehaus.groovy.testng;version="2.4.14",
- org.codehaus.groovy.tools;version="2.4.14",
- org.codehaus.groovy.tools.ast;version="2.4.14",
- org.codehaus.groovy.tools.groovydoc;version="2.4.14",
- org.codehaus.groovy.tools.groovydoc.gstringTemplates;version="2.4.14",
- org.codehaus.groovy.tools.groovydoc.gstringTemplates.classLevel;version="2.4.14",
- org.codehaus.groovy.tools.groovydoc.gstringTemplates.packageLevel;version="2.4.14",
- org.codehaus.groovy.tools.groovydoc.gstringTemplates.topLevel;version="2.4.14",
- org.codehaus.groovy.tools.gse;version="2.4.14",
- org.codehaus.groovy.tools.javac;version="2.4.14",
- org.codehaus.groovy.tools.shell;version="2.4.14",
- org.codehaus.groovy.tools.shell.commands;version="2.4.14",
- org.codehaus.groovy.tools.shell.completion;version="2.4.14",
- org.codehaus.groovy.tools.shell.util;version="2.4.14",
- org.codehaus.groovy.tools.xml;version="2.4.14",
- org.codehaus.groovy.transform;version="2.4.14",
- org.codehaus.groovy.transform.sc;version="2.4.14",
- org.codehaus.groovy.transform.sc.transformers;version="2.4.14",
- org.codehaus.groovy.transform.stc;version="2.4.14",
- org.codehaus.groovy.transform.tailrec;version="2.4.14",
- org.codehaus.groovy.transform.trait;version="2.4.14",
- org.codehaus.groovy.util;version="2.4.14",
- org.codehaus.groovy.vmplugin;version="2.4.14",
- org.codehaus.groovy.vmplugin.v5;version="2.4.14",
- org.codehaus.groovy.vmplugin.v6;version="2.4.14",
- org.codehaus.groovy.vmplugin.v7;version="2.4.14"
+ org.codehaus.groovy.groovydoc;version="2.4.15",
+ org.codehaus.groovy.jsr223;version="2.4.15",
+ org.codehaus.groovy.plugin;version="2.4.15",
+ org.codehaus.groovy.reflection;version="2.4.15",
+ org.codehaus.groovy.reflection.android;version="2.4.15",
+ org.codehaus.groovy.reflection.stdclasses;version="2.4.15",
+ org.codehaus.groovy.reflection.v7;version="2.4.15",
+ org.codehaus.groovy.runtime;version="2.4.15",
+ org.codehaus.groovy.runtime.callsite;version="2.4.15",
+ org.codehaus.groovy.runtime.dgmimpl;version="2.4.15",
+ org.codehaus.groovy.runtime.dgmimpl.arrays;version="2.4.15",
+ org.codehaus.groovy.runtime.m12n;version="2.4.15",
+ org.codehaus.groovy.runtime.memoize;version="2.4.15",
+ org.codehaus.groovy.runtime.metaclass;version="2.4.15",
+ org.codehaus.groovy.runtime.powerassert;version="2.4.15",
+ org.codehaus.groovy.runtime.typehandling;version="2.4.15",
+ org.codehaus.groovy.runtime.wrappers;version="2.4.15",
+ org.codehaus.groovy.syntax;version="2.4.15",
+ org.codehaus.groovy.testng;version="2.4.15",
+ org.codehaus.groovy.tools;version="2.4.15",
+ org.codehaus.groovy.tools.ast;version="2.4.15",
+ org.codehaus.groovy.tools.groovydoc;version="2.4.15",
+ org.codehaus.groovy.tools.groovydoc.gstringTemplates;version="2.4.15",
+ org.codehaus.groovy.tools.groovydoc.gstringTemplates.classLevel;version="2.4.15",
+ org.codehaus.groovy.tools.groovydoc.gstringTemplates.packageLevel;version="2.4.15",
+ org.codehaus.groovy.tools.groovydoc.gstringTemplates.topLevel;version="2.4.15",
+ org.codehaus.groovy.tools.gse;version="2.4.15",
+ org.codehaus.groovy.tools.javac;version="2.4.15",
+ org.codehaus.groovy.tools.shell;version="2.4.15",
+ org.codehaus.groovy.tools.shell.commands;version="2.4.15",
+ org.codehaus.groovy.tools.shell.completion;version="2.4.15",
+ org.codehaus.groovy.tools.shell.util;version="2.4.15",
+ org.codehaus.groovy.tools.xml;version="2.4.15",
+ org.codehaus.groovy.transform;version="2.4.15",
+ org.codehaus.groovy.transform.sc;version="2.4.15",
+ org.codehaus.groovy.transform.sc.transformers;version="2.4.15",
+ org.codehaus.groovy.transform.stc;version="2.4.15",
+ org.codehaus.groovy.transform.tailrec;version="2.4.15",
+ org.codehaus.groovy.transform.trait;version="2.4.15",
+ org.codehaus.groovy.util;version="2.4.15",
+ org.codehaus.groovy.vmplugin;version="2.4.15",
+ org.codehaus.groovy.vmplugin.v5;version="2.4.15",
+ org.codehaus.groovy.vmplugin.v6;version="2.4.15",
+ org.codehaus.groovy.vmplugin.v7;version="2.4.15",
+ org.codehaus.groovy.vmplugin.v8;version="2.4.15"
Require-Bundle: org.eclipse.core.runtime,
org.apache.ant;resolution:=optional,
org.junit;resolution:=optional
diff --git a/base/org.codehaus.groovy24/VERSION b/base/org.codehaus.groovy24/VERSION
index 3199babe2a..a4bb61d52e 100644
--- a/base/org.codehaus.groovy24/VERSION
+++ b/base/org.codehaus.groovy24/VERSION
@@ -9,3 +9,4 @@
2017-06-24: GROOVY_2_4_12
2017-11-23: GROOVY_2_4_13
2018-03-01: GROOVY_2_4_14
+2018-03-27: GROOVY_2_4_15
diff --git a/base/org.codehaus.groovy24/about.html b/base/org.codehaus.groovy24/about.html
index 7aecd57775..84035f589d 100644
--- a/base/org.codehaus.groovy24/about.html
+++ b/base/org.codehaus.groovy24/about.html
@@ -24,11 +24,11 @@ License
Third Party Content
-groovy-all-2.4.14.jar
+groovy-all-2.4.15.jar
-- Obtained from: https://dist.apache.org/repos/dist/dev/groovy/2.4.14/distribution/apache-groovy-binary-2.4.14.zip
-- Sources available at: https://dist.apache.org/repos/dist/dev/groovy/2.4.14/sources/apache-groovy-src-2.4.14.zip
+- Obtained from: https://dist.apache.org/repos/dist/dev/groovy/2.4.15/distribution/apache-groovy-binary-2.4.15.zip
+- Sources available at: https://dist.apache.org/repos/dist/dev/groovy/2.4.15/sources/apache-groovy-src-2.4.15.zip
- License kind: ASL
- License URL: http://www.apache.org/licenses/LICENSE-2.0.html
- License text: asl-v20.txt
diff --git a/base/org.codehaus.groovy24/build.antlr2x b/base/org.codehaus.groovy24/build.antlr2x
index bb38a3b254..9fc9afdae3 100644
--- a/base/org.codehaus.groovy24/build.antlr2x
+++ b/base/org.codehaus.groovy24/build.antlr2x
@@ -1,7 +1,7 @@
-
+
diff --git a/base/org.codehaus.groovy24/lib/groovy-all-2.4.14-javadoc.jar b/base/org.codehaus.groovy24/lib/groovy-all-2.4.14-javadoc.jar
deleted file mode 100644
index ab0d549c3a..0000000000
Binary files a/base/org.codehaus.groovy24/lib/groovy-all-2.4.14-javadoc.jar and /dev/null differ
diff --git a/base/org.codehaus.groovy24/lib/groovy-all-2.4.15-javadoc.jar b/base/org.codehaus.groovy24/lib/groovy-all-2.4.15-javadoc.jar
new file mode 100644
index 0000000000..7a41617a5c
Binary files /dev/null and b/base/org.codehaus.groovy24/lib/groovy-all-2.4.15-javadoc.jar differ
diff --git a/base/org.codehaus.groovy24/lib/groovy-all-2.4.14-sources.jar b/base/org.codehaus.groovy24/lib/groovy-all-2.4.15-sources.jar
similarity index 90%
rename from base/org.codehaus.groovy24/lib/groovy-all-2.4.14-sources.jar
rename to base/org.codehaus.groovy24/lib/groovy-all-2.4.15-sources.jar
index 6303f6c267..c4f9e8847c 100644
Binary files a/base/org.codehaus.groovy24/lib/groovy-all-2.4.14-sources.jar and b/base/org.codehaus.groovy24/lib/groovy-all-2.4.15-sources.jar differ
diff --git a/base/org.codehaus.groovy24/lib/groovy-all-2.4.14.jar b/base/org.codehaus.groovy24/lib/groovy-all-2.4.15.jar
similarity index 89%
rename from base/org.codehaus.groovy24/lib/groovy-all-2.4.14.jar
rename to base/org.codehaus.groovy24/lib/groovy-all-2.4.15.jar
index cc7f3bbe42..3c4f8f357d 100644
Binary files a/base/org.codehaus.groovy24/lib/groovy-all-2.4.14.jar and b/base/org.codehaus.groovy24/lib/groovy-all-2.4.15.jar differ
diff --git a/base/org.codehaus.groovy24/pom.xml b/base/org.codehaus.groovy24/pom.xml
index 6a6e445550..f54c926796 100644
--- a/base/org.codehaus.groovy24/pom.xml
+++ b/base/org.codehaus.groovy24/pom.xml
@@ -8,7 +8,7 @@
org.codehaus.groovy.eclipse
org.codehaus.groovy
- 2.4.14-SNAPSHOT
+ 2.4.15-SNAPSHOT
eclipse-plugin
diff --git a/base/org.codehaus.groovy24/src/groovy/grape/GrapeIvy.groovy b/base/org.codehaus.groovy24/src/groovy/grape/GrapeIvy.groovy
index c5f8930f8b..21c2ff749d 100644
--- a/base/org.codehaus.groovy24/src/groovy/grape/GrapeIvy.groovy
+++ b/base/org.codehaus.groovy24/src/groovy/grape/GrapeIvy.groovy
@@ -54,9 +54,7 @@ import java.util.zip.ZipException
import java.util.zip.ZipFile
/**
- * @author Danno Ferrin
- * @author Paul King
- * @author Roshan Dawrani (roshandawrani)
+ * Implementation supporting {@code @Grape} and {@code @Grab} annotations based on Ivy.
*/
class GrapeIvy implements GrapeEngine {
diff --git a/base/org.codehaus.groovy24/src/org/codehaus/groovy/activator/GroovyActivator.java b/base/org.codehaus.groovy24/src/org/codehaus/groovy/activator/GroovyActivator.java
index e11d81989c..986a4cd44f 100644
--- a/base/org.codehaus.groovy24/src/org/codehaus/groovy/activator/GroovyActivator.java
+++ b/base/org.codehaus.groovy24/src/org/codehaus/groovy/activator/GroovyActivator.java
@@ -30,7 +30,7 @@ public class GroovyActivator extends Plugin {
public static final String PLUGIN_ID = "org.codehaus.groovy";
- public static final String GROOVY_ALL_JAR = "lib/groovy-all-2.4.14.jar";
+ public static final String GROOVY_ALL_JAR = "lib/groovy-all-2.4.15.jar";
public static URL GROOVY_ALL_JAR_URL, GROOVY_JAR_URL;
diff --git a/base/org.codehaus.groovy24/src/org/codehaus/groovy/antlr/AntlrParserPlugin.java b/base/org.codehaus.groovy24/src/org/codehaus/groovy/antlr/AntlrParserPlugin.java
index ea0279e7ed..99b0bb4736 100644
--- a/base/org.codehaus.groovy24/src/org/codehaus/groovy/antlr/AntlrParserPlugin.java
+++ b/base/org.codehaus.groovy24/src/org/codehaus/groovy/antlr/AntlrParserPlugin.java
@@ -1018,16 +1018,14 @@ protected void enumConstantDef(AST node) {
}
}
}
- // GRECLIPSE edit
- //FieldNode enumField = EnumHelper.addEnumConstant(classNode, identifier, init);
- ClassNode nonDeclaredTypeOfEnumValue =
- ClassHelper.make(classNode.getName());
- nonDeclaredTypeOfEnumValue.setRedirect(classNode);
- FieldNode enumField = EnumHelper.addEnumConstant(nonDeclaredTypeOfEnumValue, classNode, identifier, init, savedLine, savedColumn);
+ FieldNode enumField = EnumHelper.addEnumConstant(classNode, identifier, init);
+ enumField.addAnnotations(annotations);
+ // GRECLIPSE add
+ enumField.setLineNumber(savedLine);
+ enumField.setColumnNumber(savedColumn);
enumField.setNameStart(locations.findOffset(savedLine, savedColumn));
enumField.setNameEnd(enumField.getNameStart() + identifier.length() - 1);
// GRECLIPSE end
- enumField.addAnnotations(annotations);
configureAST(enumField, node);
enumConstantBeingDef = false;
}
diff --git a/base/org.codehaus.groovy24/src/org/codehaus/groovy/antlr/EnumHelper.java b/base/org.codehaus.groovy24/src/org/codehaus/groovy/antlr/EnumHelper.java
deleted file mode 100644
index acd9328c72..0000000000
--- a/base/org.codehaus.groovy24/src/org/codehaus/groovy/antlr/EnumHelper.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.codehaus.groovy.antlr;
-
-import org.codehaus.groovy.ast.ClassHelper;
-import org.codehaus.groovy.ast.ClassNode;
-import org.codehaus.groovy.ast.FieldNode;
-import org.codehaus.groovy.ast.GenericsType;
-import org.codehaus.groovy.ast.InnerClassNode;
-import org.codehaus.groovy.ast.MixinNode;
-import org.codehaus.groovy.ast.expr.Expression;
-import org.codehaus.groovy.ast.expr.ListExpression;
-import groovyjarjarasm.asm.Opcodes;
-
-public class EnumHelper {
- private static final int FS = Opcodes.ACC_FINAL | Opcodes.ACC_STATIC;
- private static final int PUBLIC_FS = Opcodes.ACC_PUBLIC | FS;
-
- public static ClassNode makeEnumNode(String name, int modifiers, ClassNode[] interfaces, ClassNode outerClass) {
- modifiers = modifiers | Opcodes.ACC_FINAL | Opcodes.ACC_ENUM;
- ClassNode enumClass;
- if (outerClass==null) {
- enumClass = new ClassNode(name,modifiers,null,interfaces,MixinNode.EMPTY_ARRAY);
- } else {
- name = outerClass.getName() + "$" + name;
- enumClass = new InnerClassNode(outerClass,name,modifiers,null,interfaces,MixinNode.EMPTY_ARRAY);
- }
-
- // set super class and generics info
- // "enum X" -> class X extends Enum
- GenericsType gt = new GenericsType(enumClass);
- ClassNode superClass = ClassHelper.makeWithoutCaching("java.lang.Enum");
- superClass.setGenericsTypes(new GenericsType[]{gt});
- enumClass.setSuperClass(superClass);
- superClass.setRedirect(ClassHelper.Enum_Type);
-
- return enumClass;
- }
-
- // GRECLIPSE edit
- public static void addEnumConstant(ClassNode enumClass, String name, Expression init) {
- addEnumConstant(enumClass, enumClass, name, init, -1, -1);
- }
-
- // modified to return the FieldNode it creates, so that we can fix up the position
- public static FieldNode addEnumConstant(ClassNode enumClassType, ClassNode enumClassOwner, String name, Expression init, int lineNumber, int colNumber) {
- int modifiers = PUBLIC_FS | Opcodes.ACC_ENUM;
- if (init != null && !(init instanceof ListExpression)) {
- ListExpression list = new ListExpression();
- list.addExpression(init);
- init = list;
- }
- FieldNode fn = new FieldNode(name, modifiers, enumClassType.getPlainNodeReference(), enumClassOwner, init);
- fn.setLineNumber(lineNumber);
- fn.setColumnNumber(colNumber);
- enumClassOwner.addField(fn);
- return fn;
- }
- // GRECLIPSE end
-}
diff --git a/base/org.codehaus.groovy24/src/org/codehaus/groovy/antlr/SourceBuffer.java b/base/org.codehaus.groovy24/src/org/codehaus/groovy/antlr/SourceBuffer.java
index 0933ea7c9b..bf9ef9d510 100644
--- a/base/org.codehaus.groovy24/src/org/codehaus/groovy/antlr/SourceBuffer.java
+++ b/base/org.codehaus.groovy24/src/org/codehaus/groovy/antlr/SourceBuffer.java
@@ -28,17 +28,21 @@
* @author Jeremy Rayner
*/
public class SourceBuffer {
- // GRECLIPSE edit
- private final List lines = new ArrayList();
+ private final List lines;
+ private StringBuilder current;
+ // GRECLIPSE add
private final List lineEndings = new ArrayList();
- private StringBuilder current = new StringBuilder();
// GRECLIPSE-805: Support for unicode escape sequences
private UnicodeEscapingReader unescaper = new NoEscaper();
// GRECLIPSE end
public SourceBuffer() {
- // GRECLIPSE edit
+ lines = new ArrayList();
+ //lines.add(new StringBuilder()); // dummy row for position [0] in the List
+
+ current = new StringBuilder();
lines.add(current);
+ // GRECLIPSE add
lineEndings.add(0);
// GRECLIPSE end
}
@@ -158,8 +162,6 @@ public void setUnescaper(UnicodeEscapingReader unicodeEscapingReader) {
/**
* GRECLIPSE-805: Support for unicode escape sequences
- * @author Andrew Eisenberg
- * @created Mar 3, 2011
*/
class NoEscaper extends UnicodeEscapingReader {
public NoEscaper() {
diff --git a/extras/groovy-eclipse-batch-builder/build.properties b/extras/groovy-eclipse-batch-builder/build.properties
index 102c762c7d..835f9cadcb 100644
--- a/extras/groovy-eclipse-batch-builder/build.properties
+++ b/extras/groovy-eclipse-batch-builder/build.properties
@@ -1,5 +1,5 @@
# version numbers
-version2.4=2.4.14-01
+version2.4=2.4.15-01
version2.5=2.5.0-01
version2.6=2.6.0-01
@@ -9,7 +9,7 @@ do-24-build=true
#do-26-build=true
# Location of the plugins directory for the eclipse install
-eclipse.install.plugins=C:/Users/Public/Eclipse-4.7.2/plugins
+eclipse.install.plugins=C:/Users/Public/Eclipse-4.7.3a/plugins
# cloned git repo of groovy-eclipse
git.repo.loc=C:/Users/Name/workspace/groovy-eclipse
diff --git a/extras/groovy-eclipse-compiler-tests/pom.xml b/extras/groovy-eclipse-compiler-tests/pom.xml
index 92ea4f25d8..5df8d22b0c 100644
--- a/extras/groovy-eclipse-compiler-tests/pom.xml
+++ b/extras/groovy-eclipse-compiler-tests/pom.xml
@@ -8,9 +8,9 @@
- 2.4.14
+ 2.4.15
- 2.4.14-01
+ 2.4.15-01
3.1
diff --git a/ide/Feature-org.codehaus.groovy24.feature/feature.xml b/ide/Feature-org.codehaus.groovy24.feature/feature.xml
index 9de2231900..caeeccbaf2 100644
--- a/ide/Feature-org.codehaus.groovy24.feature/feature.xml
+++ b/ide/Feature-org.codehaus.groovy24.feature/feature.xml
@@ -27,7 +27,7 @@
id="org.codehaus.groovy"
download-size="0"
install-size="0"
- version="2.4.14.qualifier"
+ version="2.4.15.qualifier"
/>