svn commit: r391743 - /jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/control/LoopController.java

[sebb]

Author: sebb
Date: Wed Apr  5 12:33:17 2006
New Revision: 391743

URL: http://svn.apache.org/viewcvs?rev=391743&view=rev
Log:
Tidy up; add NLS markers

Modified:
    
jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/control/LoopController.java

Modified: 
jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/control/LoopController.java
URL: 
http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/control/LoopController.java?rev=391743&r1=391742&r2=391743&view=diff
==============================================================================
--- 
jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/control/LoopController.java
 (original)
+++ 
jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/control/LoopController.java
 Wed Apr  5 12:33:17 2006
@@ -25,20 +25,16 @@
 import org.apache.jmeter.testelement.property.JMeterProperty;
 import org.apache.jmeter.testelement.property.StringProperty;
 
-// NOTUSED import org.apache.jorphan.logging.LoggingManager;
-// NOTUSED import org.apache.log.Logger;
-
 /**
  * @author Michael Stover
  * @author Thad Smith
  * @version $Revision$
  */
 public class LoopController extends GenericController implements Serializable {
-       // NOTUSED private static Logger log = 
LoggingManager.getLoggerForClass();
 
-       private final static String LOOPS = "LoopController.loops";
+       private final static String LOOPS = "LoopController.loops"; // 
$NON-NLS-1$
 
-       private final static String CONTINUE_FOREVER = 
"LoopController.continue_forever";
+       private final static String CONTINUE_FOREVER = 
"LoopController.continue_forever"; // $NON-NLS-1$
 
        private transient int loopCount = 0;
 
@@ -89,9 +85,8 @@
        public boolean isDone() {
                if (getLoops() != 0) {
                        return super.isDone();
-               } else {
-                       return true;
                }
+               return true;
        }
 
        private boolean endOfLoop() {
@@ -112,9 +107,8 @@
                                resetLoopCount();
                        }
                        return null;
-               } else {
-                       return next();
                }
+               return next();
        }
 
        protected void incrementLoopCount() {



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]