Author: pmouawad Date: Thu Nov 2 20:07:02 2017 New Revision: 1814103 URL: http://svn.apache.org/viewvc?rev=1814103&view=rev Log: Removed commented out code (part 2) Contributed by Graham Russell This comments #319
Modified: jmeter/trunk/src/functions/org/apache/jmeter/functions/AbstractHostIPName.java jmeter/trunk/src/jorphan/org/apache/commons/cli/avalon/CLArgsParser.java jmeter/trunk/src/jorphan/org/apache/jorphan/gui/MenuScroller.java jmeter/trunk/src/jorphan/org/apache/jorphan/gui/layout/VerticalLayout.java jmeter/trunk/src/jorphan/org/apache/jorphan/util/Converter.java jmeter/trunk/src/protocol/ftp/org/apache/jmeter/protocol/ftp/sampler/FTPSampler.java jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/HttpMirrorThread.java jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/modifier/AnchorModifier.java jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/modifier/URLRewritingModifier.java jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/HtmlParsingUtils.java jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/JTidyHTMLParser.java jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/URLCollection.java jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPHC4Impl.java jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPJavaImpl.java jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/accesslog/TCLogParser.java Modified: jmeter/trunk/src/functions/org/apache/jmeter/functions/AbstractHostIPName.java URL: http://svn.apache.org/viewvc/jmeter/trunk/src/functions/org/apache/jmeter/functions/AbstractHostIPName.java?rev=1814103&r1=1814102&r2=1814103&view=diff ============================================================================== --- jmeter/trunk/src/functions/org/apache/jmeter/functions/AbstractHostIPName.java (original) +++ jmeter/trunk/src/functions/org/apache/jmeter/functions/AbstractHostIPName.java Thu Nov 2 20:07:02 2017 @@ -33,7 +33,6 @@ abstract class AbstractHostIPName extend private static final List<String> desc = new LinkedList<>(); static { - // desc.add("Use fully qualified host name: TRUE/FALSE (Default FALSE)"); desc.add(JMeterUtils.getResString("function_name_paropt")); //$NON-NLS-1$ } Modified: jmeter/trunk/src/jorphan/org/apache/commons/cli/avalon/CLArgsParser.java URL: http://svn.apache.org/viewvc/jmeter/trunk/src/jorphan/org/apache/commons/cli/avalon/CLArgsParser.java?rev=1814103&r1=1814102&r2=1814103&view=diff ============================================================================== --- jmeter/trunk/src/jorphan/org/apache/commons/cli/avalon/CLArgsParser.java (original) +++ jmeter/trunk/src/jorphan/org/apache/commons/cli/avalon/CLArgsParser.java Thu Nov 2 20:07:02 2017 @@ -604,8 +604,6 @@ public final class CLArgsParser { final String argument = sb.toString(); - // System.out.println( "Argument:" + argument ); - this.option.addArgument(argument); addOption(this.option); this.option = null; Modified: jmeter/trunk/src/jorphan/org/apache/jorphan/gui/MenuScroller.java URL: http://svn.apache.org/viewvc/jmeter/trunk/src/jorphan/org/apache/jorphan/gui/MenuScroller.java?rev=1814103&r1=1814102&r2=1814103&view=diff ============================================================================== --- jmeter/trunk/src/jorphan/org/apache/jorphan/gui/MenuScroller.java (original) +++ jmeter/trunk/src/jorphan/org/apache/jorphan/gui/MenuScroller.java Thu Nov 2 20:07:02 2017 @@ -54,7 +54,6 @@ import javax.swing.event.PopupMenuListen */ public class MenuScroller { - // private JMenu menu; private JPopupMenu menu; private Component[] menuItems; private MenuScrollItem upItem; Modified: jmeter/trunk/src/jorphan/org/apache/jorphan/gui/layout/VerticalLayout.java URL: http://svn.apache.org/viewvc/jmeter/trunk/src/jorphan/org/apache/jorphan/gui/layout/VerticalLayout.java?rev=1814103&r1=1814102&r2=1814103&view=diff ============================================================================== --- jmeter/trunk/src/jorphan/org/apache/jorphan/gui/layout/VerticalLayout.java (original) +++ jmeter/trunk/src/jorphan/org/apache/jorphan/gui/layout/VerticalLayout.java Thu Nov 2 20:07:02 2017 @@ -150,7 +150,6 @@ public class VerticalLayout implements L @Override public void layoutContainer(Container parent) { Insets insets = parent.getInsets(); - // NOTUSED Dimension dim = layoutSize(parent, false); synchronized (parent.getTreeLock()) { int n = parent.getComponentCount(); Dimension pd = parent.getSize(); Modified: jmeter/trunk/src/jorphan/org/apache/jorphan/util/Converter.java URL: http://svn.apache.org/viewvc/jmeter/trunk/src/jorphan/org/apache/jorphan/util/Converter.java?rev=1814103&r1=1814102&r2=1814103&view=diff ============================================================================== --- jmeter/trunk/src/jorphan/org/apache/jorphan/util/Converter.java (original) +++ jmeter/trunk/src/jorphan/org/apache/jorphan/util/Converter.java Thu Nov 2 20:07:02 2017 @@ -168,7 +168,6 @@ public class Converter { return (Date) date; } else if (date != null) { DateFormat formatter = DateFormat.getDateInstance(DateFormat.SHORT); - // java.util.Date d = null; try { val = formatter.parse(date.toString()); } catch (ParseException e) { Modified: jmeter/trunk/src/protocol/ftp/org/apache/jmeter/protocol/ftp/sampler/FTPSampler.java URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/ftp/org/apache/jmeter/protocol/ftp/sampler/FTPSampler.java?rev=1814103&r1=1814102&r2=1814103&view=diff ============================================================================== --- jmeter/trunk/src/protocol/ftp/org/apache/jmeter/protocol/ftp/sampler/FTPSampler.java (original) +++ jmeter/trunk/src/protocol/ftp/org/apache/jmeter/protocol/ftp/sampler/FTPSampler.java Thu Nov 2 20:07:02 2017 @@ -275,7 +275,6 @@ public class FTPSampler extends Abstract } else { res.setResponseCode("501"); // TODO res.setResponseMessage("Could not connect"); - //res.setResponseCode(Integer.toString(ftp.getReplyCode())); res.setResponseMessage(ftp.getReplyString()); } } catch (IOException ex) { Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/HttpMirrorThread.java URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/HttpMirrorThread.java?rev=1814103&r1=1814102&r2=1814103&view=diff ============================================================================== --- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/HttpMirrorThread.java (original) +++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/HttpMirrorThread.java Thu Nov 2 20:07:02 2017 @@ -297,8 +297,6 @@ public class HttpMirrorThread implements Pattern pattern = JMeterUtils.getPattern(expression, Perl5Compiler.READ_ONLY_MASK | Perl5Compiler.CASE_INSENSITIVE_MASK | Perl5Compiler.MULTILINE_MASK); if(localMatcher.contains(requestHeaders, pattern)) { // The value is in the first group, group 0 is the whole match -// System.out.println("Found:'"+localMatcher.getMatch().group(1)+"'"); -// System.out.println("in: '"+localMatcher.getMatch().group(0)+"'"); return localMatcher.getMatch().group(1); } else { Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/modifier/AnchorModifier.java URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/modifier/AnchorModifier.java?rev=1814103&r1=1814102&r2=1814103&view=diff ============================================================================== --- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/modifier/AnchorModifier.java (original) +++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/modifier/AnchorModifier.java Thu Nov 2 20:07:02 2017 @@ -101,7 +101,6 @@ public class AnchorModifier extends Abst } } else { sampler.setArguments(url.getArguments()); - // config.parseArguments(url.getQueryString()); } sampler.setProtocol(url.getProtocol()); } else { Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/modifier/URLRewritingModifier.java URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/modifier/URLRewritingModifier.java?rev=1814103&r1=1814102&r2=1814103&view=diff ============================================================================== --- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/modifier/URLRewritingModifier.java (original) +++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/modifier/URLRewritingModifier.java Thu Nov 2 20:07:02 2017 @@ -52,7 +52,6 @@ public class URLRewritingModifier extend private transient Pattern pathExtensionNoEqualsNoQuestionmarkRegexp; - // transient Perl5Compiler compiler = new Perl5Compiler(); private static final String ARGUMENT_NAME = "argument_name"; // $NON-NLS-1$ private static final String PATH_EXTENSION = "path_extension"; // $NON-NLS-1$ Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/HtmlParsingUtils.java URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/HtmlParsingUtils.java?rev=1814103&r1=1814102&r2=1814103&view=diff ============================================================================== --- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/HtmlParsingUtils.java (original) +++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/HtmlParsingUtils.java Thu Nov 2 20:07:02 2017 @@ -283,14 +283,6 @@ public final class HtmlParsingUtils { String selectName = null; LinkedList<HTTPSamplerBase> urlConfigs = new LinkedList<>(); recurseForm(doc, urlConfigs, context, selectName, false); - /* - * NamedNodeMap atts = formNode.getAttributes(); - * if(atts.getNamedItem("action") == null) { throw new - * MalformedURLException(); } String action = - * atts.getNamedItem("action").getNodeValue(); UrlConfig url = - * createUrlFromAnchor(action, context); recurseForm(doc, url, - * selectName,true,formStart); - */ return urlConfigs; } Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/JTidyHTMLParser.java URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/JTidyHTMLParser.java?rev=1814103&r1=1814102&r2=1814103&view=diff ============================================================================== --- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/JTidyHTMLParser.java (original) +++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/JTidyHTMLParser.java Thu Nov 2 20:07:02 2017 @@ -178,9 +178,6 @@ class JTidyHTMLParser extends HTMLParser break; - // case Node.TEXT_NODE: - // break; - default: // ignored break; Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/URLCollection.java URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/URLCollection.java?rev=1814103&r1=1814102&r2=1814103&view=diff ============================================================================== --- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/URLCollection.java (original) +++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/URLCollection.java Thu Nov 2 20:07:02 2017 @@ -81,9 +81,8 @@ public class URLCollection implements It if (url == null || url.length() == 0) { return false; } - //url.replace('+',' '); url=StringEscapeUtils.unescapeXml(url); - boolean b = false; + boolean b; try { b = this.add(ConversionUtils.makeRelativeURL(baseUrl, url)); } catch (MalformedURLException mfue) { Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPHC4Impl.java URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPHC4Impl.java?rev=1814103&r1=1814102&r2=1814103&view=diff ============================================================================== --- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPHC4Impl.java (original) +++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPHC4Impl.java Thu Nov 2 20:07:02 2017 @@ -1335,11 +1335,6 @@ public class HTTPHC4Impl extends HTTPHCA } else { postedBody.append("<Multipart was not repeatable, cannot view what was sent>"); // $NON-NLS-1$ } - -// // Set the content type TODO - needed? -// String multiPartContentType = multiPart.getContentType().getValue(); -// post.setHeader(HEADER_CONTENT_TYPE, multiPartContentType); - } else { // not multipart // Check if the header manager had a content type header // This allows the user to specify his own content-type for a POST request Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPJavaImpl.java URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPJavaImpl.java?rev=1814103&r1=1814102&r2=1814103&view=diff ============================================================================== --- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPJavaImpl.java (original) +++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPJavaImpl.java Thu Nov 2 20:07:02 2017 @@ -149,11 +149,6 @@ public class HTTPJavaImpl extends HTTPAb if (proxyHost.length() > 0 && proxyPort > 0){ Proxy proxy = new Proxy(Proxy.Type.HTTP, new InetSocketAddress(proxyHost, proxyPort)); //TODO - how to define proxy authentication for a single connection? - // It's not clear if this is possible -// String user = getProxyUser(); -// if (user.length() > 0){ -// Authenticator auth = new ProxyAuthenticator(user, getProxyPass()); -// } conn = (HttpURLConnection) u.openConnection(proxy); } else { conn = (HttpURLConnection) u.openConnection(); @@ -316,11 +311,6 @@ public class HTTPJavaImpl extends HTTPAb protected String getResponseHeaders(HttpURLConnection conn) { StringBuilder headerBuf = new StringBuilder(); headerBuf.append(conn.getHeaderField(0));// Leave header as is - // headerBuf.append(conn.getHeaderField(0).substring(0, 8)); - // headerBuf.append(" "); - // headerBuf.append(conn.getResponseCode()); - // headerBuf.append(" "); - // headerBuf.append(conn.getResponseMessage()); headerBuf.append("\n"); //$NON-NLS-1$ String hfk; Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/accesslog/TCLogParser.java URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/accesslog/TCLogParser.java?rev=1814103&r1=1814102&r2=1814103&view=diff ============================================================================== --- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/accesslog/TCLogParser.java (original) +++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/accesslog/TCLogParser.java Thu Nov 2 20:07:02 2017 @@ -270,9 +270,6 @@ public class TCLogParser implements LogP if (line == null) { breader.close(); this.READER = null; - // this.READER = new BufferedReader(new - // FileReader(this.SOURCE)); - // parse(this.READER,el); } } catch (IOException ioe) { log.error("Error reading log file", ioe);