[jmeter] branch master updated: Correct javadoc and a bit of spacepolice

[fschumacher]

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


The following commit(s) were added to refs/heads/master by this push:
     new e4e784b  Correct javadoc and a bit of spacepolice
e4e784b is described below

commit e4e784b55f62bfbecd3f39f650bcc7550e254bd8
Author: Felix Schumacher <felix.schumac...@internetallee.de>
AuthorDate: Thu May 28 20:35:26 2020 +0200

    Correct javadoc and a bit of spacepolice
---
 .../protocol/http/gui/action/ParseCurlCommandAction.java      | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

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 8469f2a..0eda88f 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
@@ -360,12 +360,13 @@ public class ParseCurlCommandAction extends 
AbstractAction implements MenuCreato
     }
 
     /**
-     * Create Cookie Manager
+     * Configures a given Cookie Manager
      *
-     * @param request {@link Request}
-     * @return {@link CookieManager} element
+     * @param cookieManager the manager to configure
+     * @param request to copy information about cookies from
+     * @returns the configured cookie manager
      */
-    private void createCookieManager(CookieManager cookieManager,Request 
request) {
+    private void createCookieManager(CookieManager cookieManager, Request 
request) {
         cookieManager.setProperty(TestElement.GUI_CLASS, 
CookiePanel.class.getName());
         cookieManager.setProperty(TestElement.NAME, "HTTP CookieManager");
         cookieManager.setProperty(TestElement.COMMENTS,
@@ -375,7 +376,7 @@ public class ParseCurlCommandAction extends AbstractAction 
implements MenuCreato
                 cookieManager.getCookies().addItem(c);
             }
         }
-        if 
(!request.getCookieInHeaders(request.getUrl()).isEmpty()&&uploadCookiesCheckBox.isSelected())
 {
+        if (!request.getCookieInHeaders(request.getUrl()).isEmpty() && 
uploadCookiesCheckBox.isSelected()) {
             for (Cookie c : request.getCookieInHeaders(request.getUrl())) {
                 cookieManager.getCookies().addItem(c);
             }