jmeter-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r1525235 - in /jmeter/trunk/src: jorphan/org/apache/jorphan/exec/ jorphan/org/apache/jorphan/util/ protocol/http/org/apache/jmeter/protocol/http/proxy/ protocol/http/org/apache/jmeter/protocol/http/proxy/gui/
Date Sat, 21 Sep 2013 13:39:04 GMT
Author: sebb
Date: Sat Sep 21 13:39:03 2013
New Revision: 1525235

URL: http://svn.apache.org/r1525235
Log:
Trailing spaces

Modified:
    jmeter/trunk/src/jorphan/org/apache/jorphan/exec/KeyToolUtils.java
    jmeter/trunk/src/jorphan/org/apache/jorphan/util/JOrphanUtils.java
    jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/ProxyControl.java
    jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java

Modified: jmeter/trunk/src/jorphan/org/apache/jorphan/exec/KeyToolUtils.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/jorphan/org/apache/jorphan/exec/KeyToolUtils.java?rev=1525235&r1=1525234&r2=1525235&view=diff
==============================================================================
--- jmeter/trunk/src/jorphan/org/apache/jorphan/exec/KeyToolUtils.java (original)
+++ jmeter/trunk/src/jorphan/org/apache/jorphan/exec/KeyToolUtils.java Sat Sep 21 13:39:03
2013
@@ -112,7 +112,7 @@ public class KeyToolUtils {
     }
 
     /**
-     * Creates a self-signed Root CA certificate and an intermediate CA certificate 
+     * Creates a self-signed Root CA certificate and an intermediate CA certificate
      * (signed by the Root CA certificate) that can be used to sign server certificates.
      * The Root CA certificate file is exported to the same directory as the keystore
      * in formats suitable for Firefox/Chrome/IE (.crt) and Opera (.usr).
@@ -120,7 +120,7 @@ public class KeyToolUtils {
      *
      * @param keystore the keystore in which to store everything
      * @param password the password for keystore and keys
-     * @param validity the validity period in days, must be greater than 0 
+     * @param validity the validity period in days, must be greater than 0
      *
      * @throws IOException
      */
@@ -181,8 +181,8 @@ public class KeyToolUtils {
      */
     public static void generateHostCert(File keystore, String password, String host, int
validity) throws IOException {
         // generate the keypair for the host
-        generateSignedCert(keystore, password, validity, 
-                host,  // alias 
+        generateSignedCert(keystore, password, validity,
+                host,  // alias
                 host); // subject
     }
 
@@ -239,7 +239,7 @@ public class KeyToolUtils {
 
     /**
      * Returns a list of the CA aliases that should be in the keystore.
-     * 
+     *
      * @return the aliases that are used for the keystore
      */
     public static String[] getCAaliases() {
@@ -248,7 +248,7 @@ public class KeyToolUtils {
 
     /**
      * Get the root CA alias; needed to check the serial number and fingerprint
-     * 
+     *
      * @return the alias
      */
     public static String getRootCAalias() {
@@ -257,7 +257,7 @@ public class KeyToolUtils {
 
     /**
      * Helper method to simplify chaining keytool commands.
-     * 
+     *
      * @param command the command, not null
      * @param keystore the keystore, not nill
      * @param password the password used for keystore and key, not null

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=1525235&r1=1525234&r2=1525235&view=diff
==============================================================================
--- jmeter/trunk/src/jorphan/org/apache/jorphan/util/JOrphanUtils.java (original)
+++ jmeter/trunk/src/jorphan/org/apache/jorphan/util/JOrphanUtils.java Sat Sep 21 13:39:03
2013
@@ -41,7 +41,7 @@ import org.apache.commons.lang3.StringUt
 public final class JOrphanUtils {
 
     private static final int DEFAULT_CHUNK_SIZE = 4096;
-    
+
     /**
      * Private constructor to prevent instantiation.
      */
@@ -474,14 +474,14 @@ public final class JOrphanUtils {
 
     /**
      * Read as much as possible into buffer.
-     * 
+     *
      * @param is the stream to read from
      * @param buffer output buffer
      * @param offset offset into buffer
      * @param length number of bytes to read
-     * 
+     *
      * @return the number of bytes actually read
-     * @throws IOException 
+     * @throws IOException
      */
     public static int read(InputStream is, byte[] buffer, int offset, int length) throws
IOException {
         int remaining = length;
@@ -500,7 +500,7 @@ public final class JOrphanUtils {
      * Display currently running threads on system.out
      * This may be expensive to run.
      * Mainly designed for use at the end of a non-GUI test to check for threads that might
prevent the JVM from exitting.
-     * 
+     *
      * @param includeDaemons whether to include daemon threads or not.
      */
     public static void displayThreads(boolean includeDaemons) {
@@ -521,7 +521,7 @@ public final class JOrphanUtils {
             }
         }
     }
-    
+
     /**
      * Returns null if input is empty, null or contains spaces
      * @param input String
@@ -551,7 +551,7 @@ public final class JOrphanUtils {
      * Write data to an output stream in chunks with a maximum size of 4K.
      * This is to avoid OutOfMemory issues if the data buffer is very large
      * and the JVM needs to copy the buffer for use by native code.
-     * 
+     *
      * @param data the buffer to be written
      * @param output the output stream to use
      * @throws IOException if there is a problem writing the data

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=1525235&r1=1525234&r2=1525235&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
Sat Sep 21 13:39:03 2013
@@ -506,7 +506,7 @@ public class ProxyControl extends Generi
                         sampler.setEnabled(false);
                         sampler.setComment("Detected a redirect from the previous sample");
                     } else { // this is not the result of a redirect
-                        LAST_REDIRECT = null; // so break the chain                     
      
+                        LAST_REDIRECT = null; // so break the chain
                     }
                     if (httpSampleResult.isRedirect()) { // Save Location so resulting sample
can be disabled
                         if (LAST_REDIRECT == null) {

Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java?rev=1525235&r1=1525234&r2=1525235&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java
(original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java
Sat Sep 21 13:39:03 2013
@@ -88,7 +88,7 @@ public class ProxyControlGui extends Log
 
     private static final String SUGGESTED_EXCLUSIONS =
             JMeterUtils.getPropDefault("proxy.excludes.suggested", ".*\\.(bmp|css|js|gif|ico|jpe?g|png|swf|woff)");
// $NON-NLS-1$
-    
+
     private JTextField portField;
 
     private JLabeledTextField sslDomains;
@@ -243,7 +243,7 @@ public class ProxyControlGui extends Log
             if(samplerTypeName.getSelectedIndex()< HTTPSamplerFactory.getImplementations().length)
{
                 model.setSamplerTypeName(HTTPSamplerFactory.getImplementations()[samplerTypeName.getSelectedIndex()]);
             } else {
-                model.setSamplerTypeName(USE_DEFAULT_HTTP_IMPL);               
+                model.setSamplerTypeName(USE_DEFAULT_HTTP_IMPL);
             }
             model.setSamplerRedirectAutomatically(samplerRedirectAutomatically.isSelected());
             model.setSamplerFollowRedirects(samplerFollowRedirects.isSelected());
@@ -350,7 +350,7 @@ public class ProxyControlGui extends Log
         if (source.equals(samplerFollowRedirects) && samplerFollowRedirects.isSelected())
{
             samplerRedirectAutomatically.setSelected(false);
         } else if (source.equals(samplerRedirectAutomatically) && samplerRedirectAutomatically.isSelected())
{
-            samplerFollowRedirects.setSelected(false);            
+            samplerFollowRedirects.setSelected(false);
         }
 
         // System.err.println(action.paramString()+" "+command+ "
@@ -420,7 +420,7 @@ public class ProxyControlGui extends Log
                 for (String clipboardLine : exclusions) {
                     model.addRow(new Object[] {clipboardLine});
                 }
-                if (table.getRowCount() > rowCount) {   
+                if (table.getRowCount() > rowCount) {
                     // Highlight (select) the appropriate rows.
                     int rowToSelect = model.getRowCount() - 1;
                     table.setRowSelectionInterval(rowCount, rowToSelect);
@@ -428,7 +428,7 @@ public class ProxyControlGui extends Log
             }
         }
     }
-    
+
     /**
      * Add values from the clipboard to table
      * @param table {@link JTable}
@@ -809,7 +809,7 @@ public class ProxyControlGui extends Log
 
         return panel;
     }
-    
+
     private JPanel createTableButtonPanel(String addCommand, String deleteCommand, String
copyFromClipboard, String addSuggestedExcludes) {
         JPanel buttonPanel = new JPanel();
 
@@ -828,7 +828,7 @@ public class ProxyControlGui extends Log
         addFromClipboard.setActionCommand(copyFromClipboard);
         addFromClipboard.addActionListener(this);
         buttonPanel.add(addFromClipboard);
-        
+
         if(addSuggestedExcludes != null) {
             /** A button for adding suggested excludes. */
             JButton addFromSuggestedExcludes = new JButton(JMeterUtils.getResString("add_from_suggested_excludes"));
// $NON-NLS-1$



Mime
View raw message