Fix some typo in variable name, comments, log and properties messages

bin/report-template/sbadmin2-1.0.7/bower_components/flot/API.md

@@ -143,7 +143,7 @@ the plot, see below.
 
 The rest of the options are all documented below as they are the same
 as the default options passed in via the options parameter in the plot
-commmand. When you specify them for a specific data series, they will
+command. When you specify them for a specific data series, they will
 override the default options for the plot for that data series.
 
 Here's a complete example of a simple data specification:

bin/report-template/sbadmin2-1.0.7/bower_components/jquery/src/ajax.js

@@ -188,7 +188,7 @@ function ajaxConvert( s, response, jqXHR, isSuccess ) {
 		// Work with a copy of dataTypes in case we need to modify it for conversion
 		dataTypes = s.dataTypes.slice();
 
-	// Create converters map with lowercased keys
+	// Create converters map with lowerCased keys
 	if ( dataTypes[ 1 ] ) {
 		for ( conv in s.converters ) {
 			converters[ conv.toLowerCase() ] = s.converters[ conv ];

bin/report-template/sbadmin2-1.0.7/bower_components/jquery/src/css.js

@@ -117,7 +117,7 @@ function getWidthOrHeight( elem, name, extra ) {
 	// svg - https://bugzilla.mozilla.org/show_bug.cgi?id=649285
 	// MathML - https://bugzilla.mozilla.org/show_bug.cgi?id=491668
 	if ( val <= 0 || val == null ) {
-		// Fall back to computed then uncomputed css if necessary
+		// Fall back to computed then unComputed css if necessary
 		val = curCSS( elem, name, styles );
 		if ( val < 0 || val == null ) {
 			val = elem.style[ name ];
@@ -254,7 +254,7 @@ jQuery.extend({
 
 		name = jQuery.cssProps[ origName ] || ( jQuery.cssProps[ origName ] = vendorPropName( style, origName ) );
 
-		// Gets hook for the prefixed version, then unprefixed version
+		// Gets hook for the prefixed version, then unPrefixed version
 		hooks = jQuery.cssHooks[ name ] || jQuery.cssHooks[ origName ];
 
 		// Check if we're setting a value
@@ -307,7 +307,7 @@ jQuery.extend({
 		// Make sure that we're working with the right name
 		name = jQuery.cssProps[ origName ] || ( jQuery.cssProps[ origName ] = vendorPropName( elem.style, origName ) );
 
-		// Try prefixed name followed by the unprefixed name
+		// Try prefixed name followed by the unPrefixed name
 		hooks = jQuery.cssHooks[ name ] || jQuery.cssHooks[ origName ];
 
 		// If a hook was provided get the computed value from there

bin/saveservice.properties

@@ -47,7 +47,7 @@
 # Conversion version (for JMX output files)
 # Must be updated if the file has been changed since the previous release
 # Format is:
-# Save service version=JMeter version at which change occured
+# Save service version=JMeter version at which change occurred
 # 1.7 = 2.1.1
 # 1.8 = 2.1.2
 # (Some version updates were missed here...)

build.xml

@@ -83,7 +83,7 @@
 
   -->
 
-  <!-- Minimal version of Apache Ant requiere by this Ant script -->
+  <!-- Minimal version of Apache Ant required by this Ant script -->
   <property name="ant.version.required" value="1.8.2" />
 
   <!-- Are we running under Gump? -->
@@ -901,7 +901,7 @@
      description="Compile everything and create the jars"/>
 
   <target name="package-and-check" depends="clean, download_jars, package, checkstyle, rat"
-     description="Compile, create jars and apply checkstyle before commiting code"/>
+     description="Compile, create jars and apply checkstyle before committing code"/>
 
   <target name="prepare-resources"
      description="Prepare some resources files, update date">
@@ -2257,7 +2257,7 @@ run JMeter unless all the JMeter jars are added.
       <format property="THISYEAR" pattern="yyyy"/>
     </tstamp>
 
-    <!-- JMeter Javadoc version (own variable is used so can be overriden independently) -->
+    <!-- JMeter Javadoc version (own variable is used so can be overridden independently) -->
     <property name="docversion" value="${jmeter.version}"/>
 
     <mkdir dir="${dest.docs.api}"/>

docs/changes_history.html

@@ -4826,7 +4826,7 @@ <h2>Incompatible changes</h2>
     <li>JSR223 Test Elements that have an invalid filename (not existing or unreadable) will make test fail instead of 
     making the element silently work</li>
     <li>In JSR223 Test Elements: responseCodeOk, responseMessageOK and successful are set before
-     script is executed, if responseData is set it will not be overriden anymore by a toString() on script return value</li>
+     script is executed, if responseData is set it will not be overridden anymore by a toString() on script return value</li>
 </ul>
 </p>
 

extras/build.xml

@@ -150,7 +150,7 @@
     </condition>
 
     <target name="_message_xalan" unless="xalan.present">
-          <echo>Cannot find all xalan and/or serialiser jars</echo>
+          <echo>Cannot find all xalan and/or serializer jars</echo>
         <echo>The XSLT formatting may not work correctly.</echo>
         <echo>Check you have xalan and serializer jars in ${lib.dir}</echo>
     </target>

src/components/org/apache/jmeter/assertions/BeanShellAssertion.java

@@ -109,7 +109,7 @@ public AssertionResult getResult(SampleResult response) {
                     .toString()));
             result.setError(false);
         }
-        catch (NoClassDefFoundError ex) { // NOSONAR explicitely trap this error to make tests work better 
+        catch (NoClassDefFoundError ex) { // NOSONAR explicitly trap this error to make tests work better
             log.error("BeanShell Jar missing? " + ex.toString());
             result.setError(true);
             result.setFailureMessage("BeanShell Jar missing? " + ex.toString());

src/components/org/apache/jmeter/control/ForeachController.java

@@ -30,7 +30,7 @@
 
 /**
  * ForeachController that iterates over a list of variables named XXXX_NN stored in {@link JMeterVariables}
- * where NN is a number starting from 1 to number of occurences.
+ * where NN is a number starting from 1 to number of occurrences.
  * This list of variable is usually set by PostProcessor (Regexp PostProcessor or {@link org.apache.jmeter.extractor.HtmlExtractor})
  * Iteration can take the full list or only a subset (configured through indexes)
  *

src/components/org/apache/jmeter/control/ModuleController.java

@@ -148,7 +148,7 @@ public void resolveReplacementSubTree(JMeterTreeNode context) {
     /**
      * In GUI Mode replacement occurs when test start
      * In Non GUI Mode replacement occurs before test runs
-     * @return true if replacement occured at the time method is called
+     * @return true if replacement occurred at the time method is called
      */
     private boolean hasReplacementOccured() {
         if(GuiPackage.getInstance() != null) {

src/components/org/apache/jmeter/control/gui/CriticalSectionControllerGui.java

@@ -30,7 +30,7 @@
 import org.apache.jmeter.util.JMeterUtils;
 
 /**
- * The user interface for a controller which specifies that its subcomponents
+ * The user interface for a controller which specifies that its subComponents
  * should be executed while a condition holds. This component can be used
  * standalone or embedded into some other component.
  * 
@@ -51,7 +51,7 @@ public class CriticalSectionControllerGui extends AbstractControllerGui {
     /**
      * Boolean indicating whether or not this component should display its name.
      * If true, this is a standalone component. If false, this component is
-     * intended to be used as a subpanel for another component.
+     * intended to be used as a subPanel for another component.
      */
     private boolean displayName = true;
 
@@ -69,7 +69,7 @@ public CriticalSectionControllerGui() {
      * @param displayName
      *            indicates whether or not this component should display its
      *            name. If true, this is a standalone component. If false, this
-     *            component is intended to be used as a subpanel for another
+     *            component is intended to be used as a subPanel for another
      *            component.
      */
     public CriticalSectionControllerGui(boolean displayName) {

src/components/org/apache/jmeter/modifiers/CounterConfig.java

@@ -139,7 +139,7 @@ private String formatNumber(long value){
                 DecimalFormat myFormatter = new DecimalFormat(format);
                 return myFormatter.format(value);
             } catch (IllegalArgumentException ignored) {
-                log.warn("Error formating {} at format {}, using default", value, format);
+                log.warn("Error formatting {} at format {}, using default", value, format);
             }
         }
         return Long.toString(value);

src/components/org/apache/jmeter/visualizers/RenderAsHTML.java

@@ -112,7 +112,7 @@ protected void showRenderedResponse(String response, SampleResult res, boolean e
         } catch (NumberFormatException e) {
             // Java Bug : http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=9001188.
             // See https://bz.apache.org/bugzilla/show_bug.cgi?id=54586
-            log.warn("An error occured rendering html code", e);
+            log.warn("An error occurred rendering html code", e);
             results.setText("Failed to render HTML: " + e.getMessage() +", use Text renderer");            
         }
     }

src/components/org/apache/jmeter/visualizers/SearchTreePanel.java

@@ -164,7 +164,7 @@ private void doResetSearch(SearchableTreeNode searchableTreeNode) {
 
 
     /**
-     * return true if a match occured
+     * return true if a match occurred
      */
     private boolean doSearch() {
         String wordToSearch = searchTF.getText();

src/core/org/apache/jmeter/control/Controller.java

@@ -59,7 +59,7 @@ public interface Controller extends TestElement {
     void initialize();
 
     /**
-     * Unregister IterationListener
+     * UnRegister IterationListener
      * @param iterationListener {@link LoopIterationListener}
      */
     void removeIterationListener(LoopIterationListener iterationListener);

src/core/org/apache/jmeter/control/GenericController.java

@@ -226,7 +226,7 @@ protected Sampler nextIsAController(Controller controller) throws NextIsNullExce
 
     /**
      * Increment the current pointer and return the element. Called by
-     * {@link #next()} if the element is a sampler. (May be overriden by
+     * {@link #next()} if the element is a sampler. (May be overridden by
      * sub-classes).
      *
      * @param element

src/core/org/apache/jmeter/engine/ClientJMeterEngine.java

@@ -159,7 +159,7 @@ public void runTest() throws JMeterEngineException {
 
     /**
      * Tidy up RMI access to allow JMeter client to exit.
-     * Currently just interrups the "RMI Reaper" thread.
+     * Currently just interrupts the "RMI Reaper" thread.
      * @param logger where to log the information
      */
     public static void tidyRMI(Logger logger) {

src/core/org/apache/jmeter/engine/util/CompoundVariable.java

@@ -58,9 +58,9 @@ public class CompoundVariable implements Function {
 
     static {
         try {
-            final String contain = // Classnames must contain this string [.functions.]
+            final String contain = // ClassNames must contain this string [.functions.]
                 JMeterUtils.getProperty("classfinder.functions.contain"); // $NON-NLS-1$
-            final String notContain = // Classnames must not contain this string [.gui.]
+            final String notContain = // ClassNames must not contain this string [.gui.]
                 JMeterUtils.getProperty("classfinder.functions.notContain"); // $NON-NLS-1$
             if (contain!=null){
                 log.info("Note: Function class names must contain the string: '{}'", contain);

src/core/org/apache/jmeter/gui/JMeterGUIComponent.java

@@ -84,7 +84,7 @@ public interface JMeterGUIComponent extends ClearGui {
      * the component's label in the local language. The resource name is fixed,
      * and does not vary with the selected language.
      *
-     * Normally this method should be overriden in preference to overriding
+     * Normally this method should be overridden in preference to overriding
      * getStaticLabel(). However where the resource name is not available or required,
      * getStaticLabel() may be overridden instead.
      *

src/core/org/apache/jmeter/gui/action/ActionRouter.java

@@ -302,14 +302,14 @@ public void populateCommandMap() {
         }
         try {
             List<String> listClasses = ClassFinder.findClassesThatExtend(
-                    JMeterUtils.getSearchPaths(), // strPathsOrJars - pathnames or jarfiles to search for classes
+                    JMeterUtils.getSearchPaths(), // strPathsOrJars - pathNames or jarfiles to search for classes
                     // classNames - required parent class(es) or annotations
                     new Class[] {Class.forName("org.apache.jmeter.gui.action.Command") }, // $NON-NLS-1$
                     false, // innerClasses - should we include inner classes?
-                    null, // contains - classname should contain this string
+                    null, // contains - className should contain this string
                     // Ignore the classes which are specific to the reporting tool
-                    "org.apache.jmeter.report.gui", // $NON-NLS-1$ // notContains - classname should not contain this string
-                    false); // annotations - true if classnames are annotations
+                    "org.apache.jmeter.report.gui", // $NON-NLS-1$ // notContains - className should not contain this string
+                    false); // annotations - true if classNames are annotations
             if (listClasses.isEmpty()) {
                 log.error("!!!!!Uh-oh, didn't find any action handlers!!!!!");
                 throw new JMeterError("No action handlers found - check JMeterHome and libraries");

src/core/org/apache/jmeter/gui/action/SearchTreeDialog.java

@@ -246,7 +246,7 @@ private void doSearch(ActionEvent e) {
                     nodes.addAll(matchingNodes);
                 }
             } catch (Exception ex) {
-                logger.error("Error occured searching for word:"+ wordToSearch+ " in node:"+jMeterTreeNode.getName(), ex);
+                logger.error("Error occurred searching for word:"+ wordToSearch+ " in node:"+jMeterTreeNode.getName(), ex);
             }
         }
         GuiPackage guiInstance = GuiPackage.getInstance();
@@ -266,7 +266,7 @@ private void doSearch(ActionEvent e) {
     }
 
     /**
-     * Replace all occurences in nodes that contain {@link Replaceable} Test Elements
+     * Replace all occurrences in nodes that contain {@link Replaceable} Test Elements
      * @param e {@link ActionEvent}
      */
     private void doReplaceAll(ActionEvent e) {
@@ -313,10 +313,10 @@ private void doReplaceAll(ActionEvent e) {
                     }
                 }
             } catch (Exception ex) {
-                logger.error("Error occured replacing data in node:"+jMeterTreeNode.getName(), ex);
+                logger.error("Error occurred replacing data in node:"+jMeterTreeNode.getName(), ex);
             }
         }
-        statusLabel.setText(MessageFormat.format("Replaced {0} occurences", new Object[]{totalReplaced}));
+        statusLabel.setText(MessageFormat.format("Replaced {0} occurrences", new Object[]{totalReplaced}));
         GuiPackage guiInstance = GuiPackage.getInstance();
         JTree jTree = guiInstance.getMainFrame().getTree();
 

src/core/org/apache/jmeter/gui/action/template/TemplateManager.java

@@ -153,7 +153,7 @@ private Map<String, Template> readTemplates() {
                     }
                 } catch(Exception ex) {
                     if (log.isWarnEnabled()) {
-                        log.warn("Ignoring template file:'{}', an error occured parsing the file", f.getAbsolutePath(),
+                        log.warn("Ignoring template file:'{}', an error occurred parsing the file", f.getAbsolutePath(),
                                 ex);
                     }
                 } 

src/core/org/apache/jmeter/report/config/ConfigurationUtils.java

@@ -28,7 +28,7 @@
  */
 public class ConfigurationUtils {
 
-    private static final String NOT_SUPPORTED_CONVERTION_FMT = "Convert \"%s\" to \"%s\" is not supported";
+    private static final String NOT_SUPPORTED_CONVERSION_FMT = "Convert \"%s\" to \"%s\" is not supported";
 
     /**
      * Instantiates a new configuration utils.
@@ -55,7 +55,7 @@ public static <TProperty> TProperty convert(String value,
             return Converters.convert(clazz, value);
         } catch (ConvertException ex) {
             throw new ConfigurationException(String.format(
-                NOT_SUPPORTED_CONVERTION_FMT, value, clazz.getName()));
+                NOT_SUPPORTED_CONVERSION_FMT, value, clazz.getName()));
         }
     }
 }

src/core/org/apache/jmeter/report/config/ReportGeneratorConfiguration.java

@@ -638,7 +638,7 @@ public static ReportGeneratorConfiguration loadFromProperties(
                 long.class).longValue();
         configuration.setApdexToleratedThreshold(apdexToleratedThreshold);
 
-        // Load apdex per transactions, overriden by user
+        // Load apdex per transactions, overridden by user
         final String apdexPerTransaction = getOptionalProperty(props, 
                 REPORT_GENERATOR_KEY_APDEX_PER_TRANSACTION, 
                 String.class);

src/core/org/apache/jmeter/report/core/AbstractSampleWriter.java

@@ -40,7 +40,7 @@
  * </p>
  * <p>
  * When a writer is set on the sample writer any previous writer is flushed and
- * closed before beeing replaced by the new one.
+ * closed before being replaced by the new one.
  * </p>
  * 
  * @since 3.0
@@ -77,7 +77,7 @@ public void setWriter(Writer newWriter) {
 
     /**
      * Instructs this sample writer to write samples on the specified output
-     * with UTG-8 encoding. The encoding can be overriden by the user through
+     * with UTG-8 encoding. The encoding can be overridden by the user through
      * {@link SaveService#getFileEncoding(String)}
      * 
      * @param out
@@ -97,8 +97,8 @@ public void setOutputStream(OutputStream out) {
      * Set the destination file in which this sample writer will write samples
      * 
      * @param output
-     *            The ouput file that will receive samples written by this
-     *            sample writter
+     *            The output file that will receive samples written by this
+     *            sample writer
      */
     public void setOutputFile(File output) {
         FileOutputStream fos = null;
@@ -111,7 +111,7 @@ public void setOutputFile(File output) {
     }
 
     /**
-     * This method is guaranted to not throw any exception. If writer is already
+     * This method is guaranteed to not throw any exception. If writer is already
      * closed then does nothing.<br>
      * Any buffered data is flushed by this method.
      */

src/core/org/apache/jmeter/report/core/CsvSampleWriter.java

@@ -37,7 +37,7 @@
  */
 public class CsvSampleWriter extends AbstractSampleWriter {
 
-    /** The number of columnns for each row */
+    /** The number of columns for each row */
     private int columnCount;
 
     /** The separator to be used in between data on each row */
@@ -129,7 +129,7 @@ public void setWriter(Writer writer) {
     }
 
     /**
-     * Write the csv header. If samples have alredy been written then a row with
+     * Write the csv header. If samples have already been written then a row with
      * header information will be written in the middle of the file.
      */
     public void writeHeader() {

src/core/org/apache/jmeter/report/core/SampleException.java

@@ -18,7 +18,7 @@
 package org.apache.jmeter.report.core;
 
 /**
- * Thrown when some sample processing occured
+ * Thrown when some sample processing occurred
  * 
  * @since 3.0
  */

src/core/org/apache/jmeter/report/dashboard/ReportGenerator.java

@@ -83,7 +83,7 @@ public class ReportGenerator {
 
     private static final String INVALID_CLASS_FMT = "Class name \"%s\" is not valid.";
     private static final String INVALID_EXPORT_FMT = "Data exporter \"%s\" is unable to export data.";
-    private static final String NOT_SUPPORTED_CONVERTION_FMT = "Not supported conversion to \"%s\"";
+    private static final String NOT_SUPPORTED_CONVERSION_FMT = "Not supported conversion to \"%s\"";
 
     public static final String NORMALIZER_CONSUMER_NAME = "normalizer";
     public static final String BEGIN_DATE_CONSUMER_NAME = "beginDate";
@@ -547,7 +547,7 @@ private void setProperty(String className, Object obj, Method[] methods,
                             if (converter == null) {
                                 throw new GenerationException(
                                         String.format(
-                                                NOT_SUPPORTED_CONVERTION_FMT,
+                                                NOT_SUPPORTED_CONVERSION_FMT,
                                                 parameterType
                                                         .getName()));
                             }