You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jmeter-dev@jakarta.apache.org by se...@apache.org on 2005/01/04 20:38:16 UTC
cvs commit: jakarta-jmeter/src/core/org/apache/jmeter/gui/tree JMeterTreeModel.java
sebb 2005/01/04 11:38:16
Modified: src/core/org/apache/jmeter/gui/tree JMeterTreeModel.java
Log:
Rename "enum" variable to avoid clash with Java 1.5 keyword
Revision Changes Path
1.25 +13 -13 jakarta-jmeter/src/core/org/apache/jmeter/gui/tree/JMeterTreeModel.java
Index: JMeterTreeModel.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/gui/tree/JMeterTreeModel.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- JMeterTreeModel.java 13 Feb 2004 02:21:36 -0000 1.24
+++ JMeterTreeModel.java 4 Jan 2005 19:38:16 -0000 1.25
@@ -1,6 +1,6 @@
// $Header$
/*
- * Copyright 2001-2004 The Apache Software Foundation.
+ * Copyright 2001-2005 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -41,7 +41,7 @@
/**
*
- * @author Michael Stover
+ * author Michael Stover
* @version $Revision$
*/
public class JMeterTreeModel extends DefaultTreeModel
@@ -179,10 +179,10 @@
{
nodeList.add(node);
}
- Enumeration enum = node.children();
- while (enum.hasMoreElements())
+ Enumeration enumNode = node.children();
+ while (enumNode.hasMoreElements())
{
- JMeterTreeNode child = (JMeterTreeNode) enum.nextElement();
+ JMeterTreeNode child = (JMeterTreeNode) enumNode.nextElement();
traverseAndFind(type, child, nodeList);
}
}
@@ -195,10 +195,10 @@
{
return node;
}
- Enumeration enum = node.children();
- while (enum.hasMoreElements())
+ Enumeration enumNode = node.children();
+ while (enumNode.hasMoreElements())
{
- JMeterTreeNode child = (JMeterTreeNode) enum.nextElement();
+ JMeterTreeNode child = (JMeterTreeNode) enumNode.nextElement();
JMeterTreeNode result= traverseAndFind(userObject, child);
if (result != null) return result;
}
@@ -208,10 +208,10 @@
public HashTree getCurrentSubTree(JMeterTreeNode node)
{
ListedHashTree hashTree = new ListedHashTree(node);
- Enumeration enum = node.children();
- while (enum.hasMoreElements())
+ Enumeration enumNode = node.children();
+ while (enumNode.hasMoreElements())
{
- JMeterTreeNode child = (JMeterTreeNode) enum.nextElement();
+ JMeterTreeNode child = (JMeterTreeNode) enumNode.nextElement();
hashTree.add(node, getCurrentSubTree(child));
}
return hashTree;
---------------------------------------------------------------------
To unsubscribe, e-mail: jmeter-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-help@jakarta.apache.org