svn commit: r1776754 - in /jmeter/trunk/src/protocol: http/org/apache/jmeter/protocol/http/control/gui/ http/org/apache/jmeter/protocol/http/proxy/gui/ http/org/apache/jmeter/protocol/http/sampler/ mail/org/apache/jmeter/protocol/smtp/sampler/gui/

[pmouawad]

Author: pmouawad
Date: Sat Dec 31 14:31:18 2016
New Revision: 1776754

URL: http://svn.apache.org/viewvc?rev=1776754&view=rev
Log:
sonar : fix squid:S1659  : Declare XXX on a separate line.

Modified:
    
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/HttpMirrorControlGui.java
    
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java
    
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/AccessLogSampler.java
    
jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/smtp/sampler/gui/SmtpPanel.java

Modified: 
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/HttpMirrorControlGui.java
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/HttpMirrorControlGui.java?rev=1776754&r1=1776753&r2=1776754&view=diff
==============================================================================
--- 
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/HttpMirrorControlGui.java
 (original)
+++ 
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/HttpMirrorControlGui.java
 Sat Dec 31 14:31:18 2016
@@ -55,7 +55,8 @@ public class HttpMirrorControlGui extend
 
     private JTextField maxQueueSizeField;
 
-    private JButton stop, start;
+    private JButton stop;
+    private JButton start;
 
     private static final String ACTION_STOP = "stop"; // $NON-NLS-1$
 

Modified: 
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java?rev=1776754&r1=1776753&r2=1776754&view=diff
==============================================================================
--- 
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java
 (original)
+++ 
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java
 Sat Dec 31 14:31:18 2016
@@ -189,7 +189,9 @@ public class ProxyControlGui extends Log
 
     private static final String CHANGE_TARGET = "change_target"; // $NON-NLS-1$
 
-    private JButton stop, start, restart;
+    private JButton stop;
+    private JButton start;
+    private JButton restart;
 
     //+ action names
     private static final String STOP = "stop"; // $NON-NLS-1$

Modified: 
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/AccessLogSampler.java
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/AccessLogSampler.java?rev=1776754&r1=1776753&r2=1776754&view=diff
==============================================================================
--- 
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/AccessLogSampler.java
 (original)
+++ 
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/AccessLogSampler.java
 Sat Dec 31 14:31:18 2016
@@ -75,8 +75,9 @@ public class AccessLogSampler extends HT
     /* private members used by class */
     private transient LogParser parser = null;
 
-    // NOTUSED private Class PARSERCLASS = null;
-    private String logFile, parserClassName, filterClassName;
+    private String logFile;
+    private String parserClassName;
+    private String filterClassName;
 
     private transient Filter filter;
 
@@ -138,9 +139,6 @@ public class AccessLogSampler extends HT
             if (parser == null) {
                 throw new JMeterException("No Parser available");
             }
-            /*
-             * samp.setDomain(this.getDomain()); samp.setPort(this.getPort());
-             */
             // we call parse with 1 to get only one.
             // this also means if we change the implementation
             // to use 2, it would use every other entry and

Modified: 
jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/smtp/sampler/gui/SmtpPanel.java
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/smtp/sampler/gui/SmtpPanel.java?rev=1776754&r1=1776753&r2=1776754&view=diff
==============================================================================
--- 
jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/smtp/sampler/gui/SmtpPanel.java
 (original)
+++ 
jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/smtp/sampler/gui/SmtpPanel.java
 Sat Dec 31 14:31:18 2016
@@ -534,8 +534,6 @@ public class SmtpPanel extends JPanel {
      * Main method of class, builds all gui-components for SMTP-sampler.
      */
     private void initComponents() {
-        GridBagConstraints gridBagConstraints, gridBagConstraintsMain;
-
         jlAddressReplyTo = new 
JLabel(JMeterUtils.getResString("smtp_replyto")); // $NON-NLS-1$
         jlAddressFrom = new JLabel(JMeterUtils.getResString("smtp_from")); // 
$NON-NLS-1$
         jlAddressTo = new JLabel(JMeterUtils.getResString("smtp_to")); // 
$NON-NLS-1$
@@ -609,12 +607,12 @@ public class SmtpPanel extends JPanel {
 
         setLayout(new GridBagLayout());
 
-        gridBagConstraintsMain = new GridBagConstraints();
+        GridBagConstraints gridBagConstraintsMain = new GridBagConstraints();
         gridBagConstraintsMain.fill = GridBagConstraints.HORIZONTAL;
         gridBagConstraintsMain.anchor = GridBagConstraints.WEST;
         gridBagConstraintsMain.weightx = 0.5;
 
-        gridBagConstraints = new GridBagConstraints();
+        GridBagConstraints gridBagConstraints = new GridBagConstraints();
         gridBagConstraints.insets = new java.awt.Insets(2, 2, 2, 2);
         gridBagConstraints.fill = GridBagConstraints.NONE;
         gridBagConstraints.anchor = GridBagConstraints.WEST;