jmeter-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fschumac...@apache.org
Subject svn commit: r1697162 [1/4] - in /jmeter/trunk/src: components/org/apache/jmeter/assertions/ components/org/apache/jmeter/control/ components/org/apache/jmeter/extractor/ components/org/apache/jmeter/modifiers/ components/org/apache/jmeter/modifiers/gui...
Date Sun, 23 Aug 2015 10:39:39 GMT
Author: fschumacher
Date: Sun Aug 23 10:39:36 2015
New Revision: 1697162

URL: http://svn.apache.org/r1697162
Log:
Remove explicit types. Patch from Graham Russel.

Bugzilla Id: 57981

Modified:
    jmeter/trunk/src/components/org/apache/jmeter/assertions/CompareAssertion.java
    jmeter/trunk/src/components/org/apache/jmeter/assertions/CompareAssertionBeanInfo.java
    jmeter/trunk/src/components/org/apache/jmeter/assertions/SMIMEAssertion.java
    jmeter/trunk/src/components/org/apache/jmeter/control/CriticalSectionController.java
    jmeter/trunk/src/components/org/apache/jmeter/control/IncludeController.java
    jmeter/trunk/src/components/org/apache/jmeter/control/ModuleController.java
    jmeter/trunk/src/components/org/apache/jmeter/control/RandomOrderController.java
    jmeter/trunk/src/components/org/apache/jmeter/extractor/DebugPostProcessor.java
    jmeter/trunk/src/components/org/apache/jmeter/extractor/HtmlExtractor.java
    jmeter/trunk/src/components/org/apache/jmeter/extractor/RegexExtractor.java
    jmeter/trunk/src/components/org/apache/jmeter/extractor/XPathExtractor.java
    jmeter/trunk/src/components/org/apache/jmeter/modifiers/UserParameters.java
    jmeter/trunk/src/components/org/apache/jmeter/modifiers/gui/UserParametersGui.java
    jmeter/trunk/src/components/org/apache/jmeter/reporters/MailerModel.java
    jmeter/trunk/src/components/org/apache/jmeter/sampler/DebugSampler.java
    jmeter/trunk/src/components/org/apache/jmeter/sampler/TestAction.java
    jmeter/trunk/src/components/org/apache/jmeter/timers/ConstantThroughputTimer.java
    jmeter/trunk/src/components/org/apache/jmeter/visualizers/PropertyControlGui.java
    jmeter/trunk/src/components/org/apache/jmeter/visualizers/RenderAsCssJQuery.java
    jmeter/trunk/src/components/org/apache/jmeter/visualizers/RenderAsRegexp.java
    jmeter/trunk/src/components/org/apache/jmeter/visualizers/RenderAsXPath.java
    jmeter/trunk/src/components/org/apache/jmeter/visualizers/RequestPanel.java
    jmeter/trunk/src/components/org/apache/jmeter/visualizers/RespTimeGraphVisualizer.java
    jmeter/trunk/src/components/org/apache/jmeter/visualizers/StatGraphProperties.java
    jmeter/trunk/src/components/org/apache/jmeter/visualizers/StatGraphVisualizer.java
    jmeter/trunk/src/components/org/apache/jmeter/visualizers/StatVisualizer.java
    jmeter/trunk/src/components/org/apache/jmeter/visualizers/SummaryReport.java
    jmeter/trunk/src/components/org/apache/jmeter/visualizers/ViewResultsFullVisualizer.java
    jmeter/trunk/src/components/org/apache/jmeter/visualizers/backend/AbstractBackendListenerClient.java
    jmeter/trunk/src/components/org/apache/jmeter/visualizers/backend/BackendListener.java
    jmeter/trunk/src/components/org/apache/jmeter/visualizers/backend/BackendListenerGui.java
    jmeter/trunk/src/components/org/apache/jmeter/visualizers/backend/graphite/AbstractGraphiteMetricsSender.java
    jmeter/trunk/src/components/org/apache/jmeter/visualizers/backend/graphite/GraphiteBackendListenerClient.java
    jmeter/trunk/src/components/org/apache/jmeter/visualizers/backend/graphite/PickleGraphiteMetricsSender.java
    jmeter/trunk/src/components/org/apache/jmeter/visualizers/backend/graphite/SocketOutputStreamPoolFactory.java
    jmeter/trunk/src/components/org/apache/jmeter/visualizers/backend/graphite/TextGraphiteMetricsSender.java
    jmeter/trunk/src/components/org/apache/jmeter/visualizers/utils/Colors.java
    jmeter/trunk/src/core/org/apache/jmeter/JMeter.java
    jmeter/trunk/src/core/org/apache/jmeter/NewDriver.java
    jmeter/trunk/src/core/org/apache/jmeter/config/Arguments.java
    jmeter/trunk/src/core/org/apache/jmeter/control/GenericController.java
    jmeter/trunk/src/core/org/apache/jmeter/control/TransactionSampler.java
    jmeter/trunk/src/core/org/apache/jmeter/engine/DistributedRunner.java
    jmeter/trunk/src/core/org/apache/jmeter/engine/StandardJMeterEngine.java
    jmeter/trunk/src/core/org/apache/jmeter/engine/TreeCloner.java
    jmeter/trunk/src/core/org/apache/jmeter/engine/util/CompoundVariable.java
    jmeter/trunk/src/core/org/apache/jmeter/engine/util/FunctionParser.java
    jmeter/trunk/src/core/org/apache/jmeter/engine/util/ValueReplacer.java
    jmeter/trunk/src/core/org/apache/jmeter/gui/GUIFactory.java
    jmeter/trunk/src/core/org/apache/jmeter/gui/GuiPackage.java
    jmeter/trunk/src/core/org/apache/jmeter/gui/MainFrame.java
    jmeter/trunk/src/core/org/apache/jmeter/gui/SavePropertyDialog.java
    jmeter/trunk/src/core/org/apache/jmeter/gui/UndoHistory.java
    jmeter/trunk/src/core/org/apache/jmeter/gui/action/AboutCommand.java
    jmeter/trunk/src/core/org/apache/jmeter/gui/action/ActionRouter.java
    jmeter/trunk/src/core/org/apache/jmeter/gui/action/AddParent.java
    jmeter/trunk/src/core/org/apache/jmeter/gui/action/AddToTree.java
    jmeter/trunk/src/core/org/apache/jmeter/gui/action/Analyze.java
    jmeter/trunk/src/core/org/apache/jmeter/gui/action/ChangeLanguage.java
    jmeter/trunk/src/core/org/apache/jmeter/gui/action/ChangeParent.java
    jmeter/trunk/src/core/org/apache/jmeter/gui/action/CheckDirty.java
    jmeter/trunk/src/core/org/apache/jmeter/gui/action/Clear.java
    jmeter/trunk/src/core/org/apache/jmeter/gui/action/Close.java
    jmeter/trunk/src/core/org/apache/jmeter/gui/action/CollapseExpand.java
    jmeter/trunk/src/core/org/apache/jmeter/gui/action/Copy.java
    jmeter/trunk/src/core/org/apache/jmeter/gui/action/CreateFunctionDialog.java
    jmeter/trunk/src/core/org/apache/jmeter/gui/action/Cut.java
    jmeter/trunk/src/core/org/apache/jmeter/gui/action/Duplicate.java
    jmeter/trunk/src/core/org/apache/jmeter/gui/action/EditCommand.java
    jmeter/trunk/src/core/org/apache/jmeter/gui/action/EnableComponent.java
    jmeter/trunk/src/core/org/apache/jmeter/gui/action/ExitCommand.java
    jmeter/trunk/src/core/org/apache/jmeter/gui/action/Help.java
    jmeter/trunk/src/core/org/apache/jmeter/gui/action/Load.java
    jmeter/trunk/src/core/org/apache/jmeter/gui/action/LoadRecentProject.java
    jmeter/trunk/src/core/org/apache/jmeter/gui/action/LoggerPanelEnableDisable.java
    jmeter/trunk/src/core/org/apache/jmeter/gui/action/LookAndFeelCommand.java
    jmeter/trunk/src/core/org/apache/jmeter/gui/action/Move.java
    jmeter/trunk/src/core/org/apache/jmeter/gui/action/Paste.java
    jmeter/trunk/src/core/org/apache/jmeter/gui/action/RemoteStart.java
    jmeter/trunk/src/core/org/apache/jmeter/gui/action/Remove.java
    jmeter/trunk/src/core/org/apache/jmeter/gui/action/ResetSearchCommand.java
    jmeter/trunk/src/core/org/apache/jmeter/gui/action/RevertProject.java
    jmeter/trunk/src/core/org/apache/jmeter/gui/action/SSLManagerCommand.java
    jmeter/trunk/src/core/org/apache/jmeter/gui/action/Save.java
    jmeter/trunk/src/core/org/apache/jmeter/gui/action/SaveGraphics.java
    jmeter/trunk/src/core/org/apache/jmeter/gui/action/SearchTreeCommand.java
    jmeter/trunk/src/core/org/apache/jmeter/gui/action/SearchTreeDialog.java
    jmeter/trunk/src/core/org/apache/jmeter/gui/action/Start.java
    jmeter/trunk/src/core/org/apache/jmeter/gui/action/StopStoppables.java
    jmeter/trunk/src/core/org/apache/jmeter/gui/action/TemplatesCommand.java
    jmeter/trunk/src/core/org/apache/jmeter/gui/action/ToolBar.java
    jmeter/trunk/src/core/org/apache/jmeter/gui/action/UndoCommand.java
    jmeter/trunk/src/core/org/apache/jmeter/gui/action/What.java
    jmeter/trunk/src/core/org/apache/jmeter/gui/action/template/TemplateManager.java
    jmeter/trunk/src/core/org/apache/jmeter/gui/tree/JMeterTreeModel.java
    jmeter/trunk/src/core/org/apache/jmeter/gui/tree/JMeterTreeNode.java
    jmeter/trunk/src/core/org/apache/jmeter/gui/tree/JMeterTreeTransferHandler.java
    jmeter/trunk/src/core/org/apache/jmeter/gui/util/FileListPanel.java
    jmeter/trunk/src/core/org/apache/jmeter/gui/util/FilePanelEntry.java
    jmeter/trunk/src/core/org/apache/jmeter/gui/util/JLabeledRadioI18N.java
    jmeter/trunk/src/core/org/apache/jmeter/gui/util/JMeterMenuBar.java
    jmeter/trunk/src/core/org/apache/jmeter/gui/util/JMeterToolBar.java
    jmeter/trunk/src/core/org/apache/jmeter/gui/util/MenuFactory.java
    jmeter/trunk/src/core/org/apache/jmeter/reporters/AbstractListenerElement.java
    jmeter/trunk/src/core/org/apache/jmeter/reporters/FileReporter.java
    jmeter/trunk/src/core/org/apache/jmeter/reporters/ResultCollector.java
    jmeter/trunk/src/core/org/apache/jmeter/reporters/Summariser.java
    jmeter/trunk/src/core/org/apache/jmeter/samplers/AsynchSampleSender.java
    jmeter/trunk/src/core/org/apache/jmeter/samplers/BatchSampleSender.java
    jmeter/trunk/src/core/org/apache/jmeter/samplers/Entry.java
    jmeter/trunk/src/core/org/apache/jmeter/samplers/HoldSampleSender.java
    jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleResult.java
    jmeter/trunk/src/core/org/apache/jmeter/samplers/StatisticalSampleSender.java
    jmeter/trunk/src/core/org/apache/jmeter/save/CSVSaveService.java
    jmeter/trunk/src/core/org/apache/jmeter/save/SaveService.java
    jmeter/trunk/src/core/org/apache/jmeter/save/converters/ConversionHelp.java
    jmeter/trunk/src/core/org/apache/jmeter/save/converters/TestResultWrapperConverter.java
    jmeter/trunk/src/core/org/apache/jmeter/services/FileServer.java
    jmeter/trunk/src/core/org/apache/jmeter/testbeans/TestBeanHelper.java
    jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/ComboStringEditor.java
    jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/TableEditor.java
    jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/TestBeanGUI.java
    jmeter/trunk/src/core/org/apache/jmeter/testelement/AbstractScopedTestElement.java
    jmeter/trunk/src/core/org/apache/jmeter/testelement/AbstractTestElement.java
    jmeter/trunk/src/core/org/apache/jmeter/testelement/TestPlan.java
    jmeter/trunk/src/core/org/apache/jmeter/testelement/VariablesCollection.java
    jmeter/trunk/src/core/org/apache/jmeter/testelement/property/CollectionProperty.java
    jmeter/trunk/src/core/org/apache/jmeter/threads/FindTestElementsUpToRootTraverser.java
    jmeter/trunk/src/core/org/apache/jmeter/threads/JMeterContext.java
    jmeter/trunk/src/core/org/apache/jmeter/threads/JMeterThread.java
    jmeter/trunk/src/core/org/apache/jmeter/threads/JMeterVariables.java
    jmeter/trunk/src/core/org/apache/jmeter/threads/RemoteThreadsListenerImpl.java
    jmeter/trunk/src/core/org/apache/jmeter/threads/TestCompiler.java
    jmeter/trunk/src/core/org/apache/jmeter/threads/ThreadGroup.java
    jmeter/trunk/src/core/org/apache/jmeter/util/JMeterUtils.java
    jmeter/trunk/src/core/org/apache/jmeter/util/JSR223BeanInfoSupport.java
    jmeter/trunk/src/core/org/apache/jmeter/util/JsseSSLManager.java
    jmeter/trunk/src/core/org/apache/jmeter/util/PropertiesBasedPrefixResolver.java
    jmeter/trunk/src/core/org/apache/jmeter/util/keystore/JmeterKeyStore.java
    jmeter/trunk/src/functions/org/apache/jmeter/functions/AbstractHostIPName.java
    jmeter/trunk/src/functions/org/apache/jmeter/functions/BeanShell.java
    jmeter/trunk/src/functions/org/apache/jmeter/functions/CSVRead.java
    jmeter/trunk/src/functions/org/apache/jmeter/functions/CharFunction.java
    jmeter/trunk/src/functions/org/apache/jmeter/functions/EscapeHtml.java
    jmeter/trunk/src/functions/org/apache/jmeter/functions/EscapeOroRegexpChars.java
    jmeter/trunk/src/functions/org/apache/jmeter/functions/EvalFunction.java
    jmeter/trunk/src/functions/org/apache/jmeter/functions/EvalVarFunction.java
    jmeter/trunk/src/functions/org/apache/jmeter/functions/FileRowColContainer.java
    jmeter/trunk/src/functions/org/apache/jmeter/functions/FileToString.java
    jmeter/trunk/src/functions/org/apache/jmeter/functions/FileWrapper.java
    jmeter/trunk/src/functions/org/apache/jmeter/functions/IntSum.java
    jmeter/trunk/src/functions/org/apache/jmeter/functions/IterationCounter.java
    jmeter/trunk/src/functions/org/apache/jmeter/functions/JavaScript.java
    jmeter/trunk/src/functions/org/apache/jmeter/functions/Jexl2Function.java
    jmeter/trunk/src/functions/org/apache/jmeter/functions/JexlFunction.java
    jmeter/trunk/src/functions/org/apache/jmeter/functions/LogFunction.java
    jmeter/trunk/src/functions/org/apache/jmeter/functions/LogFunction2.java
    jmeter/trunk/src/functions/org/apache/jmeter/functions/LongSum.java
    jmeter/trunk/src/functions/org/apache/jmeter/functions/Property.java
    jmeter/trunk/src/functions/org/apache/jmeter/functions/Property2.java
    jmeter/trunk/src/functions/org/apache/jmeter/functions/Random.java
    jmeter/trunk/src/functions/org/apache/jmeter/functions/RandomString.java
    jmeter/trunk/src/functions/org/apache/jmeter/functions/RegexFunction.java
    jmeter/trunk/src/functions/org/apache/jmeter/functions/SamplerName.java
    jmeter/trunk/src/functions/org/apache/jmeter/functions/SetProperty.java
    jmeter/trunk/src/functions/org/apache/jmeter/functions/SplitFunction.java
    jmeter/trunk/src/functions/org/apache/jmeter/functions/StringFromFile.java
    jmeter/trunk/src/functions/org/apache/jmeter/functions/TestPlanName.java
    jmeter/trunk/src/functions/org/apache/jmeter/functions/ThreadNumber.java
    jmeter/trunk/src/functions/org/apache/jmeter/functions/TimeFunction.java
    jmeter/trunk/src/functions/org/apache/jmeter/functions/UnEscape.java
    jmeter/trunk/src/functions/org/apache/jmeter/functions/UnEscapeHtml.java
    jmeter/trunk/src/functions/org/apache/jmeter/functions/UrlDecode.java
    jmeter/trunk/src/functions/org/apache/jmeter/functions/UrlEncode.java
    jmeter/trunk/src/functions/org/apache/jmeter/functions/Uuid.java
    jmeter/trunk/src/functions/org/apache/jmeter/functions/Variable.java
    jmeter/trunk/src/functions/org/apache/jmeter/functions/XPath.java
    jmeter/trunk/src/functions/org/apache/jmeter/functions/XPathWrapper.java
    jmeter/trunk/src/jorphan/org/apache/commons/cli/avalon/CLArgsParser.java
    jmeter/trunk/src/jorphan/org/apache/jorphan/collections/Data.java
    jmeter/trunk/src/jorphan/org/apache/jorphan/collections/HashTree.java
    jmeter/trunk/src/jorphan/org/apache/jorphan/collections/ListedHashTree.java
    jmeter/trunk/src/jorphan/org/apache/jorphan/collections/SearchByClass.java
    jmeter/trunk/src/jorphan/org/apache/jorphan/exec/KeyToolUtils.java
    jmeter/trunk/src/jorphan/org/apache/jorphan/gui/AbstractTreeTableModel.java
    jmeter/trunk/src/jorphan/org/apache/jorphan/gui/GuiUtils.java
    jmeter/trunk/src/jorphan/org/apache/jorphan/gui/JLabeledChoice.java
    jmeter/trunk/src/jorphan/org/apache/jorphan/gui/JLabeledTextArea.java
    jmeter/trunk/src/jorphan/org/apache/jorphan/gui/JLabeledTextField.java
    jmeter/trunk/src/jorphan/org/apache/jorphan/gui/ObjectTableModel.java
    jmeter/trunk/src/jorphan/org/apache/jorphan/math/StatCalculator.java
    jmeter/trunk/src/jorphan/org/apache/jorphan/reflect/ClassFinder.java
    jmeter/trunk/src/jorphan/org/apache/jorphan/util/JOrphanUtils.java
    jmeter/trunk/src/junit/org/apache/jmeter/protocol/java/control/gui/JUnitTestSamplerGui.java
    jmeter/trunk/src/monitor/components/org/apache/jmeter/visualizers/MonitorAccumModel.java
    jmeter/trunk/src/monitor/components/org/apache/jmeter/visualizers/MonitorHealthPanel.java
    jmeter/trunk/src/monitor/components/org/apache/jmeter/visualizers/MonitorPerformancePanel.java
    jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/StatusImpl.java
    jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/WorkersImpl.java
    jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/parser/MonitorHandler.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/AuthManager.java
    jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/CookieManager.java
    jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/DNSCacheManager.java
    jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/HC4CookieHandler.java
    jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/HeaderManager.java
    jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/HttpMirrorServer.java
    jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/HttpMirrorThread.java
    jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/KerberosManager.java
    jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/gui/CookiePanel.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/RegExUserParameters.java
    jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/modifier/UserParameterXMLContentHandler.java
    jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/modifier/UserSequence.java
    jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/HTMLParser.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/LagartoBasedHtmlParser.java
    jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/AbstractSamplerCreator.java
    jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/HttpRequestHdr.java
    jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/Proxy.java
    jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/ProxyControl.java
    jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/SamplerCreatorFactory.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/HTTPHC3Impl.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/HTTPHCAbstractImpl.java
    jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java
    jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HttpWebdav.java
    jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/WebServiceSampler.java
    jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/ConversionUtils.java
    jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/HTTPArgument.java
    jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/WSDLHelper.java
    jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/accesslog/LogFilter.java
    jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/accesslog/SessionFilter.java
    jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/accesslog/TCLogParser.java
    jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/visualizers/RequestViewHTTP.java
    jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/config/gui/JavaConfigGui.java
    jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/sampler/BSFSampler.java
    jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/sampler/BeanShellSampler.java
    jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/sampler/JSR223Sampler.java
    jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/sampler/JavaSampler.java
    jmeter/trunk/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/AbstractJDBCTestElement.java
    jmeter/trunk/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/config/DataSourceElement.java
    jmeter/trunk/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/config/DataSourceElementBeanInfo.java
    jmeter/trunk/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/sampler/JDBCSampler.java
    jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/client/ClientPool.java
    jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/client/InitialContextFactory.java
    jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/client/ReceiveSubscriber.java
    jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/JMSProperties.java
    jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/JMSSampler.java
    jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/MessageAdmin.java
    jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/PublisherSampler.java
    jmeter/trunk/src/protocol/ldap/org/apache/jmeter/protocol/ldap/config/gui/LDAPArguments.java
    jmeter/trunk/src/protocol/ldap/org/apache/jmeter/protocol/ldap/sampler/LDAPExtSampler.java
    jmeter/trunk/src/protocol/ldap/org/apache/jmeter/protocol/ldap/sampler/LDAPSampler.java
    jmeter/trunk/src/protocol/ldap/org/apache/jmeter/protocol/ldap/sampler/LdapClient.java
    jmeter/trunk/src/protocol/ldap/org/apache/jmeter/protocol/ldap/sampler/LdapExtClient.java
    jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/mail/sampler/MailReaderSampler.java
    jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/smtp/sampler/SmtpSampler.java
    jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/smtp/sampler/gui/SmtpPanel.java
    jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/smtp/sampler/protocol/SendMailCommand.java
    jmeter/trunk/src/protocol/mongodb/org/apache/jmeter/protocol/mongodb/mongo/MongoUtils.java
    jmeter/trunk/src/protocol/native/org/apache/jmeter/protocol/system/SystemSampler.java
    jmeter/trunk/src/protocol/tcp/org/apache/jmeter/protocol/tcp/sampler/TCPSampler.java

Modified: jmeter/trunk/src/components/org/apache/jmeter/assertions/CompareAssertion.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/assertions/CompareAssertion.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/assertions/CompareAssertion.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/assertions/CompareAssertion.java Sun Aug 23 10:39:36 2015
@@ -157,7 +157,7 @@ public class CompareAssertion extends Ab
 
     @Override
     public void iterationStart(LoopIterationEvent iterEvent) {
-        responses = new LinkedList<SampleResult>();
+        responses = new LinkedList<>();
     }
 
     public void iterationEnd(LoopIterationEvent iterEvent) {

Modified: jmeter/trunk/src/components/org/apache/jmeter/assertions/CompareAssertionBeanInfo.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/assertions/CompareAssertionBeanInfo.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/assertions/CompareAssertionBeanInfo.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/assertions/CompareAssertionBeanInfo.java Sun Aug 23 10:39:36 2015
@@ -48,7 +48,7 @@ public class CompareAssertionBeanInfo ex
         p.setValue(TableEditor.OBJECT_PROPERTIES, // These are the names of the get/set methods
                 new String[]{SubstitutionElement.REGEX, SubstitutionElement.SUBSTITUTE});
         p.setValue(NOT_UNDEFINED,Boolean.TRUE);
-        p.setValue(DEFAULT,new ArrayList<Object>());
+        p.setValue(DEFAULT, new ArrayList<>());
         p.setValue(MULTILINE,Boolean.TRUE);
 
     }

Modified: jmeter/trunk/src/components/org/apache/jmeter/assertions/SMIMEAssertion.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/assertions/SMIMEAssertion.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/assertions/SMIMEAssertion.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/assertions/SMIMEAssertion.java Sun Aug 23 10:39:36 2015
@@ -321,7 +321,7 @@ class SMIMEAssertion {
      */
     private static List<String> getEmailFromCert(X509Certificate cert)
             throws CertificateException {
-        List<String> res = new ArrayList<String>();
+        List<String> res = new ArrayList<>();
 
         X509Principal subject = PrincipalUtil.getSubjectX509Principal(cert);
         Iterator<?> addressIt = subject.getValues(X509Name.EmailAddress).iterator();

Modified: jmeter/trunk/src/components/org/apache/jmeter/control/CriticalSectionController.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/control/CriticalSectionController.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/control/CriticalSectionController.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/control/CriticalSectionController.java Sun Aug 23 10:39:36 2015
@@ -70,7 +70,7 @@ public class CriticalSectionController e
 
     private static final String LOCK_NAME = "CriticalSectionController.lockName"; //$NON-NLS-1$
 
-    private static final ConcurrentHashMap<String, ReentrantLock> LOCK_MAP = new ConcurrentHashMap<String, ReentrantLock>();
+    private static final ConcurrentHashMap<String, ReentrantLock> LOCK_MAP = new ConcurrentHashMap<>();
 
     private transient volatile ReentrantLock currentLock;
 

Modified: jmeter/trunk/src/components/org/apache/jmeter/control/IncludeController.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/control/IncludeController.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/control/IncludeController.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/control/IncludeController.java Sun Aug 23 10:39:36 2015
@@ -173,7 +173,7 @@ public class IncludeController extends G
      * @return HashTree Subset within Test Fragment or Empty HashTree
      */
     private HashTree getProperBranch(HashTree tree) {
-        Iterator<Object> iter = new LinkedList<Object>(tree.list()).iterator();
+        Iterator<Object> iter = new LinkedList<>(tree.list()).iterator();
         while (iter.hasNext()) {
             TestElement item = (TestElement) iter.next();
 
@@ -194,7 +194,7 @@ public class IncludeController extends G
 
 
     private void removeDisabledItems(HashTree tree) {
-        Iterator<Object> iter = new LinkedList<Object>(tree.list()).iterator();
+        Iterator<Object> iter = new LinkedList<>(tree.list()).iterator();
         while (iter.hasNext()) {
             TestElement item = (TestElement) iter.next();
             if (!item.isEnabled()) {

Modified: jmeter/trunk/src/components/org/apache/jmeter/control/ModuleController.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/control/ModuleController.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/control/ModuleController.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/control/ModuleController.java Sun Aug 23 10:39:36 2015
@@ -100,7 +100,7 @@ public class ModuleController extends Ge
     }
 
     private void setNodePath() {
-        List<String> nodePath = new ArrayList<String>();
+        List<String> nodePath = new ArrayList<>();
         if (selectedNode != null) {
             TreeNode[] path = selectedNode.getPath();
             for (TreeNode node : path) {

Modified: jmeter/trunk/src/components/org/apache/jmeter/control/RandomOrderController.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/control/RandomOrderController.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/control/RandomOrderController.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/control/RandomOrderController.java Sun Aug 23 10:39:36 2015
@@ -62,7 +62,7 @@ public class RandomOrderController exten
         int numElements = this.subControllersAndSamplers.size();
 
         // Create a new list containing numElements null elements.
-        List<TestElement> reordered = new ArrayList<TestElement>(this.subControllersAndSamplers.size());
+        List<TestElement> reordered = new ArrayList<>(this.subControllersAndSamplers.size());
         for (int i = 0; i < numElements; i++) {
             reordered.add(null);
         }

Modified: jmeter/trunk/src/components/org/apache/jmeter/extractor/DebugPostProcessor.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/extractor/DebugPostProcessor.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/extractor/DebugPostProcessor.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/extractor/DebugPostProcessor.java Sun Aug 23 10:39:36 2015
@@ -94,7 +94,7 @@ public class DebugPostProcessor extends
     }
 
     private void formatPropertyIterator(StringBuilder sb, PropertyIterator iter) {
-        Map<String, String> map = new HashMap<String, String>();
+        Map<String, String> map = new HashMap<>();
         while (iter.hasNext()) {
             JMeterProperty item = iter.next();
             map.put(item.getName(), item.getStringValue());
@@ -104,7 +104,7 @@ public class DebugPostProcessor extends
 
     private void formatSet(StringBuilder sb, @SuppressWarnings("rawtypes") Set s) {
         @SuppressWarnings("unchecked")
-        ArrayList<Map.Entry<Object, Object>> al = new ArrayList<Map.Entry<Object, Object>>(s);
+        ArrayList<Map.Entry<Object, Object>> al = new ArrayList<>(s);
         Collections.sort(al, new Comparator<Map.Entry<Object, Object>>(){
             @Override
             public int compare(Map.Entry<Object, Object> o1, Map.Entry<Object, Object> o2) {

Modified: jmeter/trunk/src/components/org/apache/jmeter/extractor/HtmlExtractor.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/extractor/HtmlExtractor.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/extractor/HtmlExtractor.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/extractor/HtmlExtractor.java Sun Aug 23 10:39:36 2015
@@ -177,7 +177,7 @@ public class HtmlExtractor extends Abstr
             String expression, String attribute, int matchNumber,
             SampleResult previousResult) {
         int found = 0;
-        List<String> result = new ArrayList<String>();
+        List<String> result = new ArrayList<>();
         if (isScopeVariable()){
             String inputString=vars.get(getVariableName());
             if(!StringUtils.isEmpty(inputString)) {

Modified: jmeter/trunk/src/components/org/apache/jmeter/extractor/RegexExtractor.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/extractor/RegexExtractor.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/extractor/RegexExtractor.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/extractor/RegexExtractor.java Sun Aug 23 10:39:36 2015
@@ -192,7 +192,7 @@ public class RegexExtractor extends Abst
         }
 
         Perl5Matcher matcher = JMeterUtils.getMatcher();
-        List<MatchResult> matches = new ArrayList<MatchResult>();
+        List<MatchResult> matches = new ArrayList<>();
         int found = 0;
 
         if (isScopeVariable()){
@@ -315,7 +315,7 @@ public class RegexExtractor extends Abst
             return;
         }
         // Contains Strings and Integers
-        List<Object> combined = new ArrayList<Object>();
+        List<Object> combined = new ArrayList<>();
         String rawTemplate = getTemplate();
         PatternMatcher matcher = JMeterUtils.getMatcher();
         Pattern templatePattern = JMeterUtils.getPatternCache().getPattern("\\$(\\d+)\\$"  // $NON-NLS-1$

Modified: jmeter/trunk/src/components/org/apache/jmeter/extractor/XPathExtractor.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/extractor/XPathExtractor.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/extractor/XPathExtractor.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/extractor/XPathExtractor.java Sun Aug 23 10:39:36 2015
@@ -124,7 +124,7 @@ public class XPathExtractor extends Abst
         vars.put(matchNR, "0"); // In case parse fails // $NON-NLS-1$
         vars.remove(concat(refName,"1")); // In case parse fails // $NON-NLS-1$
 
-        List<String> matches = new ArrayList<String>();
+        List<String> matches = new ArrayList<>();
         try{
             if (isScopeVariable()){
                 String inputString=vars.get(getVariableName());

Modified: jmeter/trunk/src/components/org/apache/jmeter/modifiers/UserParameters.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/modifiers/UserParameters.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/modifiers/UserParameters.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/modifiers/UserParameters.java Sun Aug 23 10:39:36 2015
@@ -123,7 +123,7 @@ public class UserParameters extends Abst
         if (threadValues.size() > 0) {
             return (CollectionProperty) threadValues.get(getThreadContext().getThreadNum() % threadValues.size());
         }
-        return new CollectionProperty("noname", new LinkedList<Object>());
+        return new CollectionProperty("noname", new LinkedList<>());
     }
 
     public boolean isPerIteration() {

Modified: jmeter/trunk/src/components/org/apache/jmeter/modifiers/gui/UserParametersGui.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/modifiers/gui/UserParametersGui.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/modifiers/gui/UserParametersGui.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/modifiers/gui/UserParametersGui.java Sun Aug 23 10:39:36 2015
@@ -131,7 +131,7 @@ public class UserParametersGui extends A
         GuiUtils.stopTableEditing(paramTable);
         UserParameters userParams = ((UserParameters) params);
         userParams.setNames(new CollectionProperty(UserParameters.NAMES, tableModel.getColumnData(NAME_COL_RESOURCE)));
-        CollectionProperty threadLists = new CollectionProperty(UserParameters.THREAD_VALUES, new ArrayList<Object>());
+        CollectionProperty threadLists = new CollectionProperty(UserParameters.THREAD_VALUES, new ArrayList<>());
         log.debug("making threadlists from gui");
         for (int col = 1; col < tableModel.getColumnCount(); col++) {
             threadLists.addItem(tableModel.getColumnData(getUserColName(col)));

Modified: jmeter/trunk/src/components/org/apache/jmeter/reporters/MailerModel.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/reporters/MailerModel.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/reporters/MailerModel.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/reporters/MailerModel.java Sun Aug 23 10:39:36 2015
@@ -152,7 +152,7 @@ public class MailerModel extends Abstrac
      */
     public List<String> getAddressList() {
         String addressees = getToAddress();
-        List<String> addressList = new ArrayList<String>();
+        List<String> addressList = new ArrayList<>();
 
         if (addressees != null) {
 

Modified: jmeter/trunk/src/components/org/apache/jmeter/sampler/DebugSampler.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/sampler/DebugSampler.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/sampler/DebugSampler.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/sampler/DebugSampler.java Sun Aug 23 10:39:36 2015
@@ -43,7 +43,7 @@ public class DebugSampler extends Abstra
 
     private static final long serialVersionUID = 232L;
 
-    private static final Set<String> APPLIABLE_CONFIG_CLASSES = new HashSet<String>(
+    private static final Set<String> APPLIABLE_CONFIG_CLASSES = new HashSet<>(
             Arrays.asList(new String[]{
                     "org.apache.jmeter.config.gui.SimpleConfigGui"}));
 
@@ -91,7 +91,7 @@ public class DebugSampler extends Abstra
 
     private void formatSet(StringBuilder sb, @SuppressWarnings("rawtypes") Set s) {
         @SuppressWarnings("unchecked")
-        ArrayList<Map.Entry<Object, Object>> al = new ArrayList<Map.Entry<Object, Object>>(s);
+        ArrayList<Map.Entry<Object, Object>> al = new ArrayList<>(s);
         Collections.sort(al, new Comparator<Map.Entry<Object, Object>>(){
             @Override
             public int compare(Map.Entry<Object, Object> o1, Map.Entry<Object, Object> o2) {

Modified: jmeter/trunk/src/components/org/apache/jmeter/sampler/TestAction.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/sampler/TestAction.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/sampler/TestAction.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/sampler/TestAction.java Sun Aug 23 10:39:36 2015
@@ -46,7 +46,7 @@ public class TestAction extends Abstract
 
     private static final long serialVersionUID = 240L;
 
-    private static final Set<String> APPLIABLE_CONFIG_CLASSES = new HashSet<String>(
+    private static final Set<String> APPLIABLE_CONFIG_CLASSES = new HashSet<>(
             Arrays.asList(new String[]{
                     "org.apache.jmeter.config.gui.SimpleConfigGui"}));
 

Modified: jmeter/trunk/src/components/org/apache/jmeter/timers/ConstantThroughputTimer.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/timers/ConstantThroughputTimer.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/timers/ConstantThroughputTimer.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/timers/ConstantThroughputTimer.java Sun Aug 23 10:39:36 2015
@@ -98,7 +98,7 @@ public class ConstantThroughputTimer ext
 
     //For holding the ThrougputInfo objects for all ThreadGroups. Keyed by AbstractThreadGroup objects
     private static final ConcurrentMap<AbstractThreadGroup, ThroughputInfo> threadGroupsInfoMap =
-        new ConcurrentHashMap<AbstractThreadGroup, ThroughputInfo>();
+            new ConcurrentHashMap<>();
 
 
     /**

Modified: jmeter/trunk/src/components/org/apache/jmeter/visualizers/PropertyControlGui.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/visualizers/PropertyControlGui.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/visualizers/PropertyControlGui.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/visualizers/PropertyControlGui.java Sun Aug 23 10:39:36 2015
@@ -149,7 +149,7 @@ public class PropertyControlGui extends
             return;
         }
         Set<Map.Entry<Object, Object>> s = p.entrySet();
-        ArrayList<Map.Entry<Object, Object>> al = new ArrayList<Map.Entry<Object, Object>>(s);
+        ArrayList<Map.Entry<Object, Object>> al = new ArrayList<>(s);
         Collections.sort(al, new Comparator<Map.Entry<Object, Object>>(){
             @Override
             public int compare(Map.Entry<Object, Object> o1, Map.Entry<Object, Object> o2) {

Modified: jmeter/trunk/src/components/org/apache/jmeter/visualizers/RenderAsCssJQuery.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/visualizers/RenderAsCssJQuery.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/visualizers/RenderAsCssJQuery.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/visualizers/RenderAsCssJQuery.java Sun Aug 23 10:39:36 2015
@@ -123,7 +123,7 @@ public class RenderAsCssJQuery implement
 
     private String process(String textToParse) {
         try {
-            List<String> result = new ArrayList<String>();
+            List<String> result = new ArrayList<>();
             Extractor extractor = HtmlExtractor.getExtractorImpl(cssJqueryLabeledChoice.getText());
             final int nbFound = extractor.extract(
                     cssJqueryField.getText(), attributeField.getText(), -1, textToParse, result, 0, null);

Modified: jmeter/trunk/src/components/org/apache/jmeter/visualizers/RenderAsRegexp.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/visualizers/RenderAsRegexp.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/visualizers/RenderAsRegexp.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/visualizers/RenderAsRegexp.java Sun Aug 23 10:39:36 2015
@@ -126,7 +126,7 @@ public class RenderAsRegexp implements R
         } catch (MalformedCachePatternException e) {
             return e.toString();
         }
-        List<MatchResult> matches = new LinkedList<MatchResult>();
+        List<MatchResult> matches = new LinkedList<>();
         while (matcher.contains(input, pattern)) {
             matches.add(matcher.getMatch());
         }

Modified: jmeter/trunk/src/components/org/apache/jmeter/visualizers/RenderAsXPath.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/visualizers/RenderAsXPath.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/visualizers/RenderAsXPath.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/visualizers/RenderAsXPath.java Sun Aug 23 10:39:36 2015
@@ -135,7 +135,7 @@ public class RenderAsXPath implements Re
     private String process(String textToParse, XPathExtractor extractor) {
         try {
             Document doc = parseResponse(textToParse, extractor);
-            List<String> matchStrings = new ArrayList<String>();
+            List<String> matchStrings = new ArrayList<>();
             XPathUtil.putValuesForXPathInList(doc, xpathExpressionField.getText(),
                     matchStrings, extractor.getFragment());
             StringBuilder builder = new StringBuilder();

Modified: jmeter/trunk/src/components/org/apache/jmeter/visualizers/RequestPanel.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/visualizers/RequestPanel.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/visualizers/RequestPanel.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/visualizers/RequestPanel.java Sun Aug 23 10:39:36 2015
@@ -51,7 +51,7 @@ public class RequestPanel {
      * and Create Request Panel
      */
     public RequestPanel() {
-        listRequestView = new LinkedList<RequestView>();
+        listRequestView = new LinkedList<>();
         List<String> classesToAdd = Collections.<String> emptyList();
         try {
             classesToAdd = JMeterUtils.findClassesThatExtend(RequestView.class);

Modified: jmeter/trunk/src/components/org/apache/jmeter/visualizers/RespTimeGraphVisualizer.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/visualizers/RespTimeGraphVisualizer.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/visualizers/RespTimeGraphVisualizer.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/visualizers/RespTimeGraphVisualizer.java Sun Aug 23 10:39:36 2015
@@ -261,12 +261,12 @@ public class RespTimeGraphVisualizer ext
     /**
      * We want to retain insertion order, so LinkedHashMap is necessary
      */
-    private final Map<String, RespTimeGraphLineBean> seriesNames = new LinkedHashMap<String, RespTimeGraphLineBean>();
+    private final Map<String, RespTimeGraphLineBean> seriesNames = new LinkedHashMap<>();
 
     /**
      * We want to retain insertion order, so LinkedHashMap is necessary
      */
-    private final Map<String, Map<Long, StatCalculatorLong>> pList = new LinkedHashMap<String, Map<Long, StatCalculatorLong>>();
+    private final Map<String, Map<Long, StatCalculatorLong>> pList = new LinkedHashMap<>();
 
     private long durationTest = 0;
     
@@ -278,7 +278,7 @@ public class RespTimeGraphVisualizer ext
 
     private final List<Color> listColors = Colors.getColors();
 
-    private final List<RespTimeGraphDataBean> internalList = new ArrayList<RespTimeGraphDataBean>(); // internal list of all results
+    private final List<RespTimeGraphDataBean> internalList = new ArrayList<>(); // internal list of all results
 
     public RespTimeGraphVisualizer() {
         init();
@@ -331,7 +331,7 @@ public class RespTimeGraphVisualizer ext
                             value.addValue(respTime, 1);
                         } else {
                             // We want to retain insertion order, so LinkedHashMap is necessary
-                            Map<Long, StatCalculatorLong> newSubList = new LinkedHashMap<Long, StatCalculatorLong>(5);
+                            Map<Long, StatCalculatorLong> newSubList = new LinkedHashMap<>(5);
                             StatCalculatorLong helper = new StatCalculatorLong();
                             helper.addValue(Long.valueOf(sampleResult.getTime()),1);
                             newSubList.put(startTimeIntervalLong,  helper);
@@ -403,7 +403,7 @@ public class RespTimeGraphVisualizer ext
 
         double nanLast = 0;
         double nanBegin = 0;
-        List<Double> nanList = new ArrayList<Double>();
+        List<Double> nanList = new ArrayList<>();
         int s = 0;
         for (Map<Long, StatCalculatorLong> subList : pList.values()) {
             int idx = 0;
@@ -557,7 +557,7 @@ public class RespTimeGraphVisualizer ext
                 // Reload data form internal list of results
                 synchronized (lockInterval) {
                     if (internalList.size() >= 2) {
-                        List<RespTimeGraphDataBean> tempList = new ArrayList<RespTimeGraphDataBean>();
+                        List<RespTimeGraphDataBean> tempList = new ArrayList<>();
                         tempList.addAll(internalList);
                         this.clearData();
                         for (RespTimeGraphDataBean data : tempList) {

Modified: jmeter/trunk/src/components/org/apache/jmeter/visualizers/StatGraphProperties.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/visualizers/StatGraphProperties.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/visualizers/StatGraphProperties.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/visualizers/StatGraphProperties.java Sun Aug 23 10:39:36 2015
@@ -35,7 +35,7 @@ public class StatGraphProperties {
     public static final String[] strokeWidth = { "1.0f", "1.5f", "2.0f", "2.5f", "3.0f", "3.5f", "4.0f", "4.5f", "5.0f", "5.5f", "6.0f", "6.5f"};
 
     public static Map<String, String> getFontNameMap() {
-        Map<String, String> fontNameMap = new LinkedHashMap<String, String>(2);
+        Map<String, String> fontNameMap = new LinkedHashMap<>(2);
         fontNameMap.put(JMeterUtils.getResString("font.sansserif"), "SansSerif"); //$NON-NLS-1$ //$NON-NLS-1$
         fontNameMap.put(JMeterUtils.getResString("font.serif"), "Serif"); //$NON-NLS-1$
         return fontNameMap;
@@ -43,7 +43,7 @@ public class StatGraphProperties {
 
     @SuppressWarnings("boxing")
     public static Map<String, Integer> getFontStyleMap() {
-        Map<String, Integer> fontStyleMap = new LinkedHashMap<String, Integer>(3);
+        Map<String, Integer> fontStyleMap = new LinkedHashMap<>(3);
         fontStyleMap.put(JMeterUtils.getResString("fontstyle.normal"), Font.PLAIN); //$NON-NLS-1$
         fontStyleMap.put(JMeterUtils.getResString("fontstyle.bold"), Font.BOLD); //$NON-NLS-1$
         fontStyleMap.put(JMeterUtils.getResString("fontstyle.italic"), Font.ITALIC); //$NON-NLS-1$
@@ -52,7 +52,7 @@ public class StatGraphProperties {
 
     @SuppressWarnings("boxing")
     public static Map<String, Integer> getPlacementNameMap() {
-        Map<String, Integer> placementNameMap = new LinkedHashMap<String, Integer>(4);
+        Map<String, Integer> placementNameMap = new LinkedHashMap<>(4);
         placementNameMap.put(JMeterUtils.getResString("aggregate_graph_legend.placement.bottom"), LegendAreaProperties.BOTTOM); //$NON-NLS-1$
         placementNameMap.put(JMeterUtils.getResString("aggregate_graph_legend.placement.right"), LegendAreaProperties.RIGHT); //$NON-NLS-1$
         placementNameMap.put(JMeterUtils.getResString("aggregate_graph_legend.placement.left"), LegendAreaProperties.LEFT); //$NON-NLS-1$
@@ -62,7 +62,7 @@ public class StatGraphProperties {
     
     public static Map<String, Shape> getPointShapeMap() {
         // We want to retain insertion order, so LinkedHashMap is necessary
-        Map<String, Shape> pointShapeMap = new LinkedHashMap<String, Shape>(5);
+        Map<String, Shape> pointShapeMap = new LinkedHashMap<>(5);
         pointShapeMap.put(JMeterUtils.getResString("graph_pointshape_circle"), PointChartProperties.SHAPE_CIRCLE); //$NON-NLS-1$
         pointShapeMap.put(JMeterUtils.getResString("graph_pointshape_diamond"), PointChartProperties.SHAPE_DIAMOND); //$NON-NLS-1$
         pointShapeMap.put(JMeterUtils.getResString("graph_pointshape_square"), PointChartProperties.SHAPE_SQUARE); //$NON-NLS-1$

Modified: jmeter/trunk/src/components/org/apache/jmeter/visualizers/StatGraphVisualizer.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/visualizers/StatGraphVisualizer.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/visualizers/StatGraphVisualizer.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/visualizers/StatGraphVisualizer.java Sun Aug 23 10:39:36 2015
@@ -157,8 +157,7 @@ public class StatGraphVisualizer extends
      */
     private final transient Object lock = new Object();
     
-    private final Map<String, SamplingStatCalculator> tableRows =
-        new ConcurrentHashMap<String, SamplingStatCalculator>();
+    private final Map<String, SamplingStatCalculator> tableRows = new ConcurrentHashMap<>();
 
     private AxisGraph graphPanel = null;
 
@@ -219,7 +218,7 @@ public class StatGraphVisualizer extends
 
     private JComboBox<String> columnsList = new JComboBox<>(GRAPH_COLUMNS);
 
-    private List<BarGraph> eltList = new ArrayList<BarGraph>();
+    private List<BarGraph> eltList = new ArrayList<>();
 
     private JCheckBox columnSelection = new JCheckBox(JMeterUtils.getResString("aggregate_graph_column_selection"), false); //$NON-NLS-1$
 
@@ -597,11 +596,11 @@ public class StatGraphVisualizer extends
      * @return the data from the model
      */
     public static List<List<Object>> getAllTableData(ObjectTableModel model, Format[] formats) {
-        List<List<Object>> data = new ArrayList<List<Object>>();
+        List<List<Object>> data = new ArrayList<>();
         if (model.getRowCount() > 0) {
             for (int rw=0; rw < model.getRowCount(); rw++) {
                 int cols = model.getColumnCount();
-                List<Object> column = new ArrayList<Object>();
+                List<Object> column = new ArrayList<>();
                 data.add(column);
                 for (int idx=0; idx < cols; idx++) {
                     Object val = model.getValueAt(rw,idx);

Modified: jmeter/trunk/src/components/org/apache/jmeter/visualizers/StatVisualizer.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/visualizers/StatVisualizer.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/visualizers/StatVisualizer.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/visualizers/StatVisualizer.java Sun Aug 23 10:39:36 2015
@@ -88,8 +88,7 @@ public class StatVisualizer extends Abst
      */
     private final transient Object lock = new Object();
 
-    private final Map<String, SamplingStatCalculator> tableRows =
-        new ConcurrentHashMap<String, SamplingStatCalculator>();
+    private final Map<String, SamplingStatCalculator> tableRows = new ConcurrentHashMap<>();
 
     public StatVisualizer() {
         super();

Modified: jmeter/trunk/src/components/org/apache/jmeter/visualizers/SummaryReport.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/visualizers/SummaryReport.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/visualizers/SummaryReport.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/visualizers/SummaryReport.java Sun Aug 23 10:39:36 2015
@@ -104,8 +104,7 @@ public class SummaryReport extends Abstr
      */
     private final transient Object lock = new Object();
 
-    private final Map<String, Calculator> tableRows =
-        new ConcurrentHashMap<String, Calculator>();
+    private final Map<String, Calculator> tableRows = new ConcurrentHashMap<>();
 
     // Column renderers
     private static final TableCellRenderer[] RENDERERS =

Modified: jmeter/trunk/src/components/org/apache/jmeter/visualizers/ViewResultsFullVisualizer.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/visualizers/ViewResultsFullVisualizer.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/visualizers/ViewResultsFullVisualizer.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/visualizers/ViewResultsFullVisualizer.java Sun Aug 23 10:39:36 2015
@@ -322,7 +322,7 @@ implements ActionListener, TreeSelection
         }
         String textRenderer = JMeterUtils.getResString("view_results_render_text"); // $NON-NLS-1$
         Object textObject = null;
-        Map<String, ResultRenderer> map = new HashMap<String, ResultRenderer>(classesToAdd.size());
+        Map<String, ResultRenderer> map = new HashMap<>(classesToAdd.size());
         for (String clazz : classesToAdd) {
             try {
                 // Instantiate render classes

Modified: jmeter/trunk/src/components/org/apache/jmeter/visualizers/backend/AbstractBackendListenerClient.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/visualizers/backend/AbstractBackendListenerClient.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/visualizers/backend/AbstractBackendListenerClient.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/visualizers/backend/AbstractBackendListenerClient.java Sun Aug 23 10:39:36 2015
@@ -56,7 +56,7 @@ public abstract class AbstractBackendLis
     private static final Logger LOGGER = LoggingManager.getLoggerForClass();
     private UserMetric userMetrics = new UserMetric();
     
-    private ConcurrentHashMap<String, SamplerMetric> metricsPerSampler = new ConcurrentHashMap<String, SamplerMetric>();
+    private ConcurrentHashMap<String, SamplerMetric> metricsPerSampler = new ConcurrentHashMap<>();
 
     /* Implements BackendListenerClient.setupTest(BackendListenerContext) */
     @Override

Modified: jmeter/trunk/src/components/org/apache/jmeter/visualizers/backend/BackendListener.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/visualizers/backend/BackendListener.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/visualizers/backend/BackendListener.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/visualizers/backend/BackendListener.java Sun Aug 23 10:39:36 2015
@@ -111,8 +111,8 @@ public class BackendListener extends Abs
      * per server. But we need the total to be shared.
      */
     //@GuardedBy("LOCK") - needed to ensure consistency between this and instanceCount
-    private static final Map<String, ListenerClientData> queuesByTestElementName = 
-            new ConcurrentHashMap<String, ListenerClientData>();
+    private static final Map<String, ListenerClientData> queuesByTestElementName =
+            new ConcurrentHashMap<>();
 
     /**
      * Create a BackendListener.
@@ -208,7 +208,7 @@ public class BackendListener extends Abs
         @Override
         public void run() {
             boolean isDebugEnabled = LOGGER.isDebugEnabled();
-            List<SampleResult> sampleResults = new ArrayList<SampleResult>(listenerClientData.queue.size());
+            List<SampleResult> sampleResults = new ArrayList<>(listenerClientData.queue.size());
             try {
                 try {
 
@@ -322,7 +322,7 @@ public class BackendListener extends Abs
                 BackendListenerContext context = new BackendListenerContext((Arguments)getArguments().clone());
 
                 listenerClientData = new ListenerClientData();
-                listenerClientData.queue = new ArrayBlockingQueue<SampleResult>(queueSize); 
+                listenerClientData.queue = new ArrayBlockingQueue<>(queueSize);
                 listenerClientData.queueWaits = new AtomicLong(0L);
                 listenerClientData.queueWaitTime = new AtomicLong(0L);
                 listenerClientData.latch = new CountDownLatch(1);

Modified: jmeter/trunk/src/components/org/apache/jmeter/visualizers/backend/BackendListenerGui.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/visualizers/backend/BackendListenerGui.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/visualizers/backend/BackendListenerGui.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/visualizers/backend/BackendListenerGui.java Sun Aug 23 10:39:36 2015
@@ -110,7 +110,7 @@ public class BackendListenerGui extends
      * @return a panel containing the relevant components
      */
     private JPanel createClassnamePanel() {
-        List<String> possibleClasses = new ArrayList<String>();
+        List<String> possibleClasses = new ArrayList<>();
 
         try {
             // Find all the classes which implement the BackendListenerClient
@@ -244,7 +244,7 @@ public class BackendListenerGui extends
      */
     private static final boolean checkContainsClassName(ComboBoxModel<?> model, String className) {
         int size = model.getSize();
-        Set<String> set = new HashSet<String>(size);
+        Set<String> set = new HashSet<>(size);
         for (int i = 0; i < size; i++) {
             set.add((String)model.getElementAt(i));
         }

Modified: jmeter/trunk/src/components/org/apache/jmeter/visualizers/backend/graphite/AbstractGraphiteMetricsSender.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/visualizers/backend/graphite/AbstractGraphiteMetricsSender.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/visualizers/backend/graphite/AbstractGraphiteMetricsSender.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/visualizers/backend/graphite/AbstractGraphiteMetricsSender.java Sun Aug 23 10:39:36 2015
@@ -47,7 +47,7 @@ abstract class AbstractGraphiteMetricsSe
         config.setMinEvictableIdleTimeMillis(TimeUnit.MINUTES.toMillis(3));
         config.setTimeBetweenEvictionRunsMillis(TimeUnit.MINUTES.toMillis(3));
 
-        return new GenericKeyedObjectPool<SocketConnectionInfos, SocketOutputStream>(
+        return new GenericKeyedObjectPool<>(
                 new SocketOutputStreamPoolFactory(SOCKET_CONNECT_TIMEOUT_MS, SOCKET_TIMEOUT), config);
     }
     

Modified: jmeter/trunk/src/components/org/apache/jmeter/visualizers/backend/graphite/GraphiteBackendListenerClient.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/visualizers/backend/graphite/GraphiteBackendListenerClient.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/visualizers/backend/graphite/GraphiteBackendListenerClient.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/visualizers/backend/graphite/GraphiteBackendListenerClient.java Sun Aug 23 10:39:36 2015
@@ -233,9 +233,9 @@ public class GraphiteBackendListenerClie
         rootMetricsPrefix = context.getParameter("rootMetricsPrefix", DEFAULT_METRICS_PREFIX);
         String percentilesAsString = context.getParameter("percentiles", DEFAULT_METRICS_PREFIX);
         String[]  percentilesStringArray = percentilesAsString.split(SEPARATOR);
-        okPercentiles = new HashMap<String, Float>(percentilesStringArray.length);
-        koPercentiles = new HashMap<String, Float>(percentilesStringArray.length);
-        allPercentiles = new HashMap<String, Float>(percentilesStringArray.length);
+        okPercentiles = new HashMap<>(percentilesStringArray.length);
+        koPercentiles = new HashMap<>(percentilesStringArray.length);
+        allPercentiles = new HashMap<>(percentilesStringArray.length);
         DecimalFormat format = new DecimalFormat("0.##");
         for (int i = 0; i < percentilesStringArray.length; i++) {
             if(!StringUtils.isEmpty(percentilesStringArray[i].trim())) {
@@ -260,7 +260,7 @@ public class GraphiteBackendListenerClie
         this.graphiteMetricsManager = (GraphiteMetricsSender) clazz.newInstance();
         graphiteMetricsManager.setup(graphiteHost, graphitePort, rootMetricsPrefix);
         String[] samplers = samplersList.split(SEPARATOR);
-        samplersToFilter = new HashSet<String>();
+        samplersToFilter = new HashSet<>();
         for (String samplerName : samplers) {
             samplersToFilter.add(samplerName);
         }

Modified: jmeter/trunk/src/components/org/apache/jmeter/visualizers/backend/graphite/PickleGraphiteMetricsSender.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/visualizers/backend/graphite/PickleGraphiteMetricsSender.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/visualizers/backend/graphite/PickleGraphiteMetricsSender.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/visualizers/backend/graphite/PickleGraphiteMetricsSender.java Sun Aug 23 10:39:36 2015
@@ -53,7 +53,7 @@ class PickleGraphiteMetricsSender extend
     private String prefix;
 
     // graphite expects a python-pickled list of nested tuples.
-    private List<MetricTuple> metrics = new LinkedList<MetricTuple>();
+    private List<MetricTuple> metrics = new LinkedList<>();
 
     private GenericKeyedObjectPool<SocketConnectionInfos, SocketOutputStream> socketOutputStreamPool;
 

Modified: jmeter/trunk/src/components/org/apache/jmeter/visualizers/backend/graphite/SocketOutputStreamPoolFactory.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/visualizers/backend/graphite/SocketOutputStreamPoolFactory.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/visualizers/backend/graphite/SocketOutputStreamPoolFactory.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/visualizers/backend/graphite/SocketOutputStreamPoolFactory.java Sun Aug 23 10:39:36 2015
@@ -81,6 +81,6 @@ public class SocketOutputStreamPoolFacto
 
     @Override
     public PooledObject<SocketOutputStream> wrap(SocketOutputStream outputStream) {
-        return new DefaultPooledObject<SocketOutputStream>(outputStream);
+        return new DefaultPooledObject<>(outputStream);
     }
 }

Modified: jmeter/trunk/src/components/org/apache/jmeter/visualizers/backend/graphite/TextGraphiteMetricsSender.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/visualizers/backend/graphite/TextGraphiteMetricsSender.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/visualizers/backend/graphite/TextGraphiteMetricsSender.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/visualizers/backend/graphite/TextGraphiteMetricsSender.java Sun Aug 23 10:39:36 2015
@@ -36,7 +36,7 @@ class TextGraphiteMetricsSender extends
         
     private String prefix;
 
-    private List<MetricTuple> metrics = new ArrayList<MetricTuple>();
+    private List<MetricTuple> metrics = new ArrayList<>();
 
     private GenericKeyedObjectPool<SocketConnectionInfos, SocketOutputStream> socketOutputStreamPool;
 

Modified: jmeter/trunk/src/components/org/apache/jmeter/visualizers/utils/Colors.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/visualizers/utils/Colors.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/visualizers/utils/Colors.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/visualizers/utils/Colors.java Sun Aug 23 10:39:36 2015
@@ -78,7 +78,7 @@ public class Colors {
 
         String[] oList = order.split(ENTRY_SEP);
 
-        List<Color> listColors = new ArrayList<Color>();
+        List<Color> listColors = new ArrayList<>();
         for (String key : oList) {
             String trimmed = key.trim();
             String property = p.getProperty(trimmed);

Modified: jmeter/trunk/src/core/org/apache/jmeter/JMeter.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/JMeter.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/JMeter.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/JMeter.java Sun Aug 23 10:39:36 2015
@@ -756,7 +756,8 @@ public class JMeter implements JMeterPlu
             treeModel.addSubTree(tree, root);
 
             // Hack to resolve ModuleControllers in non GUI mode
-            SearchByClass<ReplaceableController> replaceableControllers = new SearchByClass<ReplaceableController>(ReplaceableController.class);
+            SearchByClass<ReplaceableController> replaceableControllers =
+                    new SearchByClass<>(ReplaceableController.class);
             tree.traverse(replaceableControllers);
             Collection<ReplaceableController> replaceableControllersRes = replaceableControllers.getSearchResults();
             for (Iterator<ReplaceableController> iter = replaceableControllersRes.iterator(); iter.hasNext();) {
@@ -792,7 +793,7 @@ public class JMeter implements JMeterPlu
             // when NON GUI mode is used
             tree.add(tree.getArray()[0], new RemoteThreadsListenerTestElement());
 
-            List<JMeterEngine> engines = new LinkedList<JMeterEngine>();
+            List<JMeterEngine> engines = new LinkedList<>();
             tree.add(tree.getArray()[0], new ListenToTest(parent, (remoteStart && remoteStop) ? engines : null));
             println("Created the tree successfully using "+testFile);
             if (!remoteStart) {
@@ -804,7 +805,7 @@ public class JMeter implements JMeterPlu
                 engines.add(engine);
             } else {
                 java.util.StringTokenizer st = new java.util.StringTokenizer(remote_hosts_string, ",");//$NON-NLS-1$
-                List<String> hosts = new LinkedList<String>();
+                List<String> hosts = new LinkedList<>();
                 while (st.hasMoreElements()) {
                     hosts.add((String) st.nextElement());
                 }
@@ -829,7 +830,7 @@ public class JMeter implements JMeterPlu
      * @param tree The {@link HashTree} to convert
      */
     public static void convertSubTree(HashTree tree) {
-        LinkedList<Object> copyList = new LinkedList<Object>(tree.list());
+        LinkedList<Object> copyList = new LinkedList<>(tree.list());
         for (Object o  : copyList) {
             if (o instanceof TestElement) {
                 TestElement item = (TestElement) o;

Modified: jmeter/trunk/src/core/org/apache/jmeter/NewDriver.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/NewDriver.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/NewDriver.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/NewDriver.java Sun Aug 23 10:39:36 2015
@@ -52,7 +52,7 @@ public final class NewDriver {
     private static final String jmDir;
 
     static {
-        final List<URL> jars = new LinkedList<URL>();
+        final List<URL> jars = new LinkedList<>();
         final String initial_classpath = System.getProperty(JAVA_CLASS_PATH);
 
         // Find JMeter home dir from the initial classpath

Modified: jmeter/trunk/src/core/org/apache/jmeter/config/Arguments.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/config/Arguments.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/config/Arguments.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/config/Arguments.java Sun Aug 23 10:39:36 2015
@@ -81,7 +81,7 @@ public class Arguments extends ConfigTes
      */
     public Map<String, String> getArgumentsAsMap() {
         PropertyIterator iter = getArguments().iterator();
-        Map<String, String> argMap = new LinkedHashMap<String, String>();
+        Map<String, String> argMap = new LinkedHashMap<>();
         while (iter.hasNext()) {
             Argument arg = (Argument) iter.next().getObjectValue();
             // Because CollectionProperty.mergeIn will not prevent adding two

Modified: jmeter/trunk/src/core/org/apache/jmeter/control/GenericController.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/control/GenericController.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/control/GenericController.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/control/GenericController.java Sun Aug 23 10:39:36 2015
@@ -54,8 +54,7 @@ public class GenericController extends A
 
     private static final Logger log = LoggingManager.getLoggerForClass();
 
-    private transient LinkedList<LoopIterationListener> iterationListeners =
-        new LinkedList<LoopIterationListener>();
+    private transient LinkedList<LoopIterationListener> iterationListeners = new LinkedList<>();
 
     // Only create the map if it is required
     private transient ConcurrentMap<TestElement, Object> children = 
@@ -64,8 +63,7 @@ public class GenericController extends A
     private static final Object DUMMY = new Object();
 
     // May be replaced by RandomOrderController
-    protected transient List<TestElement> subControllersAndSamplers =
-        new ArrayList<TestElement>();
+    protected transient List<TestElement> subControllersAndSamplers = new ArrayList<>();
 
     /**
      * Index of current sub controller or sampler
@@ -422,13 +420,9 @@ public class GenericController extends A
     }
     
     protected Object readResolve(){
-        iterationListeners =
-                new LinkedList<LoopIterationListener>();
-        children = 
-                TestCompiler.IS_USE_STATIC_SET ? null : new ConcurrentHashMap<TestElement, Object>();
-        
-        subControllersAndSamplers =
-                new ArrayList<TestElement>();
+        iterationListeners = new LinkedList<>();
+        children = TestCompiler.IS_USE_STATIC_SET ? null : new ConcurrentHashMap<TestElement, Object>();
+        subControllersAndSamplers = new ArrayList<>();
 
         return this;
     }

Modified: jmeter/trunk/src/core/org/apache/jmeter/control/TransactionSampler.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/control/TransactionSampler.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/control/TransactionSampler.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/control/TransactionSampler.java Sun Aug 23 10:39:36 2015
@@ -41,7 +41,7 @@ import org.apache.jmeter.testelement.Tes
 public class TransactionSampler extends AbstractSampler {
     private static final long serialVersionUID = 240L;
 
-    private static final Set<String> APPLIABLE_CONFIG_CLASSES = new HashSet<String>(
+    private static final Set<String> APPLIABLE_CONFIG_CLASSES = new HashSet<>(
             Arrays.asList(new String[]{
                     "org.apache.jmeter.config.gui.SimpleConfigGui"}));
 

Modified: jmeter/trunk/src/core/org/apache/jmeter/engine/DistributedRunner.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/engine/DistributedRunner.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/engine/DistributedRunner.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/engine/DistributedRunner.java Sun Aug 23 10:39:36 2015
@@ -57,7 +57,7 @@ public class DistributedRunner {
     private final int retriesNumber;
     private PrintStream stdout = new PrintStream(new SilentOutputStream());
     private PrintStream stderr = new PrintStream(new SilentOutputStream());
-    private final Map<String, JMeterEngine> engines = new HashMap<String, JMeterEngine>();
+    private final Map<String, JMeterEngine> engines = new HashMap<>();
 
 
     public DistributedRunner() {
@@ -73,7 +73,7 @@ public class DistributedRunner {
 
     public void init(List<String> addresses, HashTree tree) {
         // converting list into mutable version
-        List<String> addrs = new LinkedList<String>(addresses);
+        List<String> addrs = new LinkedList<>(addresses);
 
         for (int tryNo = 0; tryNo < retriesNumber; tryNo++) {
             if (tryNo > 0) {
@@ -144,7 +144,7 @@ public class DistributedRunner {
      * Start all engines that were previously initiated
      */
     public void start() {
-        List<String> addresses = new LinkedList<String>();
+        List<String> addresses = new LinkedList<>();
         addresses.addAll(engines.keySet());
         start(addresses);
     }
@@ -169,7 +169,7 @@ public class DistributedRunner {
      * Stop all engines that were previously initiated
      */
     public void stop() {
-        List<String> addresses = new LinkedList<String>();
+        List<String> addresses = new LinkedList<>();
         addresses.addAll(engines.keySet());
         stop(addresses);
     }

Modified: jmeter/trunk/src/core/org/apache/jmeter/engine/StandardJMeterEngine.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/engine/StandardJMeterEngine.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/engine/StandardJMeterEngine.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/engine/StandardJMeterEngine.java Sun Aug 23 10:39:36 2015
@@ -80,7 +80,7 @@ public class StandardJMeterEngine implem
      * Only used by the function parser so far.
      * The list is merged with the testListeners and then cleared.
      */
-    private static final List<TestStateListener> testList = new ArrayList<TestStateListener>();
+    private static final List<TestStateListener> testList = new ArrayList<>();
 
     /** Whether to call System.exit(0) in exit after stopping RMI */
     private static final boolean REMOTE_SYSTEM_EXIT = JMeterUtils.getPropDefault("jmeterengine.remote.system.exit", false);
@@ -111,7 +111,7 @@ public class StandardJMeterEngine implem
     private final String host;
 
     // The list of current thread groups; may be setUp, main, or tearDown.
-    private final List<AbstractThreadGroup> groups = new CopyOnWriteArrayList<AbstractThreadGroup>();
+    private final List<AbstractThreadGroup> groups = new CopyOnWriteArrayList<>();
 
     public static void stopEngineNow() {
         if (engine != null) {// May be null if called from Unit test
@@ -164,7 +164,7 @@ public class StandardJMeterEngine implem
     @Override
     public void configure(HashTree testTree) {
         // Is testplan serialised?
-        SearchByClass<TestPlan> testPlan = new SearchByClass<TestPlan>(TestPlan.class);
+        SearchByClass<TestPlan> testPlan = new SearchByClass<>(TestPlan.class);
         testTree.traverse(testPlan);
         Object[] plan = testPlan.getSearchResults().toArray();
         if (plan.length == 0) {
@@ -323,7 +323,7 @@ public class StandardJMeterEngine implem
          * Notification of test listeners needs to happen after function
          * replacement, but before setting RunningVersion to true.
          */
-        SearchByClass<TestStateListener> testListeners = new SearchByClass<TestStateListener>(TestStateListener.class); // TL - S&E
+        SearchByClass<TestStateListener> testListeners = new SearchByClass<>(TestStateListener.class); // TL - S&E
         test.traverse(testListeners);
 
         // Merge in any additional test listeners
@@ -338,9 +338,9 @@ public class StandardJMeterEngine implem
         List<?> testLevelElements = new LinkedList<Object>(test.list(test.getArray()[0]));
         removeThreadGroups(testLevelElements);
 
-        SearchByClass<SetupThreadGroup> setupSearcher = new SearchByClass<SetupThreadGroup>(SetupThreadGroup.class);
-        SearchByClass<AbstractThreadGroup> searcher = new SearchByClass<AbstractThreadGroup>(AbstractThreadGroup.class);
-        SearchByClass<PostThreadGroup> postSearcher = new SearchByClass<PostThreadGroup>(PostThreadGroup.class);
+        SearchByClass<SetupThreadGroup> setupSearcher = new SearchByClass<>(SetupThreadGroup.class);
+        SearchByClass<AbstractThreadGroup> searcher = new SearchByClass<>(AbstractThreadGroup.class);
+        SearchByClass<PostThreadGroup> postSearcher = new SearchByClass<>(PostThreadGroup.class);
 
         test.traverse(setupSearcher);
         test.traverse(searcher);

Modified: jmeter/trunk/src/core/org/apache/jmeter/engine/TreeCloner.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/engine/TreeCloner.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/engine/TreeCloner.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/engine/TreeCloner.java Sun Aug 23 10:39:36 2015
@@ -33,7 +33,7 @@ public class TreeCloner implements HashT
 
     private final ListedHashTree newTree;
 
-    private final LinkedList<Object> objects = new LinkedList<Object>();
+    private final LinkedList<Object> objects = new LinkedList<>();
 
     private final boolean honourNoThreadClone;
 

Modified: jmeter/trunk/src/core/org/apache/jmeter/engine/util/CompoundVariable.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/engine/util/CompoundVariable.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/engine/util/CompoundVariable.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/engine/util/CompoundVariable.java Sun Aug 23 10:39:36 2015
@@ -48,14 +48,13 @@ public class CompoundVariable implements
     private static final FunctionParser functionParser = new FunctionParser();
 
     // Created during class init; not modified thereafter 
-    private static final Map<String, Class<? extends Function>> functions =
-        new HashMap<String, Class<? extends Function>>();
+    private static final Map<String, Class<? extends Function>> functions = new HashMap<>();
 
     private boolean hasFunction, isDynamic;
 
     private String permanentResults;
 
-    private LinkedList<Object> compiledComponents = new LinkedList<Object>();
+    private LinkedList<Object> compiledComponents = new LinkedList<>();
 
     static {
         try {
@@ -171,7 +170,7 @@ public class CompoundVariable implements
     /** {@inheritDoc} */
     @Override
     public List<String> getArgumentDesc() {
-        return new LinkedList<String>();
+        return new LinkedList<>();
     }
 
     public void clear() {

Modified: jmeter/trunk/src/core/org/apache/jmeter/engine/util/FunctionParser.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/engine/util/FunctionParser.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/engine/util/FunctionParser.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/engine/util/FunctionParser.java Sun Aug 23 10:39:36 2015
@@ -55,7 +55,7 @@ class FunctionParser {
      */
     LinkedList<Object> compileString(String value) throws InvalidVariableException {
         StringReader reader = new StringReader(value);
-        LinkedList<Object> result = new LinkedList<Object>();
+        LinkedList<Object> result = new LinkedList<>();
         StringBuilder buffer = new StringBuilder();
         char previous = ' '; // TODO - why use space?
         char[] current = new char[1];
@@ -183,7 +183,7 @@ class FunctionParser {
      * @throws InvalidVariableException when evaluation of variables fail
      */
     LinkedList<CompoundVariable> parseParams(StringReader reader) throws InvalidVariableException {
-        LinkedList<CompoundVariable> result = new LinkedList<CompoundVariable>();
+        LinkedList<CompoundVariable> result = new LinkedList<>();
         StringBuilder buffer = new StringBuilder();
         char[] current = new char[1];
         char previous = ' ';

Modified: jmeter/trunk/src/core/org/apache/jmeter/engine/util/ValueReplacer.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/engine/util/ValueReplacer.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/engine/util/ValueReplacer.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/engine/util/ValueReplacer.java Sun Aug 23 10:39:36 2015
@@ -43,7 +43,7 @@ public class ValueReplacer {
 
     private final CompoundVariable masterFunction = new CompoundVariable();
 
-    private Map<String, String> variables = new HashMap<String, String>();
+    private Map<String, String> variables = new HashMap<>();
 
     public ValueReplacer() {
     }
@@ -157,7 +157,7 @@ public class ValueReplacer {
      * @throws InvalidVariableException when <code>transform</code> throws an {@link InvalidVariableException} while transforming a value
      */
     private Collection<JMeterProperty> replaceValues(PropertyIterator iter, ValueTransformer transform) throws InvalidVariableException {
-        List<JMeterProperty> props = new LinkedList<JMeterProperty>();
+        List<JMeterProperty> props = new LinkedList<>();
         while (iter.hasNext()) {
             JMeterProperty val = iter.next();
             if (log.isDebugEnabled()) {

Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/GUIFactory.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/GUIFactory.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/GUIFactory.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/GUIFactory.java Sun Aug 23 10:39:36 2015
@@ -32,13 +32,13 @@ import org.apache.jmeter.testbeans.gui.T
  */
 public final class GUIFactory {
     /** A Map from String to JMeterGUIComponent of registered GUI classes. */
-    private static final Map<String, JMeterGUIComponent> GUI_MAP = new HashMap<String, JMeterGUIComponent>();
+    private static final Map<String, JMeterGUIComponent> GUI_MAP = new HashMap<>();
 
     /** A Map from String to ImageIcon of registered icons. */
-    private static final Map<String, ImageIcon> ICON_MAP = new HashMap<String, ImageIcon>();
+    private static final Map<String, ImageIcon> ICON_MAP = new HashMap<>();
 
     /** A Map from String to ImageIcon of registered icons. */
-    private static final Map<String, ImageIcon> DISABLED_ICON_MAP = new HashMap<String, ImageIcon>();
+    private static final Map<String, ImageIcon> DISABLED_ICON_MAP = new HashMap<>();
 
     /**
      * Prevent instantiation since this is a static utility class.



Mime
View raw message