/*
 * Licensed to the Apache Software Foundation (ASF) under one or more
 * contributor license agreements.  See the NOTICE file distributed with
 * this work for additional information regarding copyright ownership.
 * The ASF licenses this file to You under the Apache License, Version 2.0
 * (the "License"); you may not use this file except in compliance with
 * the License.  You may obtain a copy of the License at
 *
 *   http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 * 
 */

package org.apache.jmeter.control;

import org.apache.jmeter.engine.event.LoopIterationListener;
import org.apache.jmeter.samplers.Sampler;
import org.apache.jmeter.testelement.TestElement;

/**
 * This interface will typically be used in the following manner:
 * 
 * Controller controller; //gets initialized while(!controller.isDone() &&
 * controller.hasNext()) { Sampler sampler = controller.next(); return sampler; }
 * 
 * @author Michael Stover
 * @author Thad Smith
 * @version $Revision$
 */
public interface Controller extends TestElement {
	/**
	 * Delivers the next Sampler.
	 * 
	 * @return org.apache.jmeter.samplers.Sampler
	 */
	public Sampler next();

	/**
	 * Indicates whether the Controller is done delivering Samplers for the rest
	 * of the test.
	 * 
	 * @return boolean
	 */
	public boolean isDone();

	/**
	 * Controllers have to notify listeners of when they begin an iteration
	 * through their sub-elements.
	 */
	public void addIterationListener(LoopIterationListener listener);

	/**
	 * Called to initialize a controller at the beginning of a test iteration.
	 */
	public void initialize();
}

@@ -1015,29 +1015,30 @@
 ace 
-will typically be use
+is used by JMeterThrea
 d in
@@ -1071,236 +1071,64 @@
 %0A * 
-Controller controller; //gets initialized while(!controller.isDone() &&%0A * controller.hasNext()) %7B Sampler sampler = controller.next(); return sampler; %7D%0A * %0A * @author Michael Stover%0A * @author Thad Smith%0A * @version $Revision$
+while (running && (sampler = controller.next()) != null)
 %0A */
@@ -1212,17 +1212,24 @@
  Sampler
-.
+ or null
 %0A%09 * %0A%09 
@@ -1272,16 +1272,24 @@
 .Sampler
+ or null
 %0A%09 */%0A%09p
@@ -1412,24 +1412,121 @@
  test.%0A%09 * %0A
+%09 * When the top-level controller returns true to JMeterThread,%0A%09 * the thread is complete.%0A%09 * %0A
 %09 * @return 

Correct Javadoc