You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@jakarta.apache.org by se...@apache.org on 2010/11/03 01:37:44 UTC
svn commit: r1030302 - in
/jakarta/jmeter/trunk/src/core/org/apache/jmeter/threads:
SamplePackage.java TestCompiler.java
Author: sebb
Date: Wed Nov 3 00:37:44 2010
New Revision: 1030302
URL: http://svn.apache.org/viewvc?rev=1030302&view=rev
Log:
Adjust code so Sun Java compiler does not complain
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/threads/SamplePackage.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/threads/TestCompiler.java
Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/threads/SamplePackage.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/threads/SamplePackage.java?rev=1030302&r1=1030301&r2=1030302&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/threads/SamplePackage.java (original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/threads/SamplePackage.java Wed Nov 3 00:37:44 2010
@@ -23,6 +23,7 @@ import java.util.List;
import org.apache.jmeter.assertions.Assertion;
import org.apache.jmeter.config.ConfigTestElement;
+import org.apache.jmeter.control.Controller;
import org.apache.jmeter.processor.PostProcessor;
import org.apache.jmeter.processor.PreProcessor;
import org.apache.jmeter.samplers.SampleListener;
@@ -47,7 +48,7 @@ public class SamplePackage {
private final List<ConfigTestElement> configs;
- private final List<TestElement> controllers;
+ private final List<Controller> controllers;
private Sampler sampler;
@@ -58,7 +59,7 @@ public class SamplePackage {
List<Assertion> assertions,
List<PostProcessor> postProcessors,
List<PreProcessor> preProcessors,
- List<TestElement> controllers) {
+ List<Controller> controllers) {
this.configs = configs;
this.sampleListeners = listeners;
this.timers = timers;
@@ -68,40 +69,40 @@ public class SamplePackage {
this.controllers = controllers;
}
- @SuppressWarnings("unchecked") // All implementations extend TestElement
public void setRunningVersion(boolean running) {
setRunningVersion(configs, running);
- setRunningVersion((List<? extends TestElement>) sampleListeners, running);
- setRunningVersion((List<? extends TestElement>) assertions, running);
- setRunningVersion((List<? extends TestElement>) timers, running);
- setRunningVersion((List<? extends TestElement>) postProcessors, running);
- setRunningVersion((List<? extends TestElement>) preProcessors, running);
+ setRunningVersion(sampleListeners, running);
+ setRunningVersion(assertions, running);
+ setRunningVersion(timers, running);
+ setRunningVersion(postProcessors, running);
+ setRunningVersion(preProcessors, running);
setRunningVersion(controllers, running);
sampler.setRunningVersion(running);
}
- private void setRunningVersion(List<? extends TestElement> list, boolean running) {
- Iterator<? extends TestElement> iter = list.iterator();
+ private void setRunningVersion(List<?> list, boolean running) {
+ @SuppressWarnings("unchecked") // All implementations extend TestElement
+ Iterator<? extends TestElement> iter = (Iterator<? extends TestElement>) list.iterator();
while (iter.hasNext()) {
iter.next().setRunningVersion(running);
}
}
- private void recoverRunningVersion(List<? extends TestElement> list) {
- Iterator<? extends TestElement> iter = list.iterator();
+ private void recoverRunningVersion(List<?> list) {
+ @SuppressWarnings("unchecked") // All implementations extend TestElement
+ Iterator<? extends TestElement> iter = (Iterator<? extends TestElement>) list.iterator();
while (iter.hasNext()) {
iter.next().recoverRunningVersion();
}
}
- @SuppressWarnings("unchecked") // All implementations extend TestElement
public void recoverRunningVersion() {
recoverRunningVersion(configs);
- recoverRunningVersion((List<? extends TestElement>) sampleListeners);
- recoverRunningVersion((List<? extends TestElement>) assertions);
- recoverRunningVersion((List<? extends TestElement>) timers);
- recoverRunningVersion((List<? extends TestElement>) postProcessors);
- recoverRunningVersion((List<? extends TestElement>) preProcessors);
+ recoverRunningVersion(sampleListeners);
+ recoverRunningVersion(assertions);
+ recoverRunningVersion(timers);
+ recoverRunningVersion(postProcessors);
+ recoverRunningVersion(preProcessors);
recoverRunningVersion(controllers);
sampler.recoverRunningVersion();
}
Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/threads/TestCompiler.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/threads/TestCompiler.java?rev=1030302&r1=1030301&r2=1030302&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/threads/TestCompiler.java (original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/threads/TestCompiler.java Wed Nov 3 00:37:44 2010
@@ -151,7 +151,7 @@ public class TestCompiler implements Has
private void saveSamplerConfigs(Sampler sam) {
List<ConfigTestElement> configs = new LinkedList<ConfigTestElement>();
- List<TestElement> controllers = new LinkedList<TestElement>();
+ List<Controller> controllers = new LinkedList<Controller>();
List<SampleListener> listeners = new LinkedList<SampleListener>();
List<Timer> timers = new LinkedList<Timer>();
List<Assertion> assertions = new LinkedList<Assertion>();
@@ -196,7 +196,7 @@ public class TestCompiler implements Has
private void saveTransactionControllerConfigs(TransactionController tc) {
List<ConfigTestElement> configs = new LinkedList<ConfigTestElement>();
- List<TestElement> controllers = new LinkedList<TestElement>();
+ List<Controller> controllers = new LinkedList<Controller>();
List<SampleListener> listeners = new LinkedList<SampleListener>();
List<Timer> timers = new LinkedList<Timer>();
List<Assertion> assertions = new LinkedList<Assertion>();
@@ -227,10 +227,10 @@ public class TestCompiler implements Has
* @param controllers
* @param i
*/
- private void addDirectParentControllers(List<TestElement> controllers, TestElement maybeController) {
+ private void addDirectParentControllers(List<Controller> controllers, TestElement maybeController) {
if (maybeController instanceof Controller) {
log.debug("adding controller: " + maybeController + " to sampler config");
- controllers.add(maybeController);
+ controllers.add((Controller) maybeController);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@jakarta.apache.org
For additional commands, e-mail: notifications-help@jakarta.apache.org