peterreilly 2005/03/25 04:29:22
Modified: . Tag: ANT_16_BRANCH WHATSNEW
docs/manual/CoreTypes Tag: ANT_16_BRANCH mapper.html
src/main/org/apache/tools/ant/util Tag: ANT_16_BRANCH
GlobPatternMapper.java RegexpPatternMapper.java
Log:
sync:change name of handledirchar to handledirsep to be similar to pathconvet
Revision Changes Path
No revision
No revision
1.503.2.208 +1 -1 ant/WHATSNEW
Index: WHATSNEW
===================================================================
RCS file: /home/cvs/ant/WHATSNEW,v
retrieving revision 1.503.2.207
retrieving revision 1.503.2.208
diff -u -r1.503.2.207 -r1.503.2.208
--- WHATSNEW 24 Mar 2005 08:36:40 -0000 1.503.2.207
+++ WHATSNEW 25 Mar 2005 12:29:22 -0000 1.503.2.208
@@ -58,7 +58,7 @@
* added casesensitive attribute to <globmapper> and <regexpmapper>
Bugzilla report 16686
-* added handledirchar attribute to <globmapper> and <regexpmapper>
+* added handledirsep attribute to <globmapper> and <regexpmapper>
Bugzilla report 32487
* added a new mapper <filtermapper>
No revision
No revision
1.13.2.10 +4 -4 ant/docs/manual/CoreTypes/mapper.html
Index: mapper.html
===================================================================
RCS file: /home/cvs/ant/docs/manual/CoreTypes/mapper.html,v
retrieving revision 1.13.2.9
retrieving revision 1.13.2.10
diff -u -r1.13.2.9 -r1.13.2.10
--- mapper.html 21 Jan 2005 07:12:41 -0000 1.13.2.9
+++ mapper.html 25 Mar 2005 12:29:22 -0000 1.13.2.10
@@ -70,7 +70,7 @@
this separator, use <code>${file.separator}</code> instead.
For the regexpmapper, <code>${file.separator}</code> will not work,
as on windows it is the '\' character, and this is an escape character
-for regular expressions, one should use the <code>handledirchar</code>
attribute
+for regular expressions, one should use the <code>handledirsep</code>
attribute
instead.
</p>
<h3>Parameters specified as nested elements</h3>
@@ -264,7 +264,7 @@
<td align="center" valign="top">No</td>
</tr>
<tr>
- <td valign="top">handledirchar</td>
+ <td valign="top">handledirsep</td>
<td valign="top">
If this is specified, the mapper will ignore the difference between
the normal
directory separator characters - \ and /.
@@ -479,7 +479,7 @@
<td align="center" valign="top">No</td>
</tr>
<tr>
- <td valign="top">handledirchar</td>
+ <td valign="top">handledirsep</td>
<td valign="top">
If this is specified, the mapper will treat a \ character in a
filename
as a / for the purposes of matching.
@@ -512,7 +512,7 @@
<pathconvert property="hd.prop" targetos="windows">
<path path="d\e/f\j.java"/>
<chainedmapper>
- <regexpmapper from="${basedir}/d/e/(.*)" to="\1"
handledirchar="yes"/>
+ <regexpmapper from="${basedir}/d/e/(.*)" to="\1"
handledirsep="yes"/>
</chainedmapper>
</pathconvert>
</pre>
No revision
No revision
1.6.2.6 +5 -5
ant/src/main/org/apache/tools/ant/util/GlobPatternMapper.java
Index: GlobPatternMapper.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/util/GlobPatternMapper.java,v
retrieving revision 1.6.2.5
retrieving revision 1.6.2.6
diff -u -r1.6.2.5 -r1.6.2.6
--- GlobPatternMapper.java 28 Jan 2005 10:06:24 -0000 1.6.2.5
+++ GlobPatternMapper.java 25 Mar 2005 12:29:22 -0000 1.6.2.6
@@ -62,17 +62,17 @@
*/
protected String toPostfix = null;
- private boolean handleDirChar = false;
+ private boolean handleDirSep = false;
private boolean caseSensitive = true;
/**
* Attribute specifing whether to ignore the difference
* between / and \ (the two common directory characters).
- * @param handleDirChar a boolean, default is false.
+ * @param handleDirSep a boolean, default is false.
* @since Ant 1.6.3
*/
- public void setHandleDirChar(boolean handleDirChar) {
- this.handleDirChar = handleDirChar;
+ public void setHandleDirSep(boolean handleDirSep) {
+ this.handleDirSep = handleDirSep;
}
/**
@@ -156,7 +156,7 @@
if (!caseSensitive) {
name = name.toLowerCase();
}
- if (handleDirChar) {
+ if (handleDirSep) {
if (name.indexOf('\\') != -1) {
name = name.replace('\\', '/');
}
1.10.2.6 +5 -5
ant/src/main/org/apache/tools/ant/util/RegexpPatternMapper.java
Index: RegexpPatternMapper.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/util/RegexpPatternMapper.java,v
retrieving revision 1.10.2.5
retrieving revision 1.10.2.6
diff -u -r1.10.2.5 -r1.10.2.6
--- RegexpPatternMapper.java 28 Jan 2005 10:06:24 -0000 1.10.2.5
+++ RegexpPatternMapper.java 25 Mar 2005 12:29:22 -0000 1.10.2.6
@@ -40,17 +40,17 @@
reg = (new RegexpMatcherFactory()).newRegexpMatcher();
}
- private boolean handleDirChar = false;
+ private boolean handleDirSep = false;
private int regexpOptions = 0;
/**
* Attribute specifing whether to ignore the difference
* between / and \ (the two common directory characters).
- * @param handleDirChar a boolean, default is false.
+ * @param handleDirSep a boolean, default is false.
* @since Ant 1.6.3
*/
- public void setHandleDirChar(boolean handleDirChar) {
- this.handleDirChar = handleDirChar;
+ public void setHandleDirSep(boolean handleDirSep) {
+ this.handleDirSep = handleDirSep;
}
/**
@@ -102,7 +102,7 @@
* null if the to pattern did not match
*/
public String[] mapFileName(String sourceFileName) {
- if (handleDirChar) {
+ if (handleDirSep) {
if (sourceFileName.indexOf("\\") != -1) {
sourceFileName = sourceFileName.replace('\\', '/');
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
