bodewig 2005/02/01 23:59:37
Modified: src/main/org/apache/tools/ant/taskdefs Execute.java
src/main/org/apache/tools/ant/types PropertySet.java
Log:
Make Jikes happy
Revision Changes Path
1.89 +2 -2 ant/src/main/org/apache/tools/ant/taskdefs/Execute.java
Index: Execute.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Execute.java,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- Execute.java 28 Jan 2005 22:23:30 -0000 1.88
+++ Execute.java 2 Feb 2005 07:59:36 -0000 1.89
@@ -1162,7 +1162,7 @@
catch (InterruptedException e) {
//ignore
}
- FILE_UTILS.delete(f);
+ FileUtils.delete(f);
}
}.start();
}
1.24 +7 -7 ant/src/main/org/apache/tools/ant/types/PropertySet.java
Index: PropertySet.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/types/PropertySet.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- PropertySet.java 19 Jan 2005 18:33:09 -0000 1.23
+++ PropertySet.java 2 Feb 2005 07:59:37 -0000 1.24
@@ -166,11 +166,11 @@
* @param to output pattern.
*/
public void setMapper(String type, String from, String to) {
- Mapper mapper = createMapper();
+ Mapper m = createMapper();
Mapper.MapperType mapperType = new Mapper.MapperType();
mapperType.setValue(type);
- mapper.setFrom(from);
- mapper.setTo(to);
+ m.setFrom(from);
+ m.setTo(to);
}
/**
@@ -302,19 +302,19 @@
} else {
names = cachedNames;
}
- FileNameMapper mapper = null;
+ FileNameMapper m = null;
Mapper myMapper = getMapper();
if (myMapper != null) {
- mapper = myMapper.getImplementation();
+ m = myMapper.getImplementation();
}
Properties properties = new Properties();
//iterate through the names, get the matching values
for (Iterator iter = names.iterator(); iter.hasNext();) {
String name = (String) iter.next();
String value = (String) props.get(name);
- if (mapper != null) {
+ if (m != null) {
//map the names
- String[] newname = mapper.mapFileName(name);
+ String[] newname = m.mapFileName(name);
if (newname != null) {
name = newname[0];
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
