jmeter-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fschumac...@apache.org
Subject svn commit: r1700121 - in /jmeter/trunk: src/junit/org/apache/jmeter/protocol/java/control/gui/ src/protocol/http/org/apache/jmeter/protocol/http/config/ src/protocol/http/org/apache/jmeter/protocol/http/proxy/ src/protocol/http/org/apache/jmeter/proto...
Date Sun, 30 Aug 2015 13:28:49 GMT
Author: fschumacher
Date: Sun Aug 30 13:28:48 2015
New Revision: 1700121

URL: http://svn.apache.org/r1700121
Log:
Whitespace changes from part 3 of the patches by Graham Russell.

Bugzilla Id: 57981

Modified:
    jmeter/trunk/src/junit/org/apache/jmeter/protocol/java/control/gui/JUnitTestSamplerGui.java
    jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/config/MultipartUrlConfig.java
    jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/ProxyControl.java
    jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java
    jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/WSDLHelper.java
    jmeter/trunk/test/src/org/apache/jmeter/protocol/http/util/accesslog/TestLogFilter.java

Modified: jmeter/trunk/src/junit/org/apache/jmeter/protocol/java/control/gui/JUnitTestSamplerGui.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/junit/org/apache/jmeter/protocol/java/control/gui/JUnitTestSamplerGui.java?rev=1700121&r1=1700120&r2=1700121&view=diff
==============================================================================
--- jmeter/trunk/src/junit/org/apache/jmeter/protocol/java/control/gui/JUnitTestSamplerGui.java
(original)
+++ jmeter/trunk/src/junit/org/apache/jmeter/protocol/java/control/gui/JUnitTestSamplerGui.java
Sun Aug 30 13:28:48 2015
@@ -375,18 +375,18 @@ implements ChangeListener, ActionListene
         List<String> list = new ArrayList<>();
         for (final Method method : meths) {
             final String name = method.getName();
-            if (junit4.isSelected()){
+            if (junit4.isSelected()) {
                 if (method.isAnnotationPresent(Test.class) ||
-                    method.isAnnotationPresent(BeforeClass.class) ||
-                    method.isAnnotationPresent(AfterClass.class)) {
-                        list.add(name);
+                        method.isAnnotationPresent(BeforeClass.class) ||
+                        method.isAnnotationPresent(AfterClass.class)) {
+                    list.add(name);
                 }
             } else {
                 if (name.startsWith(TESTMETHOD_PREFIX) ||
-                    name.equals(ONETIMESETUP) ||
-                    name.equals(ONETIMETEARDOWN) ||
-                    name.equals(SUITE)) {
-                        list.add(name);
+                        name.equals(ONETIMESETUP) ||
+                        name.equals(ONETIMETEARDOWN) ||
+                        name.equals(SUITE)) {
+                    list.add(name);
                 }
             }
         }

Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/config/MultipartUrlConfig.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/config/MultipartUrlConfig.java?rev=1700121&r1=1700120&r2=1700121&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/config/MultipartUrlConfig.java
(original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/config/MultipartUrlConfig.java
Sun Aug 30 13:28:48 2015
@@ -138,12 +138,11 @@ public class MultipartUrlConfig implemen
                     // Get the filename
                     index = contentDisposition.indexOf(filenamePrefix) + filenamePrefix.length();
                     String path = contentDisposition.substring(index, contentDisposition.indexOf('\"',
index)); //$NON-NLS-1$
-                    if(path != null && path.length() > 0) {
+                    if (path != null && path.length() > 0) {
                         // Set the values retrieved for the file upload
                         files.addHTTPFileArg(path, name, contentType);
                     }
-                }
-                else {
+                } else {
                     // Find the first empty line of the multipart, it signals end of headers
for multipart
                     // Agents are supposed to terminate lines in CRLF:
                     final String CRLF = "\r\n";

Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/ProxyControl.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/ProxyControl.java?rev=1700121&r1=1700120&r2=1700121&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/ProxyControl.java
(original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/ProxyControl.java
Sun Aug 30 13:28:48 2015
@@ -1259,10 +1259,10 @@ public class ProxyControl extends Generi
         for (Arguments variable : variables) {
             final Map<String, String> map = variable.getArgumentsAsMap();
             for (Iterator<String> vals = map.values().iterator(); vals.hasNext(); )
{
-               final Object next = vals.next();
-               if ("".equals(next)) {// Drop any empty values (Bug 45199)
-                   vals.remove();
-               }
+                final Object next = vals.next();
+                if ("".equals(next)) {// Drop any empty values (Bug 45199)
+                    vals.remove();
+                }
             }
             replacer.addVariables(map);
         }

Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java?rev=1700121&r1=1700120&r2=1700121&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java
(original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java
Sun Aug 30 13:28:48 2015
@@ -321,7 +321,7 @@ public abstract class HTTPSamplerBase ex
                     parsersForType.put(type, classname);
                 }
             } else {
-                log.warn("Cannot find .types property for "+parser);
+                log.warn("Cannot find .types property for " + parser);
             }
         }
         if (parsers.length==0){ // revert to previous behaviour
@@ -1085,14 +1085,13 @@ public abstract class HTTPSamplerBase ex
             }
             if (name.length() > 0) {
                 if (isDebug) {
-                    log.debug("Name: " + name+ " Value: " + value+ " Metadata: " + metaData);
+                    log.debug("Name: " + name + " Value: " + value + " Metadata: " + metaData);
                 }
                 // If we know the encoding, we can decode the argument value,
                 // to make it easier to read for the user
-                if(!StringUtils.isEmpty(contentEncoding)) {
+                if (!StringUtils.isEmpty(contentEncoding)) {
                     addEncodedArgument(name, value, metaData, contentEncoding);
-                }
-                else {
+                } else {
                     // If we do not know the encoding, we just use the encoded value
                     // The browser has already done the encoding, so save the values as is
                     addNonEncodedArgument(name, value, metaData);

Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/WSDLHelper.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/WSDLHelper.java?rev=1700121&r1=1700120&r2=1700121&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/WSDLHelper.java (original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/WSDLHelper.java Sun
Aug 30 13:28:48 2015
@@ -370,7 +370,7 @@ public class WSDLHelper {
                 Element child = (Element) opnodes.item(idz);
                 int numberOfSoapOperationNodes = child.getElementsByTagNameNS(SOAP11_BINDING_NAMESPACE,
"operation").getLength()
                         + child.getElementsByTagNameNS(SOAP12_BINDING_NAMESPACE, "operation").getLength();
-                if (numberOfSoapOperationNodes>0) {
+                if (numberOfSoapOperationNodes > 0) {
                     ops.add(child);
                 }
             }

Modified: jmeter/trunk/test/src/org/apache/jmeter/protocol/http/util/accesslog/TestLogFilter.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/util/accesslog/TestLogFilter.java?rev=1700121&r1=1700120&r2=1700121&view=diff
==============================================================================
--- jmeter/trunk/test/src/org/apache/jmeter/protocol/http/util/accesslog/TestLogFilter.java
(original)
+++ jmeter/trunk/test/src/org/apache/jmeter/protocol/http/util/accesslog/TestLogFilter.java
Sun Aug 30 13:28:48 2015
@@ -93,7 +93,7 @@ public class TestLogFilter extends JMete
                 String theFile = td.file;
                 boolean expect = td.exclfile;
 
-                testf.isFiltered(theFile,null);
+                testf.isFiltered(theFile, null);
                 String line = testf.filter(theFile);
                 if (line != null) {
                     assertTrue("Expect to accept " + theFile, expect);
@@ -109,7 +109,7 @@ public class TestLogFilter extends JMete
                 String theFile = td.file;
                 boolean expect = td.inclfile;
 
-                testf.isFiltered(theFile,null);
+                testf.isFiltered(theFile, null);
                 String line = testf.filter(theFile);
                 if (line != null) {
                     assertTrue("Expect to accept " + theFile, expect);
@@ -126,7 +126,7 @@ public class TestLogFilter extends JMete
                 String theFile = td.file;
                 boolean expect = td.exclpatt;
 
-                assertEquals(!expect, testf.isFiltered(theFile,null));
+                assertEquals(!expect, testf.isFiltered(theFile, null));
                 String line = testf.filter(theFile);
                 if (line != null) {
                     assertTrue("Expect to accept " + theFile, expect);
@@ -142,7 +142,7 @@ public class TestLogFilter extends JMete
                 String theFile = td.file;
                 boolean expect = td.inclpatt;
 
-                assertEquals(!expect, testf.isFiltered(theFile,null));
+                assertEquals(!expect, testf.isFiltered(theFile, null));
                 String line = testf.filter(theFile);
                 if (line != null) {
                     assertTrue("Expect to accept " + theFile, expect);



Mime
View raw message