Author: sebb
Date: Mon Nov 1 15:16:05 2010
New Revision: 1029700
URL: http://svn.apache.org/viewvc?rev=1029700&view=rev
Log:
Generics
Modified:
jakarta/jmeter/trunk/src/components/org/apache/jmeter/control/IncludeController.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Save.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/tree/JMeterTreeModel.java
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/action/ReportSave.java
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/tree/ReportTreeModel.java
Modified:
jakarta/jmeter/trunk/src/components/org/apache/jmeter/control/IncludeController.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/control/IncludeController.java?rev=1029700&r1=1029699&r2=1029700&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/components/org/apache/jmeter/control/IncludeController.java
(original)
+++
jakarta/jmeter/trunk/src/components/org/apache/jmeter/control/IncludeController.java
Mon Nov 1 15:16:05 2010
@@ -69,9 +69,9 @@ public class IncludeController extends G
clone.setIncludePath(this.getIncludePath());
if (this.SUBTREE != null) {
if (this.SUBTREE.keySet().size() == 1) {
- Iterator<TestElement> itr = this.SUBTREE.keySet().iterator();
+ Iterator<Object> itr = this.SUBTREE.keySet().iterator();
while (itr.hasNext()) {
- this.SUB = itr.next();
+ this.SUB = (TestElement) itr.next();
}
}
clone.SUBTREE = (HashTree)this.SUBTREE.clone();
@@ -165,9 +165,9 @@ public class IncludeController extends G
}
private void removeDisabledItems(HashTree tree) {
- Iterator<TestElement> iter = new
LinkedList<TestElement>(tree.list()).iterator();
+ Iterator<Object> iter = new LinkedList<Object>(tree.list()).iterator();
while (iter.hasNext()) {
- TestElement item = iter.next();
+ TestElement item = (TestElement) iter.next();
if (!item.isEnabled()) {
//log.info("Removing "+item.toString());
tree.remove(item);
Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Save.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Save.java?rev=1029700&r1=1029699&r2=1029700&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Save.java
(original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Save.java Mon
Nov 1 15:16:05 2010
@@ -154,11 +154,11 @@ public class Save implements Command {
// package protected to allow access from test code
void convertSubTree(HashTree tree) {
- Iterator<JMeterTreeNode> iter = new
LinkedList<JMeterTreeNode>(tree.list()).iterator();
+ Iterator<Object> iter = new LinkedList<Object>(tree.list()).iterator();
while (iter.hasNext()) {
- JMeterTreeNode item = iter.next();
+ JMeterTreeNode item = (JMeterTreeNode) iter.next();
convertSubTree(tree.getTree(item));
- TestElement testElement = item.getTestElement();
+ TestElement testElement = item.getTestElement(); // requires
JMeterTreeNode
tree.replace(item, testElement);
}
}
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/tree/JMeterTreeModel.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/tree/JMeterTreeModel.java?rev=1029700&r1=1029699&r2=1029700&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/tree/JMeterTreeModel.java
(original)
+++
jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/tree/JMeterTreeModel.java
Mon Nov 1 15:16:05 2010
@@ -91,10 +91,9 @@ public class JMeterTreeModel extends Def
* the added sub tree was a full test plan.
*/
public HashTree addSubTree(HashTree subTree, JMeterTreeNode current)
throws IllegalUserActionException {
- @SuppressWarnings("unchecked") // OK
- Iterator<TestElement> iter = subTree.list().iterator();
+ Iterator<Object> iter = subTree.list().iterator();
while (iter.hasNext()) {
- TestElement item = iter.next();
+ TestElement item = (TestElement) iter.next();
if (item instanceof TestPlan) {
TestPlan tp = (TestPlan) item;
current = (JMeterTreeNode) ((JMeterTreeNode)
getRoot()).getChildAt(0);
Modified:
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/action/ReportSave.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/action/ReportSave.java?rev=1029700&r1=1029699&r2=1029700&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/action/ReportSave.java
(original)
+++
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/action/ReportSave.java
Mon Nov 1 15:16:05 2010
@@ -120,9 +120,9 @@ public class ReportSave implements Comma
}
private void convertSubTree(HashTree tree) {
- Iterator<ReportTreeNode> iter = new
LinkedList<ReportTreeNode>(tree.list()).iterator();
+ Iterator<Object> iter = new LinkedList<Object>(tree.list()).iterator();
while (iter.hasNext()) {
- ReportTreeNode item = iter.next();
+ ReportTreeNode item = (ReportTreeNode) iter.next();
convertSubTree(tree.getTree(item));
TestElement testElement = item.getTestElement();
tree.replace(item, testElement);
Modified:
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/tree/ReportTreeModel.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/tree/ReportTreeModel.java?rev=1029700&r1=1029699&r2=1029700&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/tree/ReportTreeModel.java
(original)
+++
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/tree/ReportTreeModel.java
Mon Nov 1 15:16:05 2010
@@ -70,10 +70,9 @@ public class ReportTreeModel extends Def
*/
public HashTree addSubTree(HashTree subTree, ReportTreeNode current)
throws IllegalUserActionException {
- @SuppressWarnings("unchecked") // OK
- Iterator<TestElement> iter = subTree.list().iterator();
+ Iterator<Object> iter = subTree.list().iterator();
while (iter.hasNext()) {
- TestElement item = iter.next();
+ TestElement item = (TestElement) iter.next();
if (item instanceof ReportPlan) {
current = (ReportTreeNode) ((ReportTreeNode) getRoot())
.getChildAt(0);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
