From c4815378efcf6cdbb3407c85b4fa4278eeec34be Mon Sep 17 00:00:00 2001 From: Sam Ruby Date: Wed, 23 Feb 2000 21:11:17 +0000 Subject: [PATCH] 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 --- src/main/org/apache/tools/ant/ProjectHelper.java | 2 +- .../apache/tools/ant/taskdefs/MatchingTask.java | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/main/org/apache/tools/ant/ProjectHelper.java b/src/main/org/apache/tools/ant/ProjectHelper.java index 2d5f6a004..4a36353ba 100644 --- a/src/main/org/apache/tools/ant/ProjectHelper.java +++ b/src/main/org/apache/tools/ant/ProjectHelper.java @@ -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); diff --git a/src/main/org/apache/tools/ant/taskdefs/MatchingTask.java b/src/main/org/apache/tools/ant/taskdefs/MatchingTask.java index 867cac4cc..5fe446d4f 100644 --- a/src/main/org/apache/tools/ant/taskdefs/MatchingTask.java +++ b/src/main/org/apache/tools/ant/taskdefs/MatchingTask.java @@ -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()+"/**"); } } }