jmeter-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r1544707 - in /jmeter/trunk: src/core/org/apache/jmeter/gui/util/ src/core/org/apache/jmeter/samplers/ src/protocol/http/org/apache/jmeter/protocol/http/parser/ src/protocol/http/org/apache/jmeter/protocol/http/proxy/ test/src/org/apache/jm...
Date Fri, 22 Nov 2013 22:40:21 GMT
Author: sebb
Date: Fri Nov 22 22:40:20 2013
New Revision: 1544707

URL: http://svn.apache.org/r1544707
Log:
Tab police (and trailing spaces)

Modified:
    jmeter/trunk/src/core/org/apache/jmeter/gui/util/ButtonPanel.java
    jmeter/trunk/src/core/org/apache/jmeter/gui/util/JSyntaxTextArea.java
    jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleSenderFactory.java
    jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/JsoupBasedHtmlParser.java
    jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/ProxyControl.java
    jmeter/trunk/test/src/org/apache/jmeter/protocol/http/control/gui/TestHttpTestSampleGui.java
    jmeter/trunk/test/src/org/apache/jmeter/protocol/http/sampler/PackageTest.java

Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/util/ButtonPanel.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/util/ButtonPanel.java?rev=1544707&r1=1544706&r2=1544707&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/util/ButtonPanel.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/util/ButtonPanel.java Fri Nov 22 22:40:20
2013
@@ -67,7 +67,7 @@ public class ButtonPanel extends JPanel 
             save.addActionListener(listener);
             break;
         default:
-        	throw new IllegalStateException("Unexpected button id: " + button);
+            throw new IllegalStateException("Unexpected button id: " + button);
         }
     }
 

Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/util/JSyntaxTextArea.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/util/JSyntaxTextArea.java?rev=1544707&r1=1544706&r2=1544707&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/util/JSyntaxTextArea.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/util/JSyntaxTextArea.java Fri Nov 22 22:40:20
2013
@@ -13,7 +13,7 @@
  * 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.gui.util;
@@ -34,7 +34,7 @@ public class JSyntaxTextArea extends RSy
 
     private final Properties languageProperties = JMeterUtils.loadProperties("org/apache/jmeter/gui/util/textarea.properties");
//$NON-NLS-1$;
 
-	private final boolean disableUndo;
+    private final boolean disableUndo;
 
     private static final boolean WRAP_STYLE_WORD = JMeterUtils.getPropDefault("jsyntaxtextarea.wrapstyleword",
true);
     private static final boolean LINE_WRAP       = JMeterUtils.getPropDefault("jsyntaxtextarea.linewrap",
true);
@@ -44,7 +44,7 @@ public class JSyntaxTextArea extends RSy
     @Deprecated
     public JSyntaxTextArea() {
         // For use by test code only
-    	this(30, 50, false);
+        this(30, 50, false);
     }
 
     /**
@@ -85,10 +85,10 @@ public class JSyntaxTextArea extends RSy
         super.setAntiAliasingEnabled(true);
         super.setLineWrap(LINE_WRAP);
         super.setWrapStyleWord(WRAP_STYLE_WORD);
-    	this.disableUndo = disableUndo;
-	}
+        this.disableUndo = disableUndo;
+    }
 
-	/**
+    /**
      * Sets the language of the text area.
      * @param language
      */
@@ -109,9 +109,9 @@ public class JSyntaxTextArea extends RSy
     protected RUndoManager createUndoManager() {
         RUndoManager undoManager = super.createUndoManager();
         if(disableUndo) {
-        	undoManager.setLimit(0);        	
+            undoManager.setLimit(0);
         } else {
-        	undoManager.setLimit(MAX_UNDOS);
+            undoManager.setLimit(MAX_UNDOS);
         }
         return undoManager;
     }
@@ -120,8 +120,8 @@ public class JSyntaxTextArea extends RSy
      * Sets initial text resetting undo history
      * @param string
      */
-	public void setInitialText(String string) {
-		setText(string);
-		discardAllEdits();
-	}
+    public void setInitialText(String string) {
+        setText(string);
+        discardAllEdits();
+    }
 }

Modified: jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleSenderFactory.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleSenderFactory.java?rev=1544707&r1=1544706&r2=1544707&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleSenderFactory.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleSenderFactory.java Fri Nov 22 22:40:20
2013
@@ -97,7 +97,7 @@ public class SampleSenderFactory {
                 // houston we have a problem !!
                 log.error("Unable to create a sample sender from class:'"+type+"', search
for mode property in jmeter.properties for correct configuration options");
                 throw new IllegalArgumentException("Unable to create a sample sender from
mode or class:'"
-                		+type+"', search for mode property in jmeter.properties for correct configuration
options, message:"+e.getMessage(), e);
+                        +type+"', search for mode property in jmeter.properties for correct
configuration options, message:"+e.getMessage(), e);
             }
 
             return s;

Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/JsoupBasedHtmlParser.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/JsoupBasedHtmlParser.java?rev=1544707&r1=1544706&r2=1544707&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/JsoupBasedHtmlParser.java
(original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/JsoupBasedHtmlParser.java
Fri Nov 22 22:40:20 2013
@@ -50,15 +50,15 @@ public class JsoupBasedHtmlParser extend
         }
         private URL url;
     }
-    
+
     private static final class JMeterNodeVisitor implements NodeVisitor {
 
         private URLCollection urls;
         private URLPointer baseUrl;
 
         /**
-         * @param baseUrl 
-         * @param urls 
+         * @param baseUrl
+         * @param urls
          */
         public JMeterNodeVisitor(final URLPointer baseUrl, URLCollection urls) {
             this.urls = urls;
@@ -74,15 +74,15 @@ public class JsoupBasedHtmlParser extend
 
         @Override
         public void head(Node node, int depth) {
-        	if (!(node instanceof Element)) {
-        		return;
-        	}
-        	Element tag = (Element) node;
+            if (!(node instanceof Element)) {
+                return;
+            }
+            Element tag = (Element) node;
             String tagName = tag.tagName().toLowerCase();
             if (tagName.equals(TAG_BODY)) {
                 extractAttribute(tag, ATT_BACKGROUND);
             } else if (tagName.equals(TAG_SCRIPT)) {
-            	extractAttribute(tag, ATT_SRC);
+                extractAttribute(tag, ATT_SRC);
             } else if (tagName.equals(TAG_BASE)) {
                 String baseref = tag.attr(ATT_HREF);
                 try {
@@ -98,8 +98,8 @@ public class JsoupBasedHtmlParser extend
             } else if (tagName.equals(TAG_APPLET)) {
                 extractAttribute(tag, ATT_CODE);
             } else if (tagName.equals(TAG_OBJECT)) {
-                extractAttribute(tag, ATT_CODEBASE);                
-                extractAttribute(tag, ATT_DATA);                 
+                extractAttribute(tag, ATT_CODEBASE);
+                extractAttribute(tag, ATT_DATA);
             } else if (tagName.equals(TAG_INPUT)) {
                 // we check the input tag type for image
                 if (ATT_IS_IMAGE.equalsIgnoreCase(tag.attr(ATT_TYPE))) {
@@ -132,17 +132,17 @@ public class JsoupBasedHtmlParser extend
             }
         }
 
-		@Override
-		public void tail(Node arg0, int arg1) {
-			// Noop
-		}
+        @Override
+        public void tail(Node arg0, int arg1) {
+            // Noop
+        }
     }
 
     @Override
     public Iterator<URL> getEmbeddedResourceURLs(byte[] html, URL baseUrl,
             URLCollection coll, String encoding) throws HTMLParseException {
         try {
-            String contents = new String(html,encoding); 
+            String contents = new String(html,encoding);
             Document doc = Jsoup.parse(contents);
             JMeterNodeVisitor nodeVisitor = new JMeterNodeVisitor(new URLPointer(baseUrl),
coll);
             new NodeTraversor(nodeVisitor).traverse(doc);

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=1544707&r1=1544706&r2=1544707&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
Fri Nov 22 22:40:20 2013
@@ -213,9 +213,9 @@ public class ProxyControl extends Generi
             KEYSTORE_MODE = KeystoreMode.USER_KEYSTORE;
             log.info("HTTP(S) Test Script Recorder will use the keystore '"+ CERT_PATH_ABS
+ "' with the alias: '" + CERT_ALIAS + "'");
         } else {
-        	if (!KeyToolUtils.haveKeytool()) {
-                KEYSTORE_MODE = KeystoreMode.NONE;        		
-        	} else if (KeyToolUtils.SUPPORTS_HOST_CERT && USE_DYNAMIC_KEYS) {
+            if (!KeyToolUtils.haveKeytool()) {
+                KEYSTORE_MODE = KeystoreMode.NONE;
+            } else if (KeyToolUtils.SUPPORTS_HOST_CERT && USE_DYNAMIC_KEYS) {
                 KEYSTORE_MODE = KeystoreMode.DYNAMIC_KEYSTORE;
                 log.info("HTTP(S) Test Script Recorder SSL Proxy will use keys that support
embedded 3rd party resources in file " + CERT_PATH_ABS);
             } else {
@@ -1219,7 +1219,7 @@ public class ProxyControl extends Generi
             initUserKeyStore();
             break;
         case NONE:
-        	throw new IOException("Cannot find keytool application and no keystore was provided");
+            throw new IOException("Cannot find keytool application and no keystore was provided");
         default:
             throw new IllegalStateException("Impossible case: " + KEYSTORE_MODE);
         }
@@ -1269,7 +1269,7 @@ public class ProxyControl extends Generi
                     log.warn("Could not open/read key store " + e.getMessage()); // message
includes the file name
                 }
             } catch (GeneralSecurityException e) {
-            	keyStore = null; // if cert is not valid, flag up to recreate it
+                keyStore = null; // if cert is not valid, flag up to recreate it
                 log.warn("Problem reading key store: " + e.getMessage());
             }
         }

Modified: jmeter/trunk/test/src/org/apache/jmeter/protocol/http/control/gui/TestHttpTestSampleGui.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/control/gui/TestHttpTestSampleGui.java?rev=1544707&r1=1544706&r2=1544707&view=diff
==============================================================================
--- jmeter/trunk/test/src/org/apache/jmeter/protocol/http/control/gui/TestHttpTestSampleGui.java
(original)
+++ jmeter/trunk/test/src/org/apache/jmeter/protocol/http/control/gui/TestHttpTestSampleGui.java
Fri Nov 22 22:40:20 2013
@@ -37,21 +37,21 @@ public class TestHttpTestSampleGui exten
 
         @Override
         public void setUp() {
-        	if(GraphicsEnvironment.isHeadless()) {
-        		System.out.println("Skipping test:"+getClass().getName()+", cannot run in Headless
mode");
-        		log.warn("Skipping test:"+getClass().getName()+", cannot run in Headless mode");
-        		return;
-        	}
+            if(GraphicsEnvironment.isHeadless()) {
+                System.out.println("Skipping test:"+getClass().getName()+", cannot run in
Headless mode");
+                log.warn("Skipping test:"+getClass().getName()+", cannot run in Headless
mode");
+                return;
+            }
             gui = new HttpTestSampleGui();
         }
 
         public void testCloneSampler() throws Exception {
-        	if(GraphicsEnvironment.isHeadless()) {
-        		System.out.println("Skipping test:"+getClass().getName()+"#testCloneSampler"+",
cannot run in Headless mode");
-        		log.warn("Skipping test:"+getClass().getName()+"#testCloneSampler"+", cannot run
in Headless mode");
-        		return;
-        	}
-        	HTTPSamplerBase sampler = (HTTPSamplerBase) gui.createTestElement();
+            if(GraphicsEnvironment.isHeadless()) {
+                System.out.println("Skipping test:"+getClass().getName()+"#testCloneSampler"+",
cannot run in Headless mode");
+                log.warn("Skipping test:"+getClass().getName()+"#testCloneSampler"+", cannot
run in Headless mode");
+                return;
+            }
+            HTTPSamplerBase sampler = (HTTPSamplerBase) gui.createTestElement();
             sampler.addArgument("param", "value");
             HTTPSamplerBase clonedSampler = (HTTPSamplerBase) sampler.clone();
             clonedSampler.setRunningVersion(true);

Modified: jmeter/trunk/test/src/org/apache/jmeter/protocol/http/sampler/PackageTest.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/sampler/PackageTest.java?rev=1544707&r1=1544706&r2=1544707&view=diff
==============================================================================
--- jmeter/trunk/test/src/org/apache/jmeter/protocol/http/sampler/PackageTest.java (original)
+++ jmeter/trunk/test/src/org/apache/jmeter/protocol/http/sampler/PackageTest.java Fri Nov
22 22:40:20 2013
@@ -41,13 +41,13 @@ public class PackageTest extends TestCas
     }
 
     public void testConfiguring() throws Exception {
-    	try {
-	        HTTPSamplerBase sampler = (HTTPSamplerBase) new HttpTestSampleGui().createTestElement();
-	        configure(sampler);
-    	} catch (HeadlessException e) {
+        try {
+            HTTPSamplerBase sampler = (HTTPSamplerBase) new HttpTestSampleGui().createTestElement();
+            configure(sampler);
+        } catch (HeadlessException e) {
             System.out.println("o.a.j.junit.JMeterTest Error running testConfiguring due
to Headless mode, "+e.toString());
             log.warn("o.a.j.junit.JMeterTest Error running testConfiguring due to Headless
mode, "+e.toString());
-    	}
+        }
     }
 
     private void configure(HTTPSamplerBase sampler) throws Exception {



Mime
View raw message