Browse Source

accepted the PR too late for 1.10.1

master
Stefan Bodewig 8 years ago
parent
commit
fd4ff0120a
9 changed files with 15 additions and 15 deletions
  1. +1
    -1
      manual/Tasks/conditions.html
  2. +1
    -1
      manual/Tasks/script.html
  3. +2
    -2
      manual/Tasks/scriptdef.html
  4. +1
    -1
      manual/Types/filterchain.html
  5. +1
    -1
      manual/Types/mapper.html
  6. +1
    -1
      manual/Types/selectors.html
  7. +2
    -2
      src/main/org/apache/tools/ant/taskdefs/optional/script/ScriptDef.java
  8. +3
    -3
      src/main/org/apache/tools/ant/util/ScriptRunnerBase.java
  9. +3
    -3
      src/main/org/apache/tools/ant/util/ScriptRunnerHelper.java

+ 1
- 1
manual/Tasks/conditions.html View File

@@ -538,7 +538,7 @@ an explanation of scripts and dependencies.
</tr>
<tr>
<td valign="top">encoding</td>
<td valign="top">The encoding of the script source. <em>since Ant 1.10.1.</em></td>
<td valign="top">The encoding of the script source. <em>since Ant 1.10.2.</em></td>
<td valign="top" align="center">No - defaults to default JVM encoding</td>
</tr>
<tr>


+ 1
- 1
manual/Tasks/script.html View File

@@ -104,7 +104,7 @@ different location values.</p>
</tr>
<tr>
<td valign="top">encoding</td>
<td valign="top">The encoding of the script as a file. <em>since Ant 1.10.1.</em></td>
<td valign="top">The encoding of the script as a file. <em>since Ant 1.10.2.</em></td>
<td valign="top" align="center">No - defaults to default JVM encoding</td>
</tr>
<tr>


+ 2
- 2
manual/Tasks/scriptdef.html View File

@@ -117,7 +117,7 @@ more information on writing scripts, please refer to the
</tr>
<tr>
<td valign="top">encoding</td>
<td valign="top">The encoding of the script as a file. <em>since Ant 1.10.1.</em></td>
<td valign="top">The encoding of the script as a file. <em>since Ant 1.10.2.</em></td>
<td valign="top" align="center">No - defaults to default JVM encoding</td>
</tr>
<tr>
@@ -126,7 +126,7 @@ more information on writing scripts, please refer to the
evaluation for faster multiple executions, on the condition that the <em>manager</em> is "javax" and the
target engine implements <code>javax.script.Compilable</code>.
Note that the <code>bsf</code> manager may automatically compiles the script.
<em>since Ant 1.10.1.</em></td>
<em>since Ant 1.10.2.</em></td>
<td valign="top" align="center">No - defaults to false</td>
</tr>
<tr>


+ 1
- 1
manual/Types/filterchain.html View File

@@ -1567,7 +1567,7 @@ Must be a supported Apache BSF or JSR 223 language</td>
</tr>
<tr>
<td valign="top">encoding</td>
<td valign="top">The encoding of the script as a file. <em>since Ant 1.10.1.</em></td>
<td valign="top">The encoding of the script as a file. <em>since Ant 1.10.2.</em></td>
<td valign="top" align="center">No - defaults to default JVM encoding</td>
</tr>
<tr>


+ 1
- 1
manual/Types/mapper.html View File

@@ -807,7 +807,7 @@ an explanation of scripts and dependencies.
</tr>
<tr>
<td valign="top">encoding</td>
<td valign="top">The encoding of the script as a file. <em>since Ant 1.10.1.</em></td>
<td valign="top">The encoding of the script as a file. <em>since Ant 1.10.2.</em></td>
<td valign="top" align="center">No - defaults to default JVM encoding</td>
</tr>
<tr>


+ 1
- 1
manual/Types/selectors.html View File

@@ -1109,7 +1109,7 @@
</tr>
<tr>
<td valign="top">encoding</td>
<td valign="top">The encoding of the script as a file. <em>since Ant 1.10.1.</em></td>
<td valign="top">The encoding of the script as a file. <em>since Ant 1.10.2.</em></td>
<td valign="top" align="center">No - defaults to default JVM encoding</td>
</tr>
<tr>


+ 2
- 2
src/main/org/apache/tools/ant/taskdefs/optional/script/ScriptDef.java View File

@@ -375,7 +375,7 @@ public class ScriptDef extends DefBase {
* Defines the compilation feature ; optional.
*
* @param compiled enables the script compilation if available.
* @since Ant 1.10.1
* @since Ant 1.10.2
*/
public void setCompiled(boolean compiled) {
helper.setCompiled(compiled);
@@ -394,7 +394,7 @@ public class ScriptDef extends DefBase {
* Sets the encoding of the script from an external file ; optional.
*
* @param encoding the encoding of the file containing the script source.
* @since Ant 1.10.1
* @since Ant 1.10.2
*/
public void setEncoding(String encoding) {
helper.setEncoding(encoding);


+ 3
- 3
src/main/org/apache/tools/ant/util/ScriptRunnerBase.java View File

@@ -196,7 +196,7 @@ public abstract class ScriptRunnerBase {

/**
* Whether to use script compilation if available.
* @since Ant 1.10.1
* @since Ant 1.10.2
* @param compiled if true, compile the script if possible.
*/
public final void setCompiled(boolean compiled) {
@@ -205,7 +205,7 @@ public abstract class ScriptRunnerBase {

/**
* Get the compiled attribute.
* @since Ant 1.10.1
* @since Ant 1.10.2
* @return the attribute.
*/
public final boolean getCompiled() {
@@ -214,7 +214,7 @@ public abstract class ScriptRunnerBase {

/**
* Set encoding of the script from an external file; optional.
* @since Ant 1.10.1
* @since Ant 1.10.2
* @param encoding encoding of the external file containing the script source.
*/
public void setEncoding(String encoding) {


+ 3
- 3
src/main/org/apache/tools/ant/util/ScriptRunnerHelper.java View File

@@ -118,7 +118,7 @@ public class ScriptRunnerHelper {
/**
* Get the external script file ; optional.
* @return the file containing the script source.
* @since Ant 1.10.1
* @since Ant 1.10.2
*/
public File getSrc() {
return srcFile;
@@ -128,7 +128,7 @@ public class ScriptRunnerHelper {
* Set the encoding of the script from an external file ; optional.
*
* @param encoding the encoding of the file containing the script source.
* @since Ant 1.10.1
* @since Ant 1.10.2
*/
public void setEncoding(String encoding) {
this.encoding = encoding;
@@ -137,7 +137,7 @@ public class ScriptRunnerHelper {
/**
* Get the external file encoding.
* @return the encoding of the file containing the script source.
* @since Ant 1.10.1
* @since Ant 1.10.2
*/
public String getEncoding() {
return encoding;


Loading…
Cancel
Save