sebb 2004/10/21 15:22:46
Modified: src/components/org/apache/jmeter/control
ModuleController.java
src/core/org/apache/jmeter/resources PackageTest.java
Log:
Rename "enum" variables to avoid clash with Java 1.5 keyword
Revision Changes Path
1.8 +5 -5
jakarta-jmeter/src/components/org/apache/jmeter/control/ModuleController.java
Index: ModuleController.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/components/org/apache/jmeter/control/ModuleController.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ModuleController.java 20 Feb 2004 01:03:07 -0000 1.7
+++ ModuleController.java 21 Oct 2004 22:22:45 -0000 1.8
@@ -218,10 +218,10 @@
private static void cloneChildren(JMeterTreeNode to, JMeterTreeNode from)
{
- Enumeration enum = from.children();
- while (enum.hasMoreElements())
+ Enumeration enumr = from.children();
+ while (enumr.hasMoreElements())
{
- JMeterTreeNode child = (JMeterTreeNode) enum.nextElement();
+ JMeterTreeNode child = (JMeterTreeNode) enumr.nextElement();
JMeterTreeNode childClone = (JMeterTreeNode) child.clone();
childClone.setUserObject(
((TestElement) child.getUserObject()).clone());
1.12 +5 -5
jakarta-jmeter/src/core/org/apache/jmeter/resources/PackageTest.java
Index: PackageTest.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/resources/PackageTest.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- PackageTest.java 6 Oct 2004 14:43:55 -0000 1.11
+++ PackageTest.java 21 Oct 2004 22:22:46 -0000 1.12
@@ -124,13 +124,13 @@
else if (checkUnexpected)
{
// Check all the keys are in the default props file
- Enumeration enum = getRAS(res).getKeys();
- while(enum.hasMoreElements())
+ Enumeration enumr = getRAS(res).getKeys();
+ while(enumr.hasMoreElements())
{
String key = null;
try
{
- key = (String)enum.nextElement();
+ key = (String)enumr.nextElement();
defaultPRB.getString(key);
}
catch (MissingResourceException e)
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
