You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by fs...@apache.org on 2019/08/25 20:15:17 UTC

[jmeter] 01/06: Fix: Typos

This is an automated email from the ASF dual-hosted git repository.

fschumacher pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jmeter.git

commit 668b243f182403ad6c623db58945174020653886
Author: Anass BENOMAR <an...@gmail.com>
AuthorDate: Thu Aug 22 16:14:07 2019 +0100

    Fix: Typos
    
    Part of #480 on github
---
 .../src/main/java/org/apache/jmeter/assertions/XPath2Assertion.java | 2 +-
 .../src/main/java/org/apache/jmeter/assertions/gui/XPath2Panel.java | 2 +-
 .../src/main/java/org/apache/jmeter/assertions/gui/XPathPanel.java  | 2 +-
 .../src/main/java/org/apache/jmeter/sampler/TestAction.java         | 2 +-
 .../java/org/apache/jmeter/visualizers/SearchTextExtension.java     | 2 +-
 .../org/apache/jmeter/visualizers/backend/BackendListenerGui.java   | 2 +-
 .../visualizers/backend/influxdb/AbstractInfluxdbMetricsSender.java | 2 +-
 .../test/java/org/apache/jmeter/assertions/XPath2AssertionTest.java | 2 +-
 .../test/java/org/apache/jmeter/assertions/XPathAssertionTest.java  | 2 +-
 .../main/java/org/apache/jmeter/control/TransactionController.java  | 6 +++---
 .../main/java/org/apache/jmeter/gui/action/SearchTreeCommand.java   | 2 +-
 .../src/main/java/org/apache/jmeter/gui/util/TristateCheckBox.java  | 2 +-
 .../src/main/java/org/apache/jmeter/report/core/SampleMetadata.java | 2 +-
 .../java/org/apache/jmeter/report/processor/SampleConsumer.java     | 4 ++--
 .../jmeter/report/processor/graph/AbstractGraphValueSelector.java   | 2 +-
 src/core/src/main/java/org/apache/jmeter/reporters/Summariser.java  | 2 +-
 .../java/org/apache/jmeter/samplers/SampleSaveConfiguration.java    | 2 +-
 src/core/src/main/java/org/apache/jmeter/threads/ThreadGroup.java   | 2 +-
 .../src/main/java/org/apache/jmeter/functions/StringToFile.java     | 2 +-
 .../src/main/java/org/apache/jmeter/functions/TimeFunction.java     | 2 +-
 .../src/main/java/org/apache/jmeter/functions/TimeShift.java        | 2 +-
 .../src/main/java/org/apache/jorphan/gui/layout/VerticalLayout.java | 6 +++---
 .../java/org/apache/jmeter/protocol/http/control/AuthManager.java   | 2 +-
 .../java/org/apache/jmeter/protocol/http/curl/BasicCurlParser.java  | 2 +-
 .../jmeter/protocol/jms/sampler/TimeoutEnabledQueueRequestor.java   | 2 +-
 .../java/org/apache/jmeter/protocol/smtp/sampler/gui/SmtpPanel.java | 2 +-
 .../org/apache/jmeter/protocol/smtp/sampler/gui/SmtpSamplerGui.java | 2 +-
 27 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/src/components/src/main/java/org/apache/jmeter/assertions/XPath2Assertion.java b/src/components/src/main/java/org/apache/jmeter/assertions/XPath2Assertion.java
index 34ab208..9962516 100644
--- a/src/components/src/main/java/org/apache/jmeter/assertions/XPath2Assertion.java
+++ b/src/components/src/main/java/org/apache/jmeter/assertions/XPath2Assertion.java
@@ -71,7 +71,7 @@ public class XPath2Assertion extends AbstractScopedAssertion implements Serializ
         } catch (CompletionException|SaxonApiException e) { // NOSONAR We handle exception within result failure message
             result.setError(true);
             // CompletionException happens if caching fails
-            result.setFailureMessage("Exception occured computing assertion with XPath:" + getXPathString() + ", error:" + e.getMessage());
+            result.setFailureMessage("Exception occurred computing assertion with XPath:" + getXPathString() + ", error:" + e.getMessage());
             return result;
         }
         return result;
diff --git a/src/components/src/main/java/org/apache/jmeter/assertions/gui/XPath2Panel.java b/src/components/src/main/java/org/apache/jmeter/assertions/gui/XPath2Panel.java
index 3ceb4a0..4bc3a9b 100644
--- a/src/components/src/main/java/org/apache/jmeter/assertions/gui/XPath2Panel.java
+++ b/src/components/src/main/java/org/apache/jmeter/assertions/gui/XPath2Panel.java
@@ -166,7 +166,7 @@ public class XPath2Panel extends JPanel {
     }
 
     /**
-     * Negated chechbox
+     * Negated checkbox
      *
      * @return JCheckBox
      */
diff --git a/src/components/src/main/java/org/apache/jmeter/assertions/gui/XPathPanel.java b/src/components/src/main/java/org/apache/jmeter/assertions/gui/XPathPanel.java
index 903bd68..0184c45 100644
--- a/src/components/src/main/java/org/apache/jmeter/assertions/gui/XPathPanel.java
+++ b/src/components/src/main/java/org/apache/jmeter/assertions/gui/XPathPanel.java
@@ -122,7 +122,7 @@ public class XPathPanel extends JPanel {
     }
 
     /**
-     * Negated chechbox
+     * Negated checkbox
      *
      * @return JCheckBox
      */
diff --git a/src/components/src/main/java/org/apache/jmeter/sampler/TestAction.java b/src/components/src/main/java/org/apache/jmeter/sampler/TestAction.java
index 04f976d..c6d5d2b 100644
--- a/src/components/src/main/java/org/apache/jmeter/sampler/TestAction.java
+++ b/src/components/src/main/java/org/apache/jmeter/sampler/TestAction.java
@@ -65,7 +65,7 @@ public class TestAction extends AbstractSampler implements Interruptible {
      */
     public static final int RESTART_NEXT_LOOP = 3;
     /**
-     * Start next iteration of Current Looop
+     * Start next iteration of Current Loop
      */
     public static final int START_NEXT_ITERATION_CURRENT_LOOP = 4;
     /**
diff --git a/src/components/src/main/java/org/apache/jmeter/visualizers/SearchTextExtension.java b/src/components/src/main/java/org/apache/jmeter/visualizers/SearchTextExtension.java
index f1179a8..15d7a44 100644
--- a/src/components/src/main/java/org/apache/jmeter/visualizers/SearchTextExtension.java
+++ b/src/components/src/main/java/org/apache/jmeter/visualizers/SearchTextExtension.java
@@ -220,7 +220,7 @@ public class SearchTextExtension implements ActionListener, DocumentListener {
     }
 
     private Pattern createPattern(String textToFind) {
-        // desactivate or not specials regexp char
+        // deactivate or not specials regexp char
         String textToFindQ = regexpChkBox.isSelected() ? textToFind : Pattern.quote(textToFind);
         return caseChkBox.isSelected() ? Pattern.compile(textToFindQ) :
             Pattern.compile(textToFindQ, Pattern.CASE_INSENSITIVE);
diff --git a/src/components/src/main/java/org/apache/jmeter/visualizers/backend/BackendListenerGui.java b/src/components/src/main/java/org/apache/jmeter/visualizers/backend/BackendListenerGui.java
index 4a580eb..1c40a0c 100644
--- a/src/components/src/main/java/org/apache/jmeter/visualizers/backend/BackendListenerGui.java
+++ b/src/components/src/main/java/org/apache/jmeter/visualizers/backend/BackendListenerGui.java
@@ -73,7 +73,7 @@ public class BackendListenerGui extends AbstractListenerGui implements ActionLis
     /** A panel allowing the user to set arguments for this test. */
     private ArgumentsPanel argsPanel;
 
-    /** The current className of the Backend listenenr **/
+    /** The current className of the Backend listener **/
     private String className;
 
 
diff --git a/src/components/src/main/java/org/apache/jmeter/visualizers/backend/influxdb/AbstractInfluxdbMetricsSender.java b/src/components/src/main/java/org/apache/jmeter/visualizers/backend/influxdb/AbstractInfluxdbMetricsSender.java
index 6b32b7f..8ca41bb 100644
--- a/src/components/src/main/java/org/apache/jmeter/visualizers/backend/influxdb/AbstractInfluxdbMetricsSender.java
+++ b/src/components/src/main/java/org/apache/jmeter/visualizers/backend/influxdb/AbstractInfluxdbMetricsSender.java
@@ -34,7 +34,7 @@ abstract class AbstractInfluxdbMetricsSender implements InfluxdbMetricsSender {
 
     /**
      * For field always use a backslash character
-     * \ to escape " caractere
+     * \ to escape " character
      */
     static final String fieldToStringValue(String s) {
         return s.trim().replaceAll("\"", "\\\\\"");
diff --git a/src/components/src/test/java/org/apache/jmeter/assertions/XPath2AssertionTest.java b/src/components/src/test/java/org/apache/jmeter/assertions/XPath2AssertionTest.java
index b96600a..9ef7683 100644
--- a/src/components/src/test/java/org/apache/jmeter/assertions/XPath2AssertionTest.java
+++ b/src/components/src/test/java/org/apache/jmeter/assertions/XPath2AssertionTest.java
@@ -207,7 +207,7 @@ public class XPath2AssertionTest {
         response.setResponseData(xmlDoc, "UTF-8");
         AssertionResult res = assertion.getResult(response);
         assertTrue("When format of xpath is wrong, the test should failed",res.isError());
-        assertTrue(res.getFailureMessage().contains("Exception occured computing assertion with XPath"));
+        assertTrue(res.getFailureMessage().contains("Exception occurred computing assertion with XPath"));
     }
 
     @Test
diff --git a/src/components/src/test/java/org/apache/jmeter/assertions/XPathAssertionTest.java b/src/components/src/test/java/org/apache/jmeter/assertions/XPathAssertionTest.java
index 3a43720..80db055 100644
--- a/src/components/src/test/java/org/apache/jmeter/assertions/XPathAssertionTest.java
+++ b/src/components/src/test/java/org/apache/jmeter/assertions/XPathAssertionTest.java
@@ -465,7 +465,7 @@ public class XPathAssertionTest extends JMeterTestCase {
         AssertionResult res = assertion.getResult(jmctx.getPreviousResult());
         log.debug(" res {}", res.isError());
         log.debug(" failure {}", res.getFailureMessage());
-        assertTrue("When the user give namspaces, un transformerException should be throw",
+        assertTrue("When the user give namespaces, un transformerException should be throw",
                 res.getFailureMessage().contains("TransformerException"));
     }
 }
diff --git a/src/core/src/main/java/org/apache/jmeter/control/TransactionController.java b/src/core/src/main/java/org/apache/jmeter/control/TransactionController.java
index c1655d9..e884676 100644
--- a/src/core/src/main/java/org/apache/jmeter/control/TransactionController.java
+++ b/src/core/src/main/java/org/apache/jmeter/control/TransactionController.java
@@ -86,7 +86,7 @@ public class TransactionController extends GenericController implements SampleLi
     private transient int noFailingSamples;
 
     /**
-     * Cumulated pause time to excluse timer and post/pre processor times
+     * Cumulated pause time to exclude timer and post/pre processor times
      * Only used in NON parent Mode
      */
     private transient long pauseTime;
@@ -263,7 +263,7 @@ public class TransactionController extends GenericController implements SampleLi
             // See Bug 56811
             // triggerEndOfLoop is called when error occurs to end Main Loop
             // in this case normal workflow doesn't happen, so we need
-            // to notify the childs of TransactionController and
+            // to notify the child of TransactionController and
             // update them with SubSamplerResult
             if(subSampler instanceof TransactionSampler) {
                 TransactionSampler tc = (TransactionSampler) subSampler;
@@ -292,7 +292,7 @@ public class TransactionController extends GenericController implements SampleLi
         } else {
             SampleEvent event = new SampleEvent(res, threadContext.getThreadGroup().getName(),threadVars, true);
             // We must set res to null now, before sending the event for the transaction,
-            // so that we can ignore that event in our sampleOccured method
+            // so that we can ignore that event in our sampleOccurred method
             res = null;
             lnf.notifyListeners(event, pack.getSampleListeners());
         }
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/action/SearchTreeCommand.java b/src/core/src/main/java/org/apache/jmeter/gui/action/SearchTreeCommand.java
index 7edd87a..985f256 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/action/SearchTreeCommand.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/action/SearchTreeCommand.java
@@ -44,7 +44,7 @@ public class SearchTreeCommand extends AbstractAction {
      * This method tries to find a JFrame ancestor from the specified source in
      * order to be the parent of the search dialog.<br>
      * With no parent set the search dialog might be hidden by the main JFrame when
-     * focus is transfered to that JFrame.
+     * focus is transferred to that JFrame.
      * </p>
      * <p>
      * If no parent if found, then we give up and build a search dialog with no
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/util/TristateCheckBox.java b/src/core/src/main/java/org/apache/jmeter/gui/util/TristateCheckBox.java
index bdd65d4..d1047cf 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/util/TristateCheckBox.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/util/TristateCheckBox.java
@@ -302,7 +302,7 @@ public final class TristateCheckBox extends JCheckBox {
         private final int iconWidth;
 
         public TristateCheckBoxIcon() {
-            // Assume that the UI has not changed since the checkbos was created
+            // Assume that the UI has not changed since the checkbox was created
             UIDefaults defaults = UIManager.getLookAndFeelDefaults();
             final Icon icon = (Icon) defaults.get("CheckBox.icon");
             iconHeight = icon.getIconHeight();
diff --git a/src/core/src/main/java/org/apache/jmeter/report/core/SampleMetadata.java b/src/core/src/main/java/org/apache/jmeter/report/core/SampleMetadata.java
index 86eff41..0f852cd 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/core/SampleMetadata.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/core/SampleMetadata.java
@@ -168,7 +168,7 @@ public class SampleMetadata {
      *            based)
      * @return The column name of the ith column
      * @throws IndexOutOfBoundsException
-     *             If the requested columln does not exist (&lt; 0 or &gt;
+     *             If the requested column does not exist (&lt; 0 or &gt;
      *             <code>getColumnCount()</code>)
      */
     public String getColumnName(int i) {
diff --git a/src/core/src/main/java/org/apache/jmeter/report/processor/SampleConsumer.java b/src/core/src/main/java/org/apache/jmeter/report/processor/SampleConsumer.java
index 3d5d2d0..a6bbbae 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/processor/SampleConsumer.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/processor/SampleConsumer.java
@@ -59,10 +59,10 @@ public interface SampleConsumer extends SampleProcessor {
      * channel.
      *
      * @param sampleMetadata
-     *            The sample metadata that are beeing consumed for the
+     *            The sample metadata that are being consumed for the
      *            associated channel
      * @param channel
-     *            The channel whose sample metadata are beeing defined
+     *            The channel whose sample metadata are being defined
      */
     void setConsumedMetadata(SampleMetadata sampleMetadata, int channel);
 
diff --git a/src/core/src/main/java/org/apache/jmeter/report/processor/graph/AbstractGraphValueSelector.java b/src/core/src/main/java/org/apache/jmeter/report/processor/graph/AbstractGraphValueSelector.java
index aeda7fe..d81cab1 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/processor/graph/AbstractGraphValueSelector.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/processor/graph/AbstractGraphValueSelector.java
@@ -21,7 +21,7 @@ import org.apache.jmeter.control.TransactionController;
 import org.apache.jmeter.samplers.SampleResult;
 
 /**
- * Base class allowing to select wether we ignore or not TC Sample Results
+ * Base class allowing to select whether we ignore or not TC Sample Results
  */
 abstract class AbstractGraphValueSelector implements GraphValueSelector {
     private boolean ignoreTransactionController;
diff --git a/src/core/src/main/java/org/apache/jmeter/reporters/Summariser.java b/src/core/src/main/java/org/apache/jmeter/reporters/Summariser.java
index fed5a3d..73f9d2f 100644
--- a/src/core/src/main/java/org/apache/jmeter/reporters/Summariser.java
+++ b/src/core/src/main/java/org/apache/jmeter/reporters/Summariser.java
@@ -64,7 +64,7 @@ public class Summariser extends AbstractTestElement
 
     /*
      * N.B. NoThreadClone is used to ensure that the testStarted() methods will share the same
-     * instance as the sampleOccured() methods, so the testStarted() method can fetch the
+     * instance as the sampleOccurred() methods, so the testStarted() method can fetch the
      * Totals accumulator object for the samples to be stored in.
      */
 
diff --git a/src/core/src/main/java/org/apache/jmeter/samplers/SampleSaveConfiguration.java b/src/core/src/main/java/org/apache/jmeter/samplers/SampleSaveConfiguration.java
index 6f049a3..8f74921 100644
--- a/src/core/src/main/java/org/apache/jmeter/samplers/SampleSaveConfiguration.java
+++ b/src/core/src/main/java/org/apache/jmeter/samplers/SampleSaveConfiguration.java
@@ -372,7 +372,7 @@ public class SampleSaveConfiguration implements Cloneable, Serializable {
             IS_XML = true;
         } else {
             if (!CSV.equals(howToSave)) {
-                log.warn("{} has unexepected value: '{}' - assuming 'csv' format", OUTPUT_FORMAT_PROP, howToSave);
+                log.warn("{} has unexpected value: '{}' - assuming 'csv' format", OUTPUT_FORMAT_PROP, howToSave);
             }
             IS_XML = false;
         }
diff --git a/src/core/src/main/java/org/apache/jmeter/threads/ThreadGroup.java b/src/core/src/main/java/org/apache/jmeter/threads/ThreadGroup.java
index bf5c250..f855ed6 100644
--- a/src/core/src/main/java/org/apache/jmeter/threads/ThreadGroup.java
+++ b/src/core/src/main/java/org/apache/jmeter/threads/ThreadGroup.java
@@ -361,7 +361,7 @@ public class ThreadGroup extends AbstractThreadGroup {
     }
 
     /**
-     * Hard Stop JMeterThread thrd and interrupt JVM Thread if interrupt is true
+     * Hard Stop JMeterThread third and interrupt JVM Thread if interrupt is true
      * @param jmeterThread {@link JMeterThread}
      * @param jvmThread {@link Thread}
      * @param interrupt Interrupt thread or not
diff --git a/src/functions/src/main/java/org/apache/jmeter/functions/StringToFile.java b/src/functions/src/main/java/org/apache/jmeter/functions/StringToFile.java
index 5d542ca..d692570 100644
--- a/src/functions/src/main/java/org/apache/jmeter/functions/StringToFile.java
+++ b/src/functions/src/main/java/org/apache/jmeter/functions/StringToFile.java
@@ -50,7 +50,7 @@ import org.slf4j.LoggerFactory;
  *  <li>append (true/false)(optional)</li>
  *  <li>file encoding (optional)</li>
  * </ul>
- * Returns: true if ok , false if an error occured
+ * Returns: true if ok , false if an error occurred
  *
  * @since 5.2
  */
diff --git a/src/functions/src/main/java/org/apache/jmeter/functions/TimeFunction.java b/src/functions/src/main/java/org/apache/jmeter/functions/TimeFunction.java
index 19534ec..ef3ee35 100644
--- a/src/functions/src/main/java/org/apache/jmeter/functions/TimeFunction.java
+++ b/src/functions/src/main/java/org/apache/jmeter/functions/TimeFunction.java
@@ -68,7 +68,7 @@ public class TimeFunction extends AbstractFunction {
                 JMeterUtils.getPropDefault("time.USER2","")); //$NON-NLS-1$
     }
 
-    // Ensure that these are set, even if no paramters are provided
+    // Ensure that these are set, even if no parameters are provided
     private String format   = ""; //$NON-NLS-1$
     private String variable = ""; //$NON-NLS-1$
 
diff --git a/src/functions/src/main/java/org/apache/jmeter/functions/TimeShift.java b/src/functions/src/main/java/org/apache/jmeter/functions/TimeShift.java
index 927b0f7..a3d45a2 100644
--- a/src/functions/src/main/java/org/apache/jmeter/functions/TimeShift.java
+++ b/src/functions/src/main/java/org/apache/jmeter/functions/TimeShift.java
@@ -71,7 +71,7 @@ public class TimeShift extends AbstractFunction {
             JMeterUtils.getResString("date_to_shift"), JMeterUtils.getResString("value_to_shift"), JMeterUtils.getResString("locale_format"),
             JMeterUtils.getResString("function_name_paropt"));
 
-    // Ensure that these are set, even if no paramters are provided
+    // Ensure that these are set, even if no parameters are provided
     private String format = ""; //$NON-NLS-1$
     private CompoundVariable dateToShiftCompound; // $NON-NLS-1$
     private CompoundVariable amountToShiftCompound; // $NON-NLS-1$
diff --git a/src/jorphan/src/main/java/org/apache/jorphan/gui/layout/VerticalLayout.java b/src/jorphan/src/main/java/org/apache/jorphan/gui/layout/VerticalLayout.java
index 80d45cf..239fbc2 100644
--- a/src/jorphan/src/main/java/org/apache/jorphan/gui/layout/VerticalLayout.java
+++ b/src/jorphan/src/main/java/org/apache/jorphan/gui/layout/VerticalLayout.java
@@ -98,7 +98,7 @@ public class VerticalLayout implements LayoutManager, Serializable {
      * to the top with the specified vgap.
      *
      * @param vgap
-     *            an int value indicating the vertical seperation of the
+     *            an int value indicating the vertical separation of the
      *            components
      */
     public VerticalLayout(int vgap) {
@@ -110,7 +110,7 @@ public class VerticalLayout implements LayoutManager, Serializable {
      * specified vgap and horizontal alignment.
      *
      * @param vgap
-     *            an int value indicating the vertical seperation of the
+     *            an int value indicating the vertical separation of the
      *            components
      * @param alignment
      *            an int value which is one of <code>RIGHT, LEFT,
@@ -126,7 +126,7 @@ public class VerticalLayout implements LayoutManager, Serializable {
      * alignment and anchoring
      *
      * @param vgap
-     *            an int value indicating the vertical seperation of the
+     *            an int value indicating the vertical separation of the
      *            components
      * @param alignment
      *            an int value which is one of <code>RIGHT, LEFT, CENTER,
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/AuthManager.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/AuthManager.java
index f66c906..96bdaab 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/AuthManager.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/AuthManager.java
@@ -401,7 +401,7 @@ public class AuthManager extends ConfigTestElement implements TestStateListener,
                         String pass = tokens[2];
                         String domain;
                         String realm;
-                        if (tokens.length > 3){ // Allow for old format file without the extra columnns
+                        if (tokens.length > 3){ // Allow for old format file without the extra columns
                             domain = tokens[3];
                             realm = tokens[4];
                         } else {
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/curl/BasicCurlParser.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/curl/BasicCurlParser.java
index 04113a3..86510d8 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/curl/BasicCurlParser.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/curl/BasicCurlParser.java
@@ -260,7 +260,7 @@ public class BasicCurlParser {
         }
 
         /**
-         * Tranform the bandwidth to cps value (byte/s), cps =
+         * Transform the bandwidth to cps value (byte/s), cps =
          * bandwidth*1024/8, the unit of bandwidth in JMeter is measured in kbit/s. And
          * the speed in Curl is measured in bytes/second, so the conversion formula is
          * cps=limitRate*1024
diff --git a/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/TimeoutEnabledQueueRequestor.java b/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/TimeoutEnabledQueueRequestor.java
index 7fcbe12..904c3fd 100644
--- a/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/TimeoutEnabledQueueRequestor.java
+++ b/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/TimeoutEnabledQueueRequestor.java
@@ -58,7 +58,7 @@ public class TimeoutEnabledQueueRequestor {
      * <code>DUPS_OK_ACKNOWLEDGE</code>.
      *
      * @param session the <code>QueueSession</code> the queue belongs to, session will not be closed by {@link TimeoutEnabledQueueRequestor}
-     * @param queue the queue to performthe request/reply call on
+     * @param queue the queue to perform the request/reply call on
      *
      * @exception JMSException
      *                if the JMS provider fails to create the
diff --git a/src/protocol/mail/src/main/java/org/apache/jmeter/protocol/smtp/sampler/gui/SmtpPanel.java b/src/protocol/mail/src/main/java/org/apache/jmeter/protocol/smtp/sampler/gui/SmtpPanel.java
index 8178082..a790e36 100644
--- a/src/protocol/mail/src/main/java/org/apache/jmeter/protocol/smtp/sampler/gui/SmtpPanel.java
+++ b/src/protocol/mail/src/main/java/org/apache/jmeter/protocol/smtp/sampler/gui/SmtpPanel.java
@@ -94,7 +94,7 @@ public class SmtpPanel extends JPanel {
     private SecuritySettingsPanel securitySettingsPanel;
 
     /**
-     * Creates new form SmtpPanel, standard constructer. Calls
+     * Creates new form SmtpPanel, standard constructor. Calls
      * initComponents();.
      */
     public SmtpPanel() {
diff --git a/src/protocol/mail/src/main/java/org/apache/jmeter/protocol/smtp/sampler/gui/SmtpSamplerGui.java b/src/protocol/mail/src/main/java/org/apache/jmeter/protocol/smtp/sampler/gui/SmtpSamplerGui.java
index fe8d8d7..6c83a33 100644
--- a/src/protocol/mail/src/main/java/org/apache/jmeter/protocol/smtp/sampler/gui/SmtpSamplerGui.java
+++ b/src/protocol/mail/src/main/java/org/apache/jmeter/protocol/smtp/sampler/gui/SmtpSamplerGui.java
@@ -41,7 +41,7 @@ public class SmtpSamplerGui extends AbstractSamplerGui {
     private SmtpPanel smtpPanel;
 
     /**
-     * Creates new SmtpSamplerGui, standard constructer. Calls init();
+     * Creates new SmtpSamplerGui, standard constructor. Calls init();
      */
     public SmtpSamplerGui() {
         init();