Bug 61672 - add tht choice between prefix and transaction name to name sampler during recording : Philippe catch

git-svn-id: https://svn.apache.org/repos/asf/jmeter/trunk@1814992 13f79535-47bb-0310-9956-ffa450edef68

Former-commit-id: da72bd8

Author: Antonio Gomes Rodrigues

src/protocol/http/org/apache/jmeter/protocol/http/proxy/DefaultSamplerCreator.java

@@ -281,12 +281,12 @@ public boolean isErrorDetected() {
     protected void computeSamplerName(HTTPSamplerBase sampler,
             HttpRequestHdr request) {
         String prefix = request.getPrefix();
-        int HttpSampleNameMode = request.getHttpSampleNameMode();
+        int httpSampleNameMode = request.getHttpSampleNameMode();
         if (!HTTPConstants.CONNECT.equals(request.getMethod()) && isNumberRequests()) {
             if(!StringUtils.isEmpty(prefix)) {
-                if (HttpSampleNameMode==SAMPLER_NAME_NAMING_MODE_PREFIX) {
+                if (httpSampleNameMode==SAMPLER_NAME_NAMING_MODE_PREFIX) {
                 sampler.setName(prefix + incrementRequestNumberAndGet() + " " + sampler.getPath());
-                } else if (HttpSampleNameMode==SAMPLER_NAME_NAMING_MODE_COMPLETE) {
+                } else if (httpSampleNameMode==SAMPLER_NAME_NAMING_MODE_COMPLETE) {
                     sampler.setName(incrementRequestNumberAndGet() + " " + prefix);
                 } else {
                     log.debug("Sampler name naming mode not recognized");
@@ -296,9 +296,9 @@ protected void computeSamplerName(HTTPSamplerBase sampler,
             }
         } else {
             if(!StringUtils.isEmpty(prefix)) {
-                if (HttpSampleNameMode==SAMPLER_NAME_NAMING_MODE_PREFIX) {
+                if (httpSampleNameMode==SAMPLER_NAME_NAMING_MODE_PREFIX) {
                     sampler.setName(prefix+sampler.getPath());
-                } else if (HttpSampleNameMode==SAMPLER_NAME_NAMING_MODE_COMPLETE) {
+                } else if (httpSampleNameMode==SAMPLER_NAME_NAMING_MODE_COMPLETE) {
                     sampler.setName(prefix);
                 } else {
                     log.debug("Sampler name naming mode not recognized");

src/protocol/http/org/apache/jmeter/protocol/http/proxy/ProxyControl.java

@@ -392,8 +392,8 @@ public void setSamplerDownloadImages(boolean b) {
         setProperty(new BooleanProperty(SAMPLER_DOWNLOAD_IMAGES, b));
     }
 
-    public void setHTTPSampleNamingMode(int HTTPNamingMode) {
-        setProperty(new IntegerProperty(HTTP_SAMPLER_NAMING_MODE, HTTPNamingMode));
+    public void setHTTPSampleNamingMode(int httpNamingMode) {
+        setProperty(new IntegerProperty(HTTP_SAMPLER_NAMING_MODE, httpNamingMode));
     }
 
     public void setPrefixHTTPSampleName(String prefixHTTPSampleName) {

src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java

@@ -159,7 +159,7 @@ public class ProxyControlGui extends LogicControllerGui implements JMeterGUIComp
     /**
      * To choose between a prefix or a transaction name
      */
-    private JComboBox<String> HTTPSampleNamingMode;
+    private JComboBox<String> httpSampleNamingMode;
 
     /**
      * Add a prefix/transaction name to HTTP sample name recorded
@@ -291,7 +291,7 @@ public void modifyTestElement(TestElement el) {
             model.setSamplerFollowRedirects(samplerFollowRedirects.isSelected());
             model.setUseKeepAlive(useKeepAlive.isSelected());
             model.setSamplerDownloadImages(samplerDownloadImages.isSelected());
-            model.setHTTPSampleNamingMode(HTTPSampleNamingMode.getSelectedIndex());
+            model.setHTTPSampleNamingMode(httpSampleNamingMode.getSelectedIndex());
             model.setPrefixHTTPSampleName(prefixHTTPSampleName.getText());
             model.setProxyPauseHTTPSample(proxyPauseHTTPSample.getText());
             model.setNotifyChildSamplerListenerOfFilteredSamplers(notifyChildSamplerListenerOfFilteredSamplersCB.isSelected());
@@ -354,7 +354,7 @@ public void configure(TestElement element) {
         samplerFollowRedirects.setSelected(model.getSamplerFollowRedirects());
         useKeepAlive.setSelected(model.getUseKeepalive());
         samplerDownloadImages.setSelected(model.getSamplerDownloadImages());
-        HTTPSampleNamingMode.setSelectedIndex(model.getHTTPSampleNamingMode());
+        httpSampleNamingMode.setSelectedIndex(model.getHTTPSampleNamingMode());
         prefixHTTPSampleName.setText(model.getPrefixHTTPSampleName());
         proxyPauseHTTPSample.setText(model.getProxyPauseHTTPSample());
         notifyChildSamplerListenerOfFilteredSamplersCB.setSelected(model.getNotifyChildSamplerListenerOfFilteredSamplers());
@@ -389,7 +389,7 @@ public void itemStateChanged(ItemEvent e) {
         if (e.getSource() instanceof JComboBox) {
             JComboBox combo = (JComboBox) e.getSource();
             if(HTTP_SAMPLER_NAMING_MODE.equals(combo.getName())){
-                model.setHTTPSampleNamingMode(HTTPSampleNamingMode.getSelectedIndex());
+                model.setHTTPSampleNamingMode(httpSampleNamingMode.getSelectedIndex());
                 }
             }
         else {
@@ -854,9 +854,9 @@ private JPanel createHTTPSamplerPanel() {
         DefaultComboBoxModel<String> choice = new DefaultComboBoxModel<>();
         choice.addElement(JMeterUtils.getResString("sample_name_prefix")); // $NON-NLS-1$
         choice.addElement(JMeterUtils.getResString("sample_name_transaction")); // $NON-NLS-1$
-        HTTPSampleNamingMode = new JComboBox<>(choice);
-        HTTPSampleNamingMode.setName(HTTP_SAMPLER_NAMING_MODE);
-        HTTPSampleNamingMode.addItemListener(this);
+        httpSampleNamingMode = new JComboBox<>(choice);
+        httpSampleNamingMode.setName(HTTP_SAMPLER_NAMING_MODE);
+        httpSampleNamingMode.addItemListener(this);
 
         prefixHTTPSampleName = new JTextField(4);
         prefixHTTPSampleName.addKeyListener(this);
@@ -885,7 +885,7 @@ private JPanel createHTTPSamplerPanel() {
         JPanel panel = new JPanel(gridBagLayout);
         panel.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(),
                 JMeterUtils.getResString("proxy_sampler_settings"))); // $NON-NLS-1$
-        panel.add(HTTPSampleNamingMode, gbc.clone());
+        panel.add(httpSampleNamingMode, gbc.clone());
         gbc.gridx++;
         gbc.weightx = 3;
         gbc.fill=GridBagConstraints.HORIZONTAL;