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 82aa4e2af4ad4434ef3d632982756ceb05284e6e Author: Anass BENOMAR <[email protected]> AuthorDate: Mon Aug 26 17:57:26 2019 +0100 Fix: typos Part of #482 on github --- .../main/java/org/apache/jmeter/timers/ConstantThroughputTimer.java | 4 ++-- src/core/src/main/java/org/apache/jmeter/JMeter.java | 2 +- .../org/apache/jmeter/control/gui/TestFragmentControllerGui.java | 2 +- src/core/src/main/java/org/apache/jmeter/engine/JMeterEngine.java | 2 +- src/core/src/main/java/org/apache/jmeter/gui/action/Load.java | 2 +- .../src/main/java/org/apache/jmeter/gui/util/FilePanelEntry.java | 2 +- .../src/main/java/org/apache/jorphan/collections/HashTree.java | 6 +++--- .../main/java/org/apache/jmeter/protocol/http/control/Cookie.java | 6 +++--- .../jmeter/protocol/http/control/gui/HttpMirrorControlGui.java | 2 +- .../jmeter/protocol/http/gui/action/ParseCurlCommandAction.java | 2 +- .../java/org/apache/jmeter/protocol/http/proxy/HttpReplyHdr.java | 4 ++-- .../org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java | 2 +- .../java/org/apache/jmeter/protocol/http/sampler/HTTPHC4Impl.java | 2 +- .../java/org/apache/jmeter/protocol/http/sampler/PostWriter.java | 2 +- .../java/org/apache/jmeter/protocol/jms/sampler/JMSProperties.java | 4 ++-- .../org/apache/jmeter/protocol/jms/sampler/PublisherSampler.java | 2 +- 16 files changed, 23 insertions(+), 23 deletions(-) diff --git a/src/components/src/main/java/org/apache/jmeter/timers/ConstantThroughputTimer.java b/src/components/src/main/java/org/apache/jmeter/timers/ConstantThroughputTimer.java index b62f069..e1b40f3 100644 --- a/src/components/src/main/java/org/apache/jmeter/timers/ConstantThroughputTimer.java +++ b/src/components/src/main/java/org/apache/jmeter/timers/ConstantThroughputTimer.java @@ -39,7 +39,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * This class implements a constant throughput timer. A Constant Throughtput + * This class implements a constant throughput timer. A Constant Throughput * Timer paces the samplers under its influence so that the total number of * samples per unit of time approaches a given constant as much as possible. * @@ -98,7 +98,7 @@ public class ConstantThroughputTimer extends AbstractTestElement implements Time //For calculating throughput across all threads private static final ThroughputInfo allThreadsInfo = new ThroughputInfo(); - //For holding the ThrougputInfo objects for all ThreadGroups. Keyed by AbstractThreadGroup objects + //For holding the ThroughputInfo objects for all ThreadGroups. Keyed by AbstractThreadGroup objects private static final ConcurrentMap<AbstractThreadGroup, ThroughputInfo> threadGroupsInfoMap = new ConcurrentHashMap<>(); diff --git a/src/core/src/main/java/org/apache/jmeter/JMeter.java b/src/core/src/main/java/org/apache/jmeter/JMeter.java index 1a26d7b..9526629 100644 --- a/src/core/src/main/java/org/apache/jmeter/JMeter.java +++ b/src/core/src/main/java/org/apache/jmeter/JMeter.java @@ -1124,7 +1124,7 @@ public class JMeter implements JMeterPlugin { * </ul> * THIS IS INTERNAL JMETER API and should be used with care * @param tree The {@link HashTree} to convert - * @param cloneAtEnd boolean wether we clone the tree at end + * @param cloneAtEnd boolean whether we clone the tree at end * @return HashTree the output {@link HashTree} to use */ public static HashTree convertSubTree(HashTree tree, boolean cloneAtEnd) { diff --git a/src/core/src/main/java/org/apache/jmeter/control/gui/TestFragmentControllerGui.java b/src/core/src/main/java/org/apache/jmeter/control/gui/TestFragmentControllerGui.java index b5acf26..d5813a3 100644 --- a/src/core/src/main/java/org/apache/jmeter/control/gui/TestFragmentControllerGui.java +++ b/src/core/src/main/java/org/apache/jmeter/control/gui/TestFragmentControllerGui.java @@ -87,7 +87,7 @@ public class TestFragmentControllerGui extends AbstractControllerGui { } /** - * Redefined to remove change parent and inserrt parent menu + * Redefined to remove change parent and insert parent menu * @see org.apache.jmeter.control.gui.AbstractControllerGui#createPopupMenu() */ @Override diff --git a/src/core/src/main/java/org/apache/jmeter/engine/JMeterEngine.java b/src/core/src/main/java/org/apache/jmeter/engine/JMeterEngine.java index a6c99cc..5f7aeda 100644 --- a/src/core/src/main/java/org/apache/jmeter/engine/JMeterEngine.java +++ b/src/core/src/main/java/org/apache/jmeter/engine/JMeterEngine.java @@ -46,7 +46,7 @@ public interface JMeterEngine { } /** * - * @param now boolean that tell wether stop is immediate (interrupt) or not (wait for current sample end) + * @param now boolean that tell whether stop is immediate (interrupt) or not (wait for current sample end) */ void stopTest(boolean now); diff --git a/src/core/src/main/java/org/apache/jmeter/gui/action/Load.java b/src/core/src/main/java/org/apache/jmeter/gui/action/Load.java index 1f1a617..676df24 100644 --- a/src/core/src/main/java/org/apache/jmeter/gui/action/Load.java +++ b/src/core/src/main/java/org/apache/jmeter/gui/action/Load.java @@ -202,7 +202,7 @@ public class Load extends AbstractActionWithNoRunningTest { guiInstance.getMainFrame().getTree().setSelectionPath( new TreePath(((JMeterTreeNode) newTree.getArray()[0]).getPath())); final HashTree subTree = guiInstance.getCurrentSubTree(); - // Send different event wether we are merging a test plan into another test plan, + // Send different event whether we are merging a test plan into another test plan, // or loading a testplan from scratch ActionEvent actionEvent = new ActionEvent(subTree.get(subTree.getArray()[subTree.size() - 1]), id, diff --git a/src/core/src/main/java/org/apache/jmeter/gui/util/FilePanelEntry.java b/src/core/src/main/java/org/apache/jmeter/gui/util/FilePanelEntry.java index 6ab8568..b54397e 100644 --- a/src/core/src/main/java/org/apache/jmeter/gui/util/FilePanelEntry.java +++ b/src/core/src/main/java/org/apache/jmeter/gui/util/FilePanelEntry.java @@ -55,7 +55,7 @@ public class FilePanelEntry extends HorizontalPanel implements ActionListener { private boolean onlyDirectories = false; - // Mainly needed for unit test Serialisable tests + // Mainly needed for unit test Serializable tests public FilePanelEntry() { this(JMeterUtils.getResString("file_visualizer_filename")); //$NON-NLS-1$ } diff --git a/src/jorphan/src/main/java/org/apache/jorphan/collections/HashTree.java b/src/jorphan/src/main/java/org/apache/jorphan/collections/HashTree.java index 3e48849..6d9a0b7 100644 --- a/src/jorphan/src/main/java/org/apache/jorphan/collections/HashTree.java +++ b/src/jorphan/src/main/java/org/apache/jorphan/collections/HashTree.java @@ -744,7 +744,7 @@ public class HashTree implements Serializable, Map<Object, HashTree>, Cloneable } /** - * Recurses down into the HashTree stucture using each subsequent key in the + * Recurses down into the HashTree structure using each subsequent key in the * array of keys, and returns the Set of keys of the HashTree object at the * end of the recursion. If the HashTree represented a file system, this * would be like getting a list of all the files in a directory specified by @@ -762,7 +762,7 @@ public class HashTree implements Serializable, Map<Object, HashTree>, Cloneable } /** - * Recurses down into the HashTree stucture using each subsequent key in the + * Recurses down into the HashTree structure using each subsequent key in the * List of keys, and returns the Set of keys of the HashTree object at the * end of the recursion. If the HashTree represented a file system, this * would be like getting a list of all the files in a directory specified by @@ -823,7 +823,7 @@ public class HashTree implements Serializable, Map<Object, HashTree>, Cloneable } /** - * Recurses down into the HashTree stucture using each subsequent key in the + * Recurses down into the HashTree structure using each subsequent key in the * array of keys, and returns an array of keys of the HashTree object at the * end of the recursion. If the HashTree represented a file system, this * would be like getting a list of all the files in a directory specified by diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/Cookie.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/Cookie.java index 06de6d5..03c5399 100644 --- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/Cookie.java +++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/Cookie.java @@ -54,14 +54,14 @@ public class Cookie extends AbstractTestElement implements Serializable { private static final int DEFAULT_VERSION = 1; /** - * create the coookie + * create the cookie */ public Cookie() { this("","","","",false,0,false,false); } /** - * create the coookie + * create the cookie * @param name name of the cookie * @param value value of the cookie * @param domain domain for which the cookie is valid @@ -75,7 +75,7 @@ public class Cookie extends AbstractTestElement implements Serializable { } /** - * create the coookie + * create the cookie * @param name name of the cookie * @param value value of the cookie * @param domain domain for which the cookie is valid diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/gui/HttpMirrorControlGui.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/gui/HttpMirrorControlGui.java index 26c7586..15347fb 100644 --- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/gui/HttpMirrorControlGui.java +++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/gui/HttpMirrorControlGui.java @@ -217,7 +217,7 @@ public class HttpMirrorControlGui extends LogicControllerGui } /** - * Redefined to remove change parent and inserrt parent menu + * Redefined to remove change parent and insert parent menu * @see org.apache.jmeter.control.gui.AbstractControllerGui#createPopupMenu() */ @Override diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/gui/action/ParseCurlCommandAction.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/gui/action/ParseCurlCommandAction.java index b8a3489..70bc844 100644 --- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/gui/action/ParseCurlCommandAction.java +++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/gui/action/ParseCurlCommandAction.java @@ -240,7 +240,7 @@ public class ParseCurlCommandAction extends AbstractAction implements MenuCreato guiPackage.getMainFrame().getTree() .setSelectionPath(new TreePath(((JMeterTreeNode) newTree.getArray()[0]).getPath())); final HashTree subTree = guiPackage.getCurrentSubTree(); - // Send different event wether we are merging a test plan into another test + // Send different event whether we are merging a test plan into another test // plan, // or loading a testplan from scratch ActionEvent actionEvent = new ActionEvent(subTree.get(subTree.getArray()[subTree.size() - 1]), e.getID(), diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/HttpReplyHdr.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/HttpReplyHdr.java index 0881df8..5f03f92 100644 --- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/HttpReplyHdr.java +++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/HttpReplyHdr.java @@ -177,7 +177,7 @@ public final class HttpReplyHdr { * @return The header in a string; */ public static String formMethod() { - return formError("303 Method unseported", "Method unseported"); + return formError("303 Method unsupported", "Method unsupported"); } /** @@ -195,7 +195,7 @@ public final class HttpReplyHdr { * @return The header in a string; */ public static String formUnauthorized() { - return formError("401 Unathorized", "Unathorized use of this service"); + return formError("401 Unauthorized", "Unauthorized use of this service"); } /** diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java index cc32e01..b17deec 100644 --- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java +++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java @@ -1218,7 +1218,7 @@ public class ProxyControlGui extends LogicControllerGui implements JMeterGUIComp } /** - * Redefined to remove change parent and inserrt parent menu + * Redefined to remove change parent and insert parent menu * @see org.apache.jmeter.control.gui.AbstractControllerGui#createPopupMenu() */ @Override diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPHC4Impl.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPHC4Impl.java index e12b463..caec2f4 100644 --- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPHC4Impl.java +++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPHC4Impl.java @@ -1533,7 +1533,7 @@ public class HTTPHC4Impl extends HTTPHCAbstractImpl { Header contentTypeHeader = entityEnclosingRequest.getFirstHeader(HTTPConstants.HEADER_CONTENT_TYPE); boolean hasContentTypeHeader = contentTypeHeader != null && contentTypeHeader.getValue() != null && contentTypeHeader.getValue().length() > 0; // If there are no arguments, we can send a file as the body of the request - // TODO: needs a multiple file upload scenerio + // TODO: needs a multiple file upload scenario if(!hasArguments() && getSendFileAsPostBody()) { // If getSendFileAsPostBody returned true, it's sure that file is not null HTTPFileArg file = files[0]; diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/PostWriter.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/PostWriter.java index 3232105..dfe9b81 100644 --- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/PostWriter.java +++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/PostWriter.java @@ -295,7 +295,7 @@ public class PostWriter { // Allow the mimetype of the file to control the content type // This is not obvious in GUI if you are not uploading any files, // but just sending the content of nameless parameters - // TODO: needs a multiple file upload scenerio + // TODO: needs a multiple file upload scenario if(!hasContentTypeHeader) { HTTPFileArg file = files.length > 0? files[0] : null; if(file != null && file.getMimeType() != null && file.getMimeType().length() > 0) { diff --git a/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/JMSProperties.java b/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/JMSProperties.java index 53ed871..86ffe5d 100644 --- a/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/JMSProperties.java +++ b/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/JMSProperties.java @@ -44,14 +44,14 @@ public class JMSProperties extends AbstractTestElement implements Serializable { public static final String JMS_PROPERTIES = "JMSProperties.properties"; //$NON-NLS-1$ /** - * Create a new JmsPropertys object with no JmsProperties + * Create a new JmsProperties object with no JmsProperties */ public JMSProperties() { setProperty(new CollectionProperty(JMS_PROPERTIES, new ArrayList<JMSProperty>())); } /** - * Get the JmsPropertiess. + * Get the JmsProperties. * * @return the JmsProperties */ diff --git a/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/PublisherSampler.java b/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/PublisherSampler.java index da6c321..044d6ce 100644 --- a/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/PublisherSampler.java +++ b/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/PublisherSampler.java @@ -264,7 +264,7 @@ public class PublisherSampler extends BaseJMSSampler implements TestStateListene } /** - * Fills in result and decide wether to reconnect or not depending on + * Fills in result and decide whether to reconnect or not depending on * checkForReconnect and underlying {@link JMSException#getErrorCode()} * * @param result
