You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by se...@apache.org on 2011/11/27 14:17:56 UTC
svn commit: r1206717 - in /jmeter/trunk/src: core/org/apache/jmeter/
core/org/apache/jmeter/gui/util/ core/org/apache/jmeter/save/
jorphan/org/apache/jorphan/reflect/ jorphan/org/apache/jorphan/util/
protocol/http/org/apache/jmeter/protocol/http/contro...
Author: sebb
Date: Sun Nov 27 13:17:54 2011
New Revision: 1206717
URL: http://svn.apache.org/viewvc?rev=1206717&view=rev
Log:
Simplify for loops
Modified:
jmeter/trunk/src/core/org/apache/jmeter/DynamicClassLoader.java
jmeter/trunk/src/core/org/apache/jmeter/JMeter.java
jmeter/trunk/src/core/org/apache/jmeter/gui/util/JMeterMenuBar.java
jmeter/trunk/src/core/org/apache/jmeter/save/ScriptWrapperConverter.java
jmeter/trunk/src/jorphan/org/apache/jorphan/reflect/ClassFinder.java
jmeter/trunk/src/jorphan/org/apache/jorphan/util/JOrphanUtils.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/CookieManager.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/gui/HTTPFileArgsPanel.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/Proxy.java
Modified: jmeter/trunk/src/core/org/apache/jmeter/DynamicClassLoader.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/DynamicClassLoader.java?rev=1206717&r1=1206716&r2=1206717&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/DynamicClassLoader.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/DynamicClassLoader.java Sun Nov 27 13:17:54 2011
@@ -58,8 +58,8 @@ public class DynamicClassLoader extends
public static void updateLoader(URL [] urls) {
DynamicClassLoader loader
= (DynamicClassLoader) Thread.currentThread().getContextClassLoader();
- for(int i=0;i<urls.length;i++) {
- loader.addURL(urls[i]);
+ for(URL url : urls) {
+ loader.addURL(url);
}
}
}
Modified: jmeter/trunk/src/core/org/apache/jmeter/JMeter.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/JMeter.java?rev=1206717&r1=1206716&r2=1206717&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/JMeter.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/JMeter.java Sun Nov 27 13:17:54 2011
@@ -325,8 +325,8 @@ public class JMeter implements JMeterPlu
String jcp=System.getProperty("java.class.path");// $NON-NLS-1$
String bits[] =jcp.split(File.pathSeparator);
log.debug("ClassPath");
- for(int i = 0; i<bits.length ;i++){
- log.debug(bits[i]);
+ for(String bit : bits){
+ log.debug(bit);
}
log.debug(jcp);
}
Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/util/JMeterMenuBar.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/util/JMeterMenuBar.java?rev=1206717&r1=1206716&r2=1206717&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/util/JMeterMenuBar.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/util/JMeterMenuBar.java Sun Nov 27 13:17:54 2011
@@ -347,9 +347,9 @@ public class JMeterMenuBar extends JMenu
final String addedLocales = JMeterUtils.getProperty("locales.add");
if (addedLocales != null){
String [] addLanguages =addedLocales.split(","); // $NON-NLS-1$
- for(int i=0; i < addLanguages.length; i++){
- log.info("Adding locale "+addLanguages[i]);
- lang.add(addLanguages[i]);
+ for(String newLang : addLanguages){
+ log.info("Adding locale "+newLang);
+ lang.add(newLang);
}
}
return lang.toArray(new String[lang.size()]);
@@ -367,9 +367,8 @@ public class JMeterMenuBar extends JMenu
* Also, need to ensure that the names are valid resource entries too.
*/
- String lang[] = getLanguages();
- for(int i=0; i < lang.length; i++ ){
- langMenu.addLang(lang[i]);
+ for(String lang : getLanguages()){
+ langMenu.addLang(lang);
}
return languageMenu;
}
Modified: jmeter/trunk/src/core/org/apache/jmeter/save/ScriptWrapperConverter.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/save/ScriptWrapperConverter.java?rev=1206717&r1=1206716&r2=1206717&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/save/ScriptWrapperConverter.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/save/ScriptWrapperConverter.java Sun Nov 27 13:17:54 2011
@@ -97,8 +97,7 @@ public class ScriptWrapperConverter impl
final ConversionException conversionException = new ConversionException(e);
StackTraceElement[] ste = e.getStackTrace();
if (ste!=null){
- for(int i=0; i<ste.length; i++){
- StackTraceElement top=ste[i];
+ for(StackTraceElement top : ste){
String className=top.getClassName();
if (className.startsWith("org.apache.jmeter.")){
conversionException.add("first-jmeter-class", top.toString());
Modified: jmeter/trunk/src/jorphan/org/apache/jorphan/reflect/ClassFinder.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/jorphan/org/apache/jorphan/reflect/ClassFinder.java?rev=1206717&r1=1206716&r2=1206717&view=diff
==============================================================================
--- jmeter/trunk/src/jorphan/org/apache/jorphan/reflect/ClassFinder.java (original)
+++ jmeter/trunk/src/jorphan/org/apache/jorphan/reflect/ClassFinder.java Sun Nov 27 13:17:54 2011
@@ -486,8 +486,7 @@ public final class ClassFinder {
try{
Class<?> c = Class.forName(classInQuestion, false, contextClassLoader);
for(Method method : c.getMethods()) {
- for(int i = 0;i<annotations.length;i++) {
- Class<? extends Annotation> annotation = annotations[i];
+ for(Class<? extends Annotation> annotation : annotations) {
if(method.isAnnotationPresent(annotation)) {
return true;
}
Modified: jmeter/trunk/src/jorphan/org/apache/jorphan/util/JOrphanUtils.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/jorphan/org/apache/jorphan/util/JOrphanUtils.java?rev=1206717&r1=1206716&r2=1206717&view=diff
==============================================================================
--- jmeter/trunk/src/jorphan/org/apache/jorphan/util/JOrphanUtils.java (original)
+++ jmeter/trunk/src/jorphan/org/apache/jorphan/util/JOrphanUtils.java Sun Nov 27 13:17:54 2011
@@ -257,8 +257,7 @@ public final class JOrphanUtils {
public static String replaceAllChars(String source, char search, String replace) {
char[] chars = source.toCharArray();
StringBuilder sb = new StringBuilder(source.length()+20);
- for(int i = 0; i < chars.length; i++){
- char c = chars[i];
+ for(char c : chars){
if (c == search){
sb.append(replace);
} else {
Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/CookieManager.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/CookieManager.java?rev=1206717&r1=1206716&r2=1206717&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/CookieManager.java (original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/CookieManager.java Sun Nov 27 13:17:54 2011
@@ -402,8 +402,7 @@ public class CookieManager extends Confi
if (cookies == null) {
return;
}
- for(int i=0;i<cookies.length;i++){
- org.apache.commons.httpclient.Cookie cookie = cookies[i];
+ for(org.apache.commons.httpclient.Cookie cookie : cookies){
try {
if (CHECK_COOKIES) {
cookieSpec.validate(host, port, path, isSecure, cookie);
Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/gui/HTTPFileArgsPanel.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/gui/HTTPFileArgsPanel.java?rev=1206717&r1=1206716&r2=1206717&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/gui/HTTPFileArgsPanel.java (original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/gui/HTTPFileArgsPanel.java Sun Nov 27 13:17:54 2011
@@ -180,9 +180,8 @@ public class HTTPFileArgsPanel extends J
if (testElement instanceof HTTPSamplerBase) {
HTTPSamplerBase base = (HTTPSamplerBase) testElement;
tableModel.clearData();
- HTTPFileArg[] files = base.getHTTPFiles();
- for(int i=0; i< files.length; i++){
- tableModel.addRow(files[i]);
+ for(HTTPFileArg file : base.getHTTPFiles()){
+ tableModel.addRow(file);
}
checkDeleteAndBrowseStatus();
}
Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/Proxy.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/Proxy.java?rev=1206717&r1=1206716&r2=1206717&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/Proxy.java (original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/Proxy.java Sun Nov 27 13:17:54 2011
@@ -289,8 +289,8 @@ public class Proxy extends Thread {
headers.removeHeaderNamed(HTTPConstants.HEADER_COOKIE);// Always remove cookies
headers.removeHeaderNamed(HTTPConstants.HEADER_AUTHORIZATION);// Always remove authorization
// Remove additional headers
- for(int i=0; i < headersToRemove.length; i++){
- headers.removeHeaderNamed(headersToRemove[i]);
+ for(String hdr : headersToRemove){
+ headers.removeHeaderNamed(hdr);
}
}
target.deliverSampler(sampler, new TestElement[] { captureHttpHeaders ? headers : null }, result);