Skip to content

Commit c7dc75b

Browse files
eric-milleseric-milles
committed
missed in commit 93281a9 
1 parent fc282f8 commit c7dc75b

File tree

6 files changed

+12
-6
lines changed

6 files changed

+12
-6
lines changed

‎jdt-patch/e410/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/JavaProject.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -2153,8 +2153,9 @@ public Map<String, String> getOptions(boolean inheritJavaCoreOptions) {
21532153

21542154
// GROOVY add
21552155
private void setGroovyOptions(final Map<String, String> options) {
2156-
options.put(CompilerOptions.OPTIONG_GroovyProjectName, getElementName());
2156+
if (!getElementName().trim().isEmpty())
21572157
try {
2158+
options.put(CompilerOptions.OPTIONG_GroovyProjectName, getElementName());
21582159
if (getProject().hasNature("org.eclipse.jdt.groovy.core.groovyNature")) { //$NON-NLS-1$
21592160
options.put(CompilerOptions.OPTIONG_BuildGroovyFiles, CompilerOptions.ENABLED);
21602161
options.put(CompilerOptions.OPTIONG_GroovyFlags, String.valueOf(getProject().getFolder("grails-app").exists() ? CompilerOptions.IsGrails : 0)); //$NON-NLS-1$

‎jdt-patch/e411/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/JavaProject.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -2157,8 +2157,9 @@ public Map<String, String> getOptions(boolean inheritJavaCoreOptions) {
21572157

21582158
// GROOVY add
21592159
private void setGroovyOptions(final Map<String, String> options) {
2160-
options.put(CompilerOptions.OPTIONG_GroovyProjectName, getElementName());
2160+
if (!getElementName().trim().isEmpty())
21612161
try {
2162+
options.put(CompilerOptions.OPTIONG_GroovyProjectName, getElementName());
21622163
if (getProject().hasNature("org.eclipse.jdt.groovy.core.groovyNature")) { //$NON-NLS-1$
21632164
options.put(CompilerOptions.OPTIONG_BuildGroovyFiles, CompilerOptions.ENABLED);
21642165
options.put(CompilerOptions.OPTIONG_GroovyFlags, String.valueOf(getProject().getFolder("grails-app").exists() ? CompilerOptions.IsGrails : 0)); //$NON-NLS-1$

‎jdt-patch/e412/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/JavaProject.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -2154,8 +2154,9 @@ public Map<String, String> getOptions(boolean inheritJavaCoreOptions) {
21542154

21552155
// GROOVY add
21562156
private void setGroovyOptions(final Map<String, String> options) {
2157-
options.put(CompilerOptions.OPTIONG_GroovyProjectName, getElementName());
2157+
if (!getElementName().trim().isEmpty())
21582158
try {
2159+
options.put(CompilerOptions.OPTIONG_GroovyProjectName, getElementName());
21592160
if (getProject().hasNature("org.eclipse.jdt.groovy.core.groovyNature")) { //$NON-NLS-1$
21602161
options.put(CompilerOptions.OPTIONG_BuildGroovyFiles, CompilerOptions.ENABLED);
21612162
options.put(CompilerOptions.OPTIONG_GroovyFlags, String.valueOf(getProject().getFolder("grails-app").exists() ? CompilerOptions.IsGrails : 0)); //$NON-NLS-1$

‎jdt-patch/e413/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/JavaProject.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -2148,8 +2148,9 @@ public Map<String, String> getOptions(boolean inheritJavaCoreOptions) {
21482148

21492149
// GROOVY add
21502150
private void setGroovyOptions(final Map<String, String> options) {
2151-
options.put(CompilerOptions.OPTIONG_GroovyProjectName, getElementName());
2151+
if (!getElementName().trim().isEmpty())
21522152
try {
2153+
options.put(CompilerOptions.OPTIONG_GroovyProjectName, getElementName());
21532154
if (getProject().hasNature("org.eclipse.jdt.groovy.core.groovyNature")) { //$NON-NLS-1$
21542155
options.put(CompilerOptions.OPTIONG_BuildGroovyFiles, CompilerOptions.ENABLED);
21552156
options.put(CompilerOptions.OPTIONG_GroovyFlags, String.valueOf(getProject().getFolder("grails-app").exists() ? CompilerOptions.IsGrails : 0)); //$NON-NLS-1$

‎jdt-patch/e414/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/JavaProject.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -2167,8 +2167,9 @@ public Map<String, String> getOptions(boolean inheritJavaCoreOptions) {
21672167

21682168
// GROOVY add
21692169
private void setGroovyOptions(final Map<String, String> options) {
2170-
options.put(CompilerOptions.OPTIONG_GroovyProjectName, getElementName());
2170+
if (!getElementName().trim().isEmpty())
21712171
try {
2172+
options.put(CompilerOptions.OPTIONG_GroovyProjectName, getElementName());
21722173
if (getProject().hasNature("org.eclipse.jdt.groovy.core.groovyNature")) { //$NON-NLS-1$
21732174
options.put(CompilerOptions.OPTIONG_BuildGroovyFiles, CompilerOptions.ENABLED);
21742175
options.put(CompilerOptions.OPTIONG_GroovyFlags, String.valueOf(getProject().getFolder("grails-app").exists() ? CompilerOptions.IsGrails : 0)); //$NON-NLS-1$

‎jdt-patch/e49/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/JavaProject.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -2144,8 +2144,9 @@ public Map<String, String> getOptions(boolean inheritJavaCoreOptions) {
21442144

21452145
// GROOVY add
21462146
private void setGroovyOptions(final Map<String, String> options) {
2147-
options.put(CompilerOptions.OPTIONG_GroovyProjectName, getElementName());
2147+
if (!getElementName().trim().isEmpty())
21482148
try {
2149+
options.put(CompilerOptions.OPTIONG_GroovyProjectName, getElementName());
21492150
if (getProject().hasNature("org.eclipse.jdt.groovy.core.groovyNature")) { //$NON-NLS-1$
21502151
options.put(CompilerOptions.OPTIONG_BuildGroovyFiles, CompilerOptions.ENABLED);
21512152
options.put(CompilerOptions.OPTIONG_GroovyFlags, String.valueOf(getProject().getFolder("grails-app").exists() ? CompilerOptions.IsGrails : 0)); //$NON-NLS-1$

0 commit comments

Comments
 (0)