Author: agomes Date: Sat Nov 11 21:02:30 2017 New Revision: 1814979 URL: http://svn.apache.org/viewvc?rev=1814979&view=rev Log: Bug 61672 - add tht choice between prefix and transaction name to name sampler during recording : fix tab
Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/HttpRequestHdr.java jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/HttpRequestHdr.java URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/HttpRequestHdr.java?rev=1814979&r1=1814978&r2=1814979&view=diff ============================================================================== --- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/HttpRequestHdr.java (original) +++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/HttpRequestHdr.java Sat Nov 11 21:02:30 2017 @@ -107,7 +107,7 @@ public class HttpRequestHdr { * @param httpSamplerName the http sampler name */ public HttpRequestHdr(String prefix, String httpSamplerName) { - this(prefix, httpSamplerName,0); + this(prefix, httpSamplerName,0); } /** @@ -116,13 +116,13 @@ public class HttpRequestHdr { * @param httpSampleNameMode the naming mode of sampler name */ public HttpRequestHdr(String prefix, String httpSamplerName, int httpSampleNameMode) { - this.prefix = prefix; + this.prefix = prefix; this.httpSamplerName = httpSamplerName; this.firstLine = "" ; // $NON-NLS-1$ this.httpSampleNameMode = httpSampleNameMode; - } + } - /** + /** * Parses a http header from a stream. * * @param in @@ -341,7 +341,7 @@ public class HttpRequestHdr { */ public int serverPort() { String str = url; - // chop to "server.name:x/thing" + // chop to "server.name:xhing" int i = str.indexOf("//"); if (i > 0) { str = str.substring(i + 2); 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=1814979&r1=1814978&r2=1814979&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 Nov 11 21:02:30 2017 @@ -384,18 +384,18 @@ public class ProxyControlGui extends Log * Also handles samplerTypeName */ /** {@inheritDoc} */ - @Override - 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()); - } - } - else { - enableRestart(); - } - } + @Override + 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()); + } + } + else { + enableRestart(); + } + } /** {@inheritDoc} */ @Override