root
/
jmeter
mirror of https://github.com/apache/jmeter.git
1
0
Fork 0
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Generics 

git-svn-id: https://svn.apache.org/repos/asf/jakarta/jmeter/trunk@1029700 13f79535-47bb-0310-9956-ffa450edef68

Former-commit-id: 8d5fc2f458
This commit is contained in:
Sebastian Bazley 2010-11-01 15:16:05 +00:00
parent 0b5b99fde1
commit f15cc106f4
5 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/components/org/apache/jmeter/control/IncludeController.java
View File

@ -69,9 +69,9 @@ public class IncludeController extends GenericController implements ReplaceableC
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 GenericController implements ReplaceableC
}
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);

6
src/core/org/apache/jmeter/gui/action/Save.java
View File

@ -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);
}
}

5
src/core/org/apache/jmeter/gui/tree/JMeterTreeModel.java
View File

@ -91,10 +91,9 @@ public class JMeterTreeModel extends DefaultTreeModel {
* 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);

4
src/reports/org/apache/jmeter/report/gui/action/ReportSave.java
View File

@ -120,9 +120,9 @@ public class ReportSave implements Command {
}
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);

5
src/reports/org/apache/jmeter/report/gui/tree/ReportTreeModel.java
View File

@ -70,10 +70,9 @@ public class ReportTreeModel extends DefaultTreeModel {
*/
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);