minor fix-ups

eric-milles · eric-milles · commit b03ff24c8f43 · 2019-05-14T11:17:54.000-05:00
diff --git a/base/org.codehaus.groovy25/src/org/codehaus/groovy/control/CompilerConfiguration.java b/base/org.codehaus.groovy25/src/org/codehaus/groovy/control/CompilerConfiguration.java
@@ -135,7 +135,7 @@ public Set<String> getDisabledGlobalASTTransformations() {
 
         @Override
         public Map<String, Object> getJointCompilationOptions() {
-            return null;
+            return Collections.unmodifiableMap(super.getJointCompilationOptions());
         }
 
         @Override
@@ -213,6 +213,11 @@ public void setPluginFactory(ParserPluginFactory pluginFactory) {
             throw new UnsupportedOperationException();
         }
 
+        @Override
+        public void setPreviewFeatures(boolean previewFeatures) {
+            throw new UnsupportedOperationException();
+        }
+
         @Override
         public void setRecompileGroovySource(boolean recompile) {
             throw new UnsupportedOperationException();
@@ -264,7 +269,6 @@ public void setWarningLevel(int level) {
         }
     };
 
-
     /**
      * See {@link WarningMessage} for levels.
      */
@@ -918,7 +922,7 @@ public void setTargetBytecode(String version) {
     }
 
     private void setTargetBytecodeIfValid(String version) {
-        if (JDK_TO_BYTECODE_VERSION_MAP.keySet().contains(version)) {
+        if (JDK_TO_BYTECODE_VERSION_MAP.containsKey(version)) {
             this.targetBytecode = version;
         }
     }
@@ -1052,7 +1056,7 @@ public void setBytecodePostprocessor(final BytecodeProcessor bytecodePostprocess
      * Checks if invoke dynamic is enabled.
      */
     public boolean isIndyEnabled() {
-        Boolean indyEnabled = this.getOptimizationOptions().get(INVOKEDYNAMIC);
+        Boolean indyEnabled = getOptimizationOptions().get(INVOKEDYNAMIC);
         return Optional.ofNullable(indyEnabled).orElse(Boolean.FALSE).booleanValue();
     }
 }
diff --git a/base/org.codehaus.groovy30/src/org/codehaus/groovy/control/CompilerConfiguration.java b/base/org.codehaus.groovy30/src/org/codehaus/groovy/control/CompilerConfiguration.java
@@ -133,7 +133,7 @@ public class CompilerConfiguration {
      *  A convenience for getting a default configuration.  Do not modify it!
      *  See {@link #CompilerConfiguration(Properties)} for an example on how to
      *  make a suitable copy to modify.  But if you're really starting from a
-     *  default context, then you probably just want <code>new CompilerConfiguration()</code>. 
+     *  default context, then you probably just want <code>new CompilerConfiguration()</code>.
      */
     public static final CompilerConfiguration DEFAULT = new CompilerConfiguration() {
         @Override
@@ -231,6 +231,11 @@ public void setPluginFactory(ParserPluginFactory pluginFactory) {
             throw new UnsupportedOperationException();
         }
 
+        @Override
+        public void setPreviewFeatures(boolean previewFeatures) {
+            throw new UnsupportedOperationException();
+        }
+
         @Override
         public void setRecompileGroovySource(boolean recompile) {
             throw new UnsupportedOperationException();
@@ -282,7 +287,6 @@ public void setWarningLevel(int level) {
         }
     };
 
-
     /**
      * See {@link WarningMessage} for levels.
      */
@@ -407,7 +411,7 @@ public void setWarningLevel(int level) {
      * <blockquote>
      * <table summary="Groovy Compiler Configuration Properties">
      *   <tr><th>Property Key</th><th>Related Property Getter</th></tr>
-     *   <tr><td><code>groovy.antlr4</code></td><td>{@link #getParserVersion}</td></tr>
+     *   <tr><td><code>groovy.antlr4</code></td><td>{@link #getPluginFactory}</td></tr>
      *   <tr><td><code>groovy.source.encoding</code> (defaulting to <code>file.encoding</code>)</td><td>{@link #getSourceEncoding}</td></tr>
      *   <tr><td><code>groovy.target.bytecode</code></td><td>{@link #getTargetBytecode}</td></tr>
      *   <tr><td><code>groovy.target.directory</code></td><td>{@link #getTargetDirectory}</td></tr>

Original file line number	Diff line number	Diff line change
`@@ -135,7 +135,7 @@ public Set<String> getDisabledGlobalASTTransformations() {`
`135`	`135`
`136`	`136`	`@Override`
`137`	`137`	`public Map<String, Object> getJointCompilationOptions() {`
`138`		`- return null;`
	`138`	`+ return Collections.unmodifiableMap(super.getJointCompilationOptions());`
`139`	`139`	`}`
`140`	`140`
`141`	`141`	`@Override`
`@@ -213,6 +213,11 @@ public void setPluginFactory(ParserPluginFactory pluginFactory) {`
`213`	`213`	`throw new UnsupportedOperationException();`
`214`	`214`	`}`
`215`	`215`
	`216`	`+ @Override`
	`217`	`+ public void setPreviewFeatures(boolean previewFeatures) {`
	`218`	`+ throw new UnsupportedOperationException();`
	`219`	`+ }`
	`220`	`+`
`216`	`221`	`@Override`
`217`	`222`	`public void setRecompileGroovySource(boolean recompile) {`
`218`	`223`	`throw new UnsupportedOperationException();`
`@@ -264,7 +269,6 @@ public void setWarningLevel(int level) {`
`264`	`269`	`}`
`265`	`270`	`};`
`266`	`271`
`267`		`-`
`268`	`272`	`/**`
`269`	`273`	`* See {@link WarningMessage} for levels.`
`270`	`274`	`*/`
`@@ -918,7 +922,7 @@ public void setTargetBytecode(String version) {`
`918`	`922`	`}`
`919`	`923`
`920`	`924`	`private void setTargetBytecodeIfValid(String version) {`
`921`		`- if (JDK_TO_BYTECODE_VERSION_MAP.keySet().contains(version)) {`
	`925`	`+ if (JDK_TO_BYTECODE_VERSION_MAP.containsKey(version)) {`
`922`	`926`	`this.targetBytecode = version;`
`923`	`927`	`}`
`924`	`928`	`}`
`@@ -1052,7 +1056,7 @@ public void setBytecodePostprocessor(final BytecodeProcessor bytecodePostprocess`
`1052`	`1056`	`* Checks if invoke dynamic is enabled.`
`1053`	`1057`	`*/`
`1054`	`1058`	`public boolean isIndyEnabled() {`
`1055`		`- Boolean indyEnabled = this.getOptimizationOptions().get(INVOKEDYNAMIC);`
	`1059`	`+ Boolean indyEnabled = getOptimizationOptions().get(INVOKEDYNAMIC);`
`1056`	`1060`	`return Optional.ofNullable(indyEnabled).orElse(Boolean.FALSE).booleanValue();`
`1057`	`1061`	`}`
`1058`	`1062`	`}`