- style name hiding
Kev
Index: Project.java
===================================================================
RCS file: /home/cvspublic/ant/src/main/org/apache/tools/ant/Project.java,v
retrieving revision 1.183
diff -u -r1.183 Project.java
--- Project.java 14 Jan 2005 10:09:23 -0000 1.183
+++ Project.java 2 Feb 2005 11:22:16 -0000
@@ -464,15 +464,15 @@
/**
* Returns the value of a property, if it is set.
*
- * @param name The name of the property.
+ * @param propName The name of the property.
* May be <code>null</code>, in which case
* the return value is also <code>null</code>.
* @return the property value, or <code>null</code> for no match
* or if a <code>null</code> name is provided.
*/
- public String getProperty(String name) {
+ public String getProperty(String propName) {
PropertyHelper ph = PropertyHelper.getPropertyHelper(this);
- return (String) ph.getProperty(null, name);
+ return (String) ph.getProperty(null, propName);
}
/**
@@ -498,15 +498,15 @@
/**
* Returns the value of a user property, if it is set.
*
- * @param name The name of the property.
+ * @param propName The name of the property.
* May be <code>null</code>, in which case
* the return value is also <code>null</code>.
* @return the property value, or <code>null</code> for no match
* or if a <code>null</code> name is provided.
*/
- public String getUserProperty(String name) {
+ public String getUserProperty(String propName) {
PropertyHelper ph = PropertyHelper.getPropertyHelper(this);
- return (String) ph.getUserProperty(null, name);
+ return (String) ph.getUserProperty(null, propName);
}
/**
@@ -1555,15 +1555,15 @@
* a way that the sequence of Targets up to the root
* target is the minimum possible such sequence.
* Must not be <code>null</code>.
- * @param targets A Hashtable mapping names to Targets.
+ * @param targetsToSort A Hashtable mapping names to Targets.
* Must not be <code>null</code>.
* @return a Vector of ALL Target objects in sorted order.
* @exception BuildException if there is a cyclic dependency among the
* targets, or if a named target does not exist.
*/
- public final Vector topoSort(String root, Hashtable targets)
+ public final Vector topoSort(String root, Hashtable targetsToSort)
throws BuildException {
- return topoSort(new String[] {root}, targets, true);
+ return topoSort(new String[] {root}, targetsToSort, true);
}
/**
@@ -1574,7 +1574,7 @@
* a way that the sequence of Targets up to the root
* target is the minimum possible such sequence.
* Must not be <code>null</code>.
- * @param targets A Hashtable mapping names to Targets.
+ * @param targetsToSort A Hashtable mapping names to Targets.
* Must not be <code>null</code>.
* @param returnAll <code>boolean</code> indicating whether to return all
* targets, or the execution sequence only.
@@ -1583,9 +1583,9 @@
* targets, or if a named target does not exist.
* @since Ant 1.6.3
*/
- public final Vector topoSort(String root, Hashtable targets,
+ public final Vector topoSort(String root, Hashtable targetsToSort,
boolean returnAll) throws BuildException {
- return topoSort(new String[] {root}, targets, returnAll);
+ return topoSort(new String[] {root}, targetsToSort, returnAll);
}
/**
@@ -1596,7 +1596,7 @@
* Targets is the minimum possible such sequence to the
specified
* root targets.
* Must not be <code>null</code>.
- * @param targets A map of names to targets (String to Target).
+ * @param targetsToSort A map of names to targets (String to Target).
* Must not be <code>null</code>.
* @param returnAll <code>boolean</code> indicating whether to return all
* targets, or the execution sequence only.
@@ -1605,7 +1605,7 @@
* targets, or if a named target does not exist.
* @since Ant 1.6.3
*/
- public final Vector topoSort(String[] root, Hashtable targets,
+ public final Vector topoSort(String[] root, Hashtable targetsToSort,
boolean returnAll) throws BuildException {
Vector ret = new Vector();
Hashtable state = new Hashtable();
@@ -1622,7 +1622,7 @@
for (int i = 0; i < root.length; i++) {
String st = (String) (state.get(root[i]));
if (st == null) {
- tsort(root[i], targets, state, visiting, ret);
+ tsort(root[i], targetsToSort, state, visiting, ret);
} else if (st == VISITING) {
throw new RuntimeException("Unexpected node in visiting state:
"
+ root[i]);
@@ -1637,11 +1637,11 @@
log(buf.toString(), MSG_VERBOSE);
Vector complete = (returnAll) ? ret : new Vector(ret);
- for (Enumeration en = targets.keys(); en.hasMoreElements();) {
+ for (Enumeration en = targetsToSort.keys(); en.hasMoreElements();) {
String curTarget = (String) en.nextElement();
String st = (String) state.get(curTarget);
if (st == null) {
- tsort(curTarget, targets, state, visiting, complete);
+ tsort(curTarget, targetsToSort, state, visiting, complete);
} else if (st == VISITING) {
throw new RuntimeException("Unexpected node in visiting state:
"
+ curTarget);
@@ -1675,7 +1675,7 @@
*
* @param root The current target to inspect.
* Must not be <code>null</code>.
- * @param targets A mapping from names to targets (String to Target).
+ * @param targetsToSort A mapping from names to targets (String to Target).
* Must not be <code>null</code>.
* @param state A mapping from target names to states
* (String to String).
@@ -1691,14 +1691,14 @@
* @exception BuildException if a non-existent target is specified or if
* a circular dependency is detected.
*/
- private final void tsort(String root, Hashtable targets,
+ private final void tsort(String root, Hashtable targetsToSort,
Hashtable state, Stack visiting,
Vector ret)
throws BuildException {
state.put(root, VISITING);
visiting.push(root);
- Target target = (Target) targets.get(root);
+ Target target = (Target) targetsToSort.get(root);
// Make sure we exist
if (target == null) {
@@ -1721,7 +1721,7 @@
String m = (String) state.get(cur);
if (m == null) {
// Not been visited
- tsort(cur, targets, state, visiting, ret);
+ tsort(cur, targetsToSort, state, visiting, ret);
} else if (m == VISITING) {
// Currently visiting this node, so have a cycle
throw makeCircularException(cur, visiting);
@@ -1761,22 +1761,22 @@
/**
* Adds a reference to the project.
*
- * @param name The name of the reference. Must not be <code>null</code>.
+ * @param refName The name of the reference. Must not be <code>null</code>.
* @param value The value of the reference. Must not be <code>null</code>.
*/
- public void addReference(String name, Object value) {
+ public void addReference(String refName, Object value) {
synchronized (references) {
- Object old = ((AntRefTable) references).getReal(name);
+ Object old = ((AntRefTable) references).getReal(refName);
if (old == value) {
// no warning, this is not changing anything
return;
}
if (old != null && !(old instanceof UnknownElement)) {
- log("Overriding previous definition of reference to " + name,
+ log("Overriding previous definition of reference to " +
refName,
MSG_WARN);
}
- log("Adding reference: " + name, MSG_DEBUG);
- references.put(name, value);
+ log("Adding reference: " + refName, MSG_DEBUG);
+ references.put(refName, value);
}
}
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
