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:43:30 UTC
cvs commit: jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/proxy ProxyControl.java
sebb 2005/01/04 11:43:30
Modified: src/protocol/http/org/apache/jmeter/protocol/http/proxy
ProxyControl.java
Log:
Rename "enum" variable to avoid clash with Java 1.5 keyword
Revision Changes Path
1.55 +18 -18 jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/proxy/ProxyControl.java
Index: ProxyControl.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/proxy/ProxyControl.java,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- ProxyControl.java 6 Oct 2004 14:43:56 -0000 1.54
+++ ProxyControl.java 4 Jan 2005 19:43:30 -0000 1.55
@@ -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.
@@ -496,11 +496,11 @@
LinkedList elements= new LinkedList();
// Look for elements directly within the HTTP proxy:
- Enumeration enum = treeModel.getNodeOf(this).children();
- while (enum.hasMoreElements())
+ Enumeration kids = treeModel.getNodeOf(this).children();
+ while (kids.hasMoreElements())
{
JMeterTreeNode subNode =
- (JMeterTreeNode) enum.nextElement();
+ (JMeterTreeNode) kids.nextElement();
if (subNode.isEnabled())
{
TestElement element= (TestElement)subNode.getUserObject();
@@ -517,11 +517,11 @@
controller != null;
controller= (JMeterTreeNode)controller.getParent())
{
- enum = controller.children();
- while (enum.hasMoreElements())
+ kids = controller.children();
+ while (kids.hasMoreElements())
{
JMeterTreeNode subNode =
- (JMeterTreeNode) enum.nextElement();
+ (JMeterTreeNode) kids.nextElement();
if (subNode.isEnabled())
{
TestElement element= (TestElement)subNode.getUserObject();
@@ -776,11 +776,11 @@
{
JMeterTreeModel treeModel = GuiPackage.getInstance().getTreeModel();
JMeterTreeNode myNode = treeModel.getNodeOf(this);
- Enumeration enum = myNode.children();
- while (enum.hasMoreElements())
+ Enumeration kids = myNode.children();
+ while (kids.hasMoreElements())
{
JMeterTreeNode subNode =
- (JMeterTreeNode) enum.nextElement();
+ (JMeterTreeNode) kids.nextElement();
if (subNode.isEnabled()) {
TestElement testElement =
(TestElement) subNode.getTestElement();
@@ -799,11 +799,11 @@
{
JMeterTreeModel treeModel = GuiPackage.getInstance().getTreeModel();
JMeterTreeNode myNode = treeModel.getNodeOf(this);
- Enumeration enum = myNode.children();
- while (enum.hasMoreElements())
+ Enumeration kids = myNode.children();
+ while (kids.hasMoreElements())
{
JMeterTreeNode subNode =
- (JMeterTreeNode) enum.nextElement();
+ (JMeterTreeNode) kids.nextElement();
if (subNode.isEnabled()) {
TestElement testElement =
(TestElement) subNode.getTestElement();
@@ -822,11 +822,11 @@
{
JMeterTreeModel treeModel = GuiPackage.getInstance().getTreeModel();
JMeterTreeNode myNode = treeModel.getNodeOf(this);
- Enumeration enum = myNode.children();
- while (enum.hasMoreElements())
+ Enumeration kids = myNode.children();
+ while (kids.hasMoreElements())
{
JMeterTreeNode subNode =
- (JMeterTreeNode) enum.nextElement();
+ (JMeterTreeNode) kids.nextElement();
if (subNode.isEnabled()) {
TestElement testElement =
(TestElement) subNode.getTestElement();
---------------------------------------------------------------------
To unsubscribe, e-mail: jmeter-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-help@jakarta.apache.org