You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by pa...@apache.org on 2016/03/11 17:09:18 UTC
groovy git commit: Deprecate CompilerConfiguration.output (closes
#277)
Repository: groovy
Updated Branches:
refs/heads/master 195af4bfd -> 09b8aa296
Deprecate CompilerConfiguration.output (closes #277)
as it is not used for anything.
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/09b8aa29
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/09b8aa29
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/09b8aa29
Branch: refs/heads/master
Commit: 09b8aa2963633403c75f8fbc93c2956e2ecf2743
Parents: 195af4b
Author: Jan Matějka <ja...@etnetera.cz>
Authored: Wed Mar 2 18:58:45 2016 +0100
Committer: pascalschumacher <pa...@gmx.net>
Committed: Fri Mar 11 17:08:58 2016 +0100
----------------------------------------------------------------------
.../groovy/control/CompilerConfiguration.java | 24 ++++++--------------
.../groovy/tools/javac/JavacJavaCompiler.java | 1 -
.../control/CompilerConfigurationTest.java | 12 ----------
3 files changed, 7 insertions(+), 30 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/groovy/blob/09b8aa29/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 f71808f..246fc86 100644
--- a/src/main/org/codehaus/groovy/control/CompilerConfiguration.java
+++ b/src/main/org/codehaus/groovy/control/CompilerConfiguration.java
@@ -85,11 +85,6 @@ public class CompilerConfiguration {
*/
private String sourceEncoding;
- /**
- * A <code>PrintWriter</code> for communicating with the user
- */
-
- private PrintWriter output;
/**
* Directory into which to write classes
@@ -206,6 +201,7 @@ public class CompilerConfiguration {
// IGNORE
}
+
String target = safeGetSystemProperty("groovy.target.directory");
if (target != null) {
setTargetDirectory(target);
@@ -297,7 +293,6 @@ public class CompilerConfiguration {
setTargetBytecode(configuration.getTargetBytecode());
setDefaultScriptExtension(configuration.getDefaultScriptExtension());
setSourceEncoding(configuration.getSourceEncoding());
- setOutput(configuration.getOutput());
setTargetDirectory(configuration.getTargetDirectory());
Map<String, Object> jointCompilationOptions = configuration.getJointCompilationOptions();
if (jointCompilationOptions != null) {
@@ -335,10 +330,6 @@ public class CompilerConfiguration {
* CompilerConfiguration myConfiguration = new CompilerConfiguration(CompilerConfiguration.DEFAULT);
* myConfiguration.setDebug(true);
* </pre>
- * Another reason to use the copy constructor rather than this one is that you
- * must call {@link #setOutput}. Calling <code>setOutput(null)</code> is valid and will
- * set up a <code>PrintWriter</code> to a bit bucket. The copy constructor will of course set
- * the same one as the original.
* <p>
* <table summary="Groovy Compiler Configuration Properties">
* <tr>
@@ -555,21 +546,20 @@ public class CompilerConfiguration {
/**
* Gets the currently configured output writer.
+ * @deprecated not used anymore
+ * @return PrintWriter always <code>null</code>
*/
+ @Deprecated
public PrintWriter getOutput() {
- return this.output;
+ return null;
}
/**
* Sets the output writer.
+ * @deprecated not used anymore, has no effect
*/
+ @Deprecated
public void setOutput(PrintWriter output) {
- if (output == null) {
- this.output = new PrintWriter(NullWriter.DEFAULT);
- }
- else {
- this.output = output;
- }
}
/**
http://git-wip-us.apache.org/repos/asf/groovy/blob/09b8aa29/src/main/org/codehaus/groovy/tools/javac/JavacJavaCompiler.java
----------------------------------------------------------------------
diff --git a/src/main/org/codehaus/groovy/tools/javac/JavacJavaCompiler.java b/src/main/org/codehaus/groovy/tools/javac/JavacJavaCompiler.java
index 80dddc6..606dd67 100644
--- a/src/main/org/codehaus/groovy/tools/javac/JavacJavaCompiler.java
+++ b/src/main/org/codehaus/groovy/tools/javac/JavacJavaCompiler.java
@@ -62,7 +62,6 @@ public class JavacJavaCompiler implements JavaCompiler {
Object ret = method.invoke(null, new Object[]{javacParameters});
javacReturnValue = (Integer) ret;
}
- cu.getConfiguration().getOutput();
} catch (InvocationTargetException ite) {
cu.getErrorCollector().addFatalError(new ExceptionMessage((Exception) ite.getCause(), true, cu));
} catch (Exception e) {
http://git-wip-us.apache.org/repos/asf/groovy/blob/09b8aa29/src/test/org/codehaus/groovy/control/CompilerConfigurationTest.java
----------------------------------------------------------------------
diff --git a/src/test/org/codehaus/groovy/control/CompilerConfigurationTest.java b/src/test/org/codehaus/groovy/control/CompilerConfigurationTest.java
index 7ec6742..3be37cc 100644
--- a/src/test/org/codehaus/groovy/control/CompilerConfigurationTest.java
+++ b/src/test/org/codehaus/groovy/control/CompilerConfigurationTest.java
@@ -64,7 +64,6 @@ public class CompilerConfigurationTest extends GroovyTestCase {
assertNotNull(listCP);
assertEquals(0, listCP.size());
}
- assertNotNull(config.getOutput());
assertNull(config.getTargetDirectory());
assertEquals(".groovy", config.getDefaultScriptExtension());
assertNull(config.getJointCompilationOptions());
@@ -102,7 +101,6 @@ public class CompilerConfigurationTest extends GroovyTestCase {
assertNotNull(listCP);
assertEquals(0, listCP.size());
}
- assertNotNull(config.getOutput());
assertNull(config.getTargetDirectory());
assertEquals(".groovy", config.getDefaultScriptExtension());
assertNull(config.getJointCompilationOptions());
@@ -124,9 +122,6 @@ public class CompilerConfigurationTest extends GroovyTestCase {
init.setRecompileGroovySource(true);
init.setClasspath("File1" + File.pathSeparator + "Somewhere");
- final PrintWriter initOut = new PrintWriter(System.out);
- init.setOutput(initOut);
-
final File initTDFile = new File("A wandering path");
init.setTargetDirectory(initTDFile);
init.setDefaultScriptExtension(".jpp");
@@ -153,7 +148,6 @@ public class CompilerConfigurationTest extends GroovyTestCase {
assertEquals("File1", listCP.get(0));
assertEquals("Somewhere", listCP.get(1));
}
- assertEquals(initOut, init.getOutput());
assertEquals(initTDFile, init.getTargetDirectory());
assertEquals(".jpp", init.getDefaultScriptExtension());
assertEquals(initJoint, init.getJointCompilationOptions());
@@ -175,7 +169,6 @@ public class CompilerConfigurationTest extends GroovyTestCase {
assertEquals("File1", listCP.get(0));
assertEquals("Somewhere", listCP.get(1));
}
- assertEquals(initOut, config.getOutput());
assertEquals(initTDFile, config.getTargetDirectory());
assertEquals(".jpp", config.getDefaultScriptExtension());
assertEquals(initJoint, config.getJointCompilationOptions());
@@ -198,9 +191,6 @@ public class CompilerConfigurationTest extends GroovyTestCase {
init.setRecompileGroovySource(false);
init.setClasspath("");
- final PrintWriter initOut = new PrintWriter(System.out);
- init.setOutput(initOut);
-
final File initTDFile = new File("A wandering path");
init.setTargetDirectory(initTDFile);
@@ -219,7 +209,6 @@ public class CompilerConfigurationTest extends GroovyTestCase {
assertNotNull(listCP);
assertEquals(0, listCP.size());
}
- assertEquals(initOut, init.getOutput());
assertEquals(initTDFile, init.getTargetDirectory());
final CompilerConfiguration config = new CompilerConfiguration(init);
@@ -237,7 +226,6 @@ public class CompilerConfigurationTest extends GroovyTestCase {
final List listCP = config.getClasspath();
assertEquals(0, listCP.size());
}
- assertEquals(initOut, config.getOutput());
assertEquals(initTDFile, config.getTargetDirectory());
}
}