Browse Source

Change design pattern for nested elements from "addBar" to "createBar"

based on a suggestion by Costin.


git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@267613 13f79535-47bb-0310-9956-ffa450edef68
master
Sam Ruby 25 years ago
parent
commit
c4815378ef
2 changed files with 8 additions and 8 deletions
  1. +1
    -1
      src/main/org/apache/tools/ant/ProjectHelper.java
  2. +7
    -7
      src/main/org/apache/tools/ant/taskdefs/MatchingTask.java

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

@@ -253,7 +253,7 @@ public class ProjectHelper {
if (node.getNodeType() == Node.ELEMENT_NODE) {
Element element = (Element)node;
String propType = element.getTagName();
String methodName = "add" +
String methodName = "create" +
Character.toUpperCase(propType.charAt(0)) +
propType.substring(1);



+ 7
- 7
src/main/org/apache/tools/ant/taskdefs/MatchingTask.java View File

@@ -102,7 +102,7 @@ public abstract class MatchingTask extends Task {
/**
* add a name entry on the include list
*/
public NameEntry addInclude() {
public NameEntry createInclude() {
NameEntry result = new NameEntry();
includeList.addElement(result);
return result;
@@ -111,7 +111,7 @@ public abstract class MatchingTask extends Task {
/**
* add a name entry on the exclude list
*/
public NameEntry addExclude() {
public NameEntry createExclude() {
NameEntry result = new NameEntry();
excludeList.addElement(result);
return result;
@@ -125,7 +125,7 @@ public abstract class MatchingTask extends Task {
*/
public void setIncludes(String includes) {
if (includes != null && includes.length() > 0) {
addInclude().setName(includes);
createInclude().setName(includes);
}
}

@@ -141,13 +141,13 @@ public abstract class MatchingTask extends Task {
"Please use the includes attribute.",
Project.MSG_WARN);
if (itemString == null || itemString.equals("*")) {
addInclude().setName("**");
createInclude().setName("**");
} else {
StringTokenizer tok = new StringTokenizer(itemString, ", ");
while (tok.hasMoreTokens()) {
String pattern = tok.nextToken().trim();
if (pattern.length() > 0) {
addInclude().setName(pattern+"/**");
createInclude().setName(pattern+"/**");
}
}
}
@@ -161,7 +161,7 @@ public abstract class MatchingTask extends Task {
*/
public void setExcludes(String excludes) {
if (excludes != null && excludes.length() > 0) {
addExclude().setName(excludes);
createExclude().setName(excludes);
}
}

@@ -179,7 +179,7 @@ public abstract class MatchingTask extends Task {
Vector tmpExcludes = new Vector();
StringTokenizer tok = new StringTokenizer(ignoreString, ", ", false);
while (tok.hasMoreTokens()) {
addExclude().setName("**/"+tok.nextToken().trim()+"/**");
createExclude().setName("**/"+tok.nextToken().trim()+"/**");
}
}
}


Loading…
Cancel
Save