You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by bo...@apache.org on 2017/02/20 16:59:00 UTC
[10/12] ant git commit: whitespace
whitespace
Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/96dc65b2
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/96dc65b2
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/96dc65b2
Branch: refs/heads/master
Commit: 96dc65b2dab50095571927a088ddcf8c3f46ac19
Parents: fd4ff01
Author: Stefan Bodewig <bo...@apache.org>
Authored: Mon Feb 20 17:52:50 2017 +0100
Committer: Stefan Bodewig <bo...@apache.org>
Committed: Mon Feb 20 17:52:50 2017 +0100
----------------------------------------------------------------------
.../apache/tools/ant/util/ScriptRunnerBase.java | 22 ++++++++++----------
.../ant/taskdefs/optional/RhinoScriptTest.java | 2 +-
2 files changed, 12 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant/blob/96dc65b2/src/main/org/apache/tools/ant/util/ScriptRunnerBase.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/util/ScriptRunnerBase.java b/src/main/org/apache/tools/ant/util/ScriptRunnerBase.java
index f78ee23..f2b6017 100644
--- a/src/main/org/apache/tools/ant/util/ScriptRunnerBase.java
+++ b/src/main/org/apache/tools/ant/util/ScriptRunnerBase.java
@@ -241,15 +241,15 @@ public abstract class ScriptRunnerBase {
final Charset charset;
if (null == encoding) {
- charset = null;
+ charset = null;
} else {
- charset = Charset.forName(encoding);
+ charset = Charset.forName(encoding);
}
try {
readSource(in, filename, charset);
} finally {
- FileUtils.close(in);
+ FileUtils.close(in);
}
}
@@ -283,14 +283,14 @@ public abstract class ScriptRunnerBase {
* @throws BuildException if the resource cannot be read
*/
public void loadResource(Resource sourceResource) {
- if (sourceResource instanceof StringResource) {
- script += ((StringResource) sourceResource).getValue();
- return;
- }
- if (sourceResource instanceof PropertyResource) {
- script += ((PropertyResource) sourceResource).getValue();
- return;
- }
+ if (sourceResource instanceof StringResource) {
+ script += ((StringResource) sourceResource).getValue();
+ return;
+ }
+ if (sourceResource instanceof PropertyResource) {
+ script += ((PropertyResource) sourceResource).getValue();
+ return;
+ }
String name = sourceResource.toLongString();
InputStream in = null;
http://git-wip-us.apache.org/repos/asf/ant/blob/96dc65b2/src/tests/junit/org/apache/tools/ant/taskdefs/optional/RhinoScriptTest.java
----------------------------------------------------------------------
diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/optional/RhinoScriptTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/optional/RhinoScriptTest.java
index 5b41d0f..b383ca9 100644
--- a/src/tests/junit/org/apache/tools/ant/taskdefs/optional/RhinoScriptTest.java
+++ b/src/tests/junit/org/apache/tools/ant/taskdefs/optional/RhinoScriptTest.java
@@ -35,7 +35,7 @@ public class RhinoScriptTest {
@Rule
public BuildFileRule buildRule = new BuildFileRule();
-
+
@Before
public void setUp() {
buildRule.configureProject("src/etc/testcases/taskdefs/optional/script.xml");