You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@groovy.apache.org by pa...@apache.org on 2015/06/11 06:33:17 UTC
[5/5] incubator-groovy git commit: GROOVY-7423: minor refactor
(closes #38)
GROOVY-7423: minor refactor (closes #38)
Project: http://git-wip-us.apache.org/repos/asf/incubator-groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-groovy/commit/54e56856
Tree: http://git-wip-us.apache.org/repos/asf/incubator-groovy/tree/54e56856
Diff: http://git-wip-us.apache.org/repos/asf/incubator-groovy/diff/54e56856
Branch: refs/heads/master
Commit: 54e56856cddd428daac4ebc9841d0c9c10fd9d71
Parents: ab4f07a
Author: Paul King <pa...@asert.com.au>
Authored: Thu Jun 11 14:32:54 2015 +1000
Committer: Paul King <pa...@asert.com.au>
Committed: Thu Jun 11 14:32:54 2015 +1000
----------------------------------------------------------------------
gradle/pomconfigurer.gradle | 3 ++
.../groovy/control/CompilerConfiguration.java | 50 +++-----------------
.../groovy/tools/FileSystemCompiler.java | 7 +--
.../main/resources/groovy/ui/Console.properties | 9 ----
4 files changed, 12 insertions(+), 57 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/54e56856/gradle/pomconfigurer.gradle
----------------------------------------------------------------------
diff --git a/gradle/pomconfigurer.gradle b/gradle/pomconfigurer.gradle
index 9729d1b..43e2f56 100644
--- a/gradle/pomconfigurer.gradle
+++ b/gradle/pomconfigurer.gradle
@@ -561,6 +561,9 @@ project.ext.pomConfigureClosureWithoutTweaks = {
contributor {
name 'Yu Kobayashi'
}
+ contributor {
+ name 'Nick Grealy'
+ }
}
mailingLists {
mailingList {
http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/54e56856/src/main/org/codehaus/groovy/control/CompilerConfiguration.java
----------------------------------------------------------------------
diff --git a/src/main/org/codehaus/groovy/control/CompilerConfiguration.java b/src/main/org/codehaus/groovy/control/CompilerConfiguration.java
index de3efa8..90e5f4b 100644
--- a/src/main/org/codehaus/groovy/control/CompilerConfiguration.java
+++ b/src/main/org/codehaus/groovy/control/CompilerConfiguration.java
@@ -189,44 +189,12 @@ public class CompilerConfiguration {
setScriptBaseClass(null);
setRecompileGroovySource(false);
setMinimumRecompilationInterval(100);
- // TODO change following try/catches to use #safeGetSystemProperty(...) ??
- // Target bytecode
- String targetByteCode = null;
- try {
- targetByteCode = System.getProperty("groovy.target.bytecode", targetByteCode);
- } catch (Exception e) {
- // IGNORE
- }
- if(targetByteCode != null) {
- setTargetBytecode(targetByteCode);
- } else {
- setTargetBytecode(getVMVersion());
- }
- String tmpDefaultScriptExtension = null;
- try {
- tmpDefaultScriptExtension = System.getProperty("groovy.default.scriptExtension");
- } catch (Exception e) {
- // IGNORE
- }
- if(tmpDefaultScriptExtension != null) {
- setDefaultScriptExtension(tmpDefaultScriptExtension);
- } else {
- setDefaultScriptExtension(".groovy");
- }
+ setTargetBytecode(safeGetSystemProperty("groovy.target.bytecode", getVMVersion()));
+ setDefaultScriptExtension(safeGetSystemProperty("groovy.default.scriptExtension", ".groovy"));
- //
// Source file encoding
- String encoding = null;
- try {
- encoding = System.getProperty("file.encoding", "US-ASCII");
- } catch (Exception e) {
- // IGNORE
- }
- try {
- encoding = System.getProperty("groovy.source.encoding", encoding);
- } catch (Exception e) {
- // IGNORE
- }
+ String encoding = safeGetSystemProperty("file.encoding", "US-ASCII");
+ encoding = safeGetSystemProperty("groovy.source.encoding", encoding);
setSourceEncoding(encoding);
try {
@@ -235,13 +203,9 @@ public class CompilerConfiguration {
// IGNORE
}
- try {
- String target = System.getProperty("groovy.target.directory");
- if (target != null) {
- setTargetDirectory(target);
- }
- } catch (Exception e) {
- // IGNORE
+ String target = safeGetSystemProperty("groovy.target.directory");
+ if (target != null) {
+ setTargetDirectory(target);
}
boolean indy = false;
http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/54e56856/src/main/org/codehaus/groovy/tools/FileSystemCompiler.java
----------------------------------------------------------------------
diff --git a/src/main/org/codehaus/groovy/tools/FileSystemCompiler.java b/src/main/org/codehaus/groovy/tools/FileSystemCompiler.java
index 253e48f..177d480 100644
--- a/src/main/org/codehaus/groovy/tools/FileSystemCompiler.java
+++ b/src/main/org/codehaus/groovy/tools/FileSystemCompiler.java
@@ -295,11 +295,8 @@ public class FileSystemCompiler {
String[] flags = cli.getOptionValues("F");
if (flags != null && cli.hasOption("pa")){
- // convert to a list, so we can add a parameter...
- List<String> tmp = new ArrayList<String>(Arrays.asList(flags));
- tmp.add("parameters");
- // convert back to an array...
- flags = tmp.toArray(new String[tmp.size()]);
+ flags = Arrays.copyOf(flags, flags.length + 1);
+ flags[flags.length - 1] = "parameters";
}
compilerOptions.put("flags", flags);
http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/54e56856/subprojects/groovy-console/src/main/resources/groovy/ui/Console.properties
----------------------------------------------------------------------
diff --git a/subprojects/groovy-console/src/main/resources/groovy/ui/Console.properties b/subprojects/groovy-console/src/main/resources/groovy/ui/Console.properties
index 5884355..a9a94ee 100644
--- a/subprojects/groovy-console/src/main/resources/groovy/ui/Console.properties
+++ b/subprojects/groovy-console/src/main/resources/groovy/ui/Console.properties
@@ -16,15 +16,6 @@
# specific language governing permissions and limitations
# under the License.
#
-
-#
-# $Id$
-#
-
-#
-# CLI messages
-#
-
cli.option.help.description=Display this help message
cli.option.version.description=Display the version