Matt Benson 3 years ago
parent
commit
a42d789dcd
8 changed files with 12 additions and 5 deletions
  1. +1
    -1
      manual/Tasks/local.html
  2. +1
    -1
      manual/Tasks/pathconvert.html
  3. +3
    -2
      manual/Tasks/scriptdef.html
  4. +1
    -0
      src/main/org/apache/tools/ant/BuildException.java
  5. +2
    -1
      src/main/org/apache/tools/ant/taskdefs/Local.java
  6. +1
    -0
      src/main/org/apache/tools/ant/taskdefs/PathConvert.java
  7. +2
    -0
      src/main/org/apache/tools/ant/taskdefs/optional/script/ScriptDef.java
  8. +1
    -0
      src/main/org/apache/tools/ant/util/ScriptManager.java

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

@@ -57,7 +57,7 @@ examples section.</p>
<h4>Name</h4> <h4>Name</h4>
<p>As an alternative to (or in conjunction with) the <code>name</code> attribute, the nested text of <p>As an alternative to (or in conjunction with) the <code>name</code> attribute, the nested text of
each of one or more nested <code>&lt;name&gt;</code> elements specifies a property name to declare in each of one or more nested <code>&lt;name&gt;</code> elements specifies a property name to declare in
the local scope.
the local scope. <em>Since Ant 1.10.13</em></p>


<h3>Examples</h3> <h3>Examples</h3>




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

@@ -71,7 +71,7 @@ nested <a href="../Types/mapper.html"><code>&lt;mapper&gt;</code></a> (<em>since
<tr> <tr>
<td>dest</td> <td>dest</td>
<td>A destination resource into which to write the converted path (Ant interprets this as a <td>A destination resource into which to write the converted path (Ant interprets this as a
<code>File</code> by default).
<code>File</code> by default). <em>Since Ant 1.10.13</em>
</td> </td>
<td>No, result will be logged if neither <code>@property</code> nor <code>@dest</code> is set</td> <td>No, result will be logged if neither <code>@property</code> nor <code>@dest</code> is set</td>
</tr> </tr>


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

@@ -137,7 +137,8 @@ the <a href="script.html"><code>&lt;script&gt;</code></a> task.</p>
<td>This attribute controls whether to set variables for all properties, references and targets <td>This attribute controls whether to set variables for all properties, references and targets
in the running script. If this attribute is <q>false</q>, only the <code>project</code> and in the running script. If this attribute is <q>false</q>, only the <code>project</code> and
<code>self</code> variables are set. If this attribute is <q>true</q> all the variables are <code>self</code> variables are set. If this attribute is <q>true</q> all the variables are
set.
set. <em>Since Ant 1.10.13</em>
</td>
<td>No; default <q>false</q> for backward compatibility</td> <td>No; default <q>false</q> for backward compatibility</td>
</tr> </tr>
</table> </table>
@@ -157,7 +158,7 @@ the <a href="script.html"><code>&lt;script&gt;</code></a> task.</p>
</tr> </tr>
<tr> <tr>
<td>default</td> <td>default</td>
<td>the default value of the attribute</td>
<td>the default value of the attribute <em>Since Ant 1.10.13</em></td>
<td>No</td> <td>No</td>
</tr> </tr>
</table> </table>


+ 1
- 0
src/main/org/apache/tools/ant/BuildException.java View File

@@ -28,6 +28,7 @@ public class BuildException extends RuntimeException {
* Get a {@link BuildException} for the specified {@link Throwable}. * Get a {@link BuildException} for the specified {@link Throwable}.
* @param t * @param t
* @return {@link BuildException} * @return {@link BuildException}
* @since Ant 1.10.13
*/ */
public static BuildException of(Throwable t) { public static BuildException of(Throwable t) {
if (t instanceof BuildException) { if (t instanceof BuildException) {


+ 2
- 1
src/main/org/apache/tools/ant/taskdefs/Local.java View File

@@ -24,7 +24,6 @@ import java.util.function.Consumer;
import org.apache.tools.ant.BuildException; import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Task; import org.apache.tools.ant.Task;
import org.apache.tools.ant.property.LocalProperties; import org.apache.tools.ant.property.LocalProperties;
import org.apache.tools.ant.util.StringUtils;


/** /**
* Task to create local properties in the current scope. * Task to create local properties in the current scope.
@@ -32,6 +31,7 @@ import org.apache.tools.ant.util.StringUtils;
public class Local extends Task { public class Local extends Task {
/** /**
* Nested {@code name} element. * Nested {@code name} element.
* @since Ant 1.10.13
*/ */
public static class Name implements Consumer<LocalProperties> { public static class Name implements Consumer<LocalProperties> {
private String text; private String text;
@@ -71,6 +71,7 @@ public class Local extends Task {
/** /**
* Create a nested {@code name} element. * Create a nested {@code name} element.
* @return {@link Name} * @return {@link Name}
* @since Ant 1.10.13
*/ */
public Name createName() { public Name createName() {
final Name result = new Name(); final Name result = new Name();


+ 1
- 0
src/main/org/apache/tools/ant/taskdefs/PathConvert.java View File

@@ -359,6 +359,7 @@ public class PathConvert extends Task {
/** /**
* Set destination resource. * Set destination resource.
* @param dest * @param dest
* @since Ant 1.10.13
*/ */
public void setDest(Resource dest) { public void setDest(Resource dest) {
if (dest != null) { if (dest != null) {


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

@@ -137,6 +137,7 @@ public class ScriptDef extends DefBase {
* Set the default value of this {@link Attribute}. * Set the default value of this {@link Attribute}.
* *
* @param defaultValue {@link String} * @param defaultValue {@link String}
* @since Ant 1.10.13
*/ */
public void setDefault(String defaultValue) { public void setDefault(String defaultValue) {
this.defaultValue = defaultValue; this.defaultValue = defaultValue;
@@ -147,6 +148,7 @@ public class ScriptDef extends DefBase {
* unset. * unset.
* *
* @return {@link String} * @return {@link String}
* @since Ant 1.10.13
*/ */
String getDefault() { String getDefault() {
return defaultValue; return defaultValue;


+ 1
- 0
src/main/org/apache/tools/ant/util/ScriptManager.java View File

@@ -19,6 +19,7 @@ package org.apache.tools.ant.util;


/** /**
* Script manager {@code enum}. * Script manager {@code enum}.
* @since Ant 1.10.13
*/ */
public enum ScriptManager { public enum ScriptManager {
auto, bsf, javax; auto, bsf, javax;

Loading…
Cancel
Save