Author: sebb Date: Mon Mar 9 23:16:06 2009 New Revision: 751908 URL: http://svn.apache.org/viewvc?rev=751908&view=rev Log: Fix some Eclipse warnings
Modified: jakarta/jmeter/trunk/src/reports/org/apache/jmeter/JMeterReport.java jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/engine/ValueReplacer.java Modified: jakarta/jmeter/trunk/src/reports/org/apache/jmeter/JMeterReport.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/reports/org/apache/jmeter/JMeterReport.java?rev=751908&r1=751907&r2=751908&view=diff ============================================================================== --- jakarta/jmeter/trunk/src/reports/org/apache/jmeter/JMeterReport.java (original) +++ jakarta/jmeter/trunk/src/reports/org/apache/jmeter/JMeterReport.java Mon Mar 9 23:16:06 2009 @@ -38,21 +38,18 @@ import org.apache.jmeter.gui.ReportGuiPackage; import org.apache.jmeter.plugin.JMeterPlugin; import org.apache.jmeter.plugin.PluginManager; -import org.apache.jmeter.samplers.Remoteable; -import org.apache.jmeter.save.SaveService; -import org.apache.jmeter.services.FileServer; -import org.apache.jmeter.testelement.TestElement; -import org.apache.jmeter.testelement.TestListener; -import org.apache.jmeter.testelement.ReportPlan; import org.apache.jmeter.report.gui.ReportPageGui; -import org.apache.jmeter.report.gui.action.ReportLoad; import org.apache.jmeter.report.gui.action.ReportActionRouter; import org.apache.jmeter.report.gui.action.ReportCheckDirty; +import org.apache.jmeter.report.gui.action.ReportLoad; import org.apache.jmeter.report.gui.tree.ReportTreeListener; import org.apache.jmeter.report.gui.tree.ReportTreeModel; import org.apache.jmeter.report.writers.gui.HTMLReportWriterGui; -import org.apache.jmeter.reporters.ResultCollector; -import org.apache.jmeter.reporters.Summariser; +import org.apache.jmeter.samplers.Remoteable; +import org.apache.jmeter.save.SaveService; +import org.apache.jmeter.testelement.ReportPlan; +import org.apache.jmeter.testelement.TestElement; +import org.apache.jmeter.testelement.TestListener; import org.apache.jmeter.util.JMeterUtils; import org.apache.jmeter.visualizers.gui.AbstractListenerGui; import org.apache.jorphan.collections.HashTree; @@ -240,75 +237,75 @@ } } - private void run(String testFile, String logFile, boolean remoteStart) { - FileInputStream reader = null; - try { - File f = new File(testFile); - if (!f.exists() || !f.isFile()) { - System.out.println("Could not open " + testFile); - return; - } - FileServer.getFileServer().setBasedir(f.getAbsolutePath()); - - reader = new FileInputStream(f); - log.info("Loading file: " + f); - - HashTree tree = SaveService.loadTree(reader); - - // Remove the disabled items - // For GUI runs this is done in Start.java - convertSubTree(tree); - - if (logFile != null) { - ResultCollector logger = new ResultCollector(); - logger.setFilename(logFile); - tree.add(tree.getArray()[0], logger); - } - String summariserName = JMeterUtils.getPropDefault( - "summariser.name", "");//$NON-NLS-1$ - if (summariserName.length() > 0) { - log.info("Creating summariser <" + summariserName + ">"); - System.out.println("Creating summariser <" + summariserName + ">"); - Summariser summer = new Summariser(summariserName); - tree.add(tree.getArray()[0], summer); - } - tree.add(tree.getArray()[0], new ListenToTest(parent)); - System.out.println("Created the tree successfully"); - /** - JMeterEngine engine = null; - if (!remoteStart) { - engine = new StandardJMeterEngine(); - engine.configure(tree); - System.out.println("Starting the test"); - engine.runTest(); - } else { - String remote_hosts_string = JMeterUtils.getPropDefault( - "remote_hosts", "127.0.0.1"); - java.util.StringTokenizer st = new java.util.StringTokenizer( - remote_hosts_string, ","); - List engines = new LinkedList(); - while (st.hasMoreElements()) { - String el = (String) st.nextElement(); - System.out.println("Configuring remote engine for " + el); - // engines.add(doRemoteInit(el.trim(), tree)); - } - System.out.println("Starting remote engines"); - Iterator iter = engines.iterator(); - while (iter.hasNext()) { - engine = (JMeterEngine) iter.next(); - engine.runTest(); - } - System.out.println("Remote engines have been started"); - } - **/ - } catch (Exception e) { - System.out.println("Error in NonGUIDriver " + e.toString()); - log.error("", e); - } - finally{ - JOrphanUtils.closeQuietly(reader); - } - } +// private void run(String testFile, String logFile, boolean remoteStart) { +// FileInputStream reader = null; +// try { +// File f = new File(testFile); +// if (!f.exists() || !f.isFile()) { +// System.out.println("Could not open " + testFile); +// return; +// } +// FileServer.getFileServer().setBasedir(f.getAbsolutePath()); +// +// reader = new FileInputStream(f); +// log.info("Loading file: " + f); +// +// HashTree tree = SaveService.loadTree(reader); +// +// // Remove the disabled items +// // For GUI runs this is done in Start.java +// convertSubTree(tree); +// +// if (logFile != null) { +// ResultCollector logger = new ResultCollector(); +// logger.setFilename(logFile); +// tree.add(tree.getArray()[0], logger); +// } +// String summariserName = JMeterUtils.getPropDefault( +// "summariser.name", "");//$NON-NLS-1$ +// if (summariserName.length() > 0) { +// log.info("Creating summariser <" + summariserName + ">"); +// System.out.println("Creating summariser <" + summariserName + ">"); +// Summariser summer = new Summariser(summariserName); +// tree.add(tree.getArray()[0], summer); +// } +// tree.add(tree.getArray()[0], new ListenToTest(parent)); +// System.out.println("Created the tree successfully"); +// /** +// JMeterEngine engine = null; +// if (!remoteStart) { +// engine = new StandardJMeterEngine(); +// engine.configure(tree); +// System.out.println("Starting the test"); +// engine.runTest(); +// } else { +// String remote_hosts_string = JMeterUtils.getPropDefault( +// "remote_hosts", "127.0.0.1"); +// java.util.StringTokenizer st = new java.util.StringTokenizer( +// remote_hosts_string, ","); +// List engines = new LinkedList(); +// while (st.hasMoreElements()) { +// String el = (String) st.nextElement(); +// System.out.println("Configuring remote engine for " + el); +// // engines.add(doRemoteInit(el.trim(), tree)); +// } +// System.out.println("Starting remote engines"); +// Iterator iter = engines.iterator(); +// while (iter.hasNext()) { +// engine = (JMeterEngine) iter.next(); +// engine.runTest(); +// } +// System.out.println("Remote engines have been started"); +// } +// **/ +// } catch (Exception e) { +// System.out.println("Error in NonGUIDriver " + e.toString()); +// log.error("", e); +// } +// finally{ +// JOrphanUtils.closeQuietly(reader); +// } +// } /** Modified: jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/engine/ValueReplacer.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/engine/ValueReplacer.java?rev=751908&r1=751907&r2=751908&view=diff ============================================================================== --- jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/engine/ValueReplacer.java (original) +++ jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/engine/ValueReplacer.java Mon Mar 9 23:16:06 2009 @@ -18,18 +18,12 @@ package org.apache.jmeter.report.engine; -import java.util.Collection; import java.util.HashMap; -import java.util.Iterator; import java.util.Map; - import org.apache.jmeter.functions.InvalidVariableException; import org.apache.jmeter.testelement.ReportPlan; import org.apache.jmeter.testelement.TestElement; -import org.apache.jmeter.testelement.property.JMeterProperty; -//import org.apache.jorphan.logging.LoggingManager; -//import org.apache.log.Logger; public class ValueReplacer { // private static final Logger log = LoggingManager.getLoggerForClass(); @@ -47,6 +41,9 @@ this.variables = variables; } + /** + * @throws InvalidVariableException not thrown currently + */ public void replaceValues(TestElement el) throws InvalidVariableException { /** Collection newProps = replaceValues(el.propertyIterator(), new ReplaceStringWithFunctions(masterFunction, @@ -55,14 +52,17 @@ **/ } - private void setProperties(TestElement el, Collection newProps) { - Iterator iter = newProps.iterator(); - el.clear(); - while (iter.hasNext()) { - el.setProperty((JMeterProperty) iter.next()); - } - } +// private void setProperties(TestElement el, Collection newProps) { +// Iterator iter = newProps.iterator(); +// el.clear(); +// while (iter.hasNext()) { +// el.setProperty((JMeterProperty) iter.next()); +// } +// } + /** + * @throws InvalidVariableException not thrown currently + */ public void reverseReplace(TestElement el) throws InvalidVariableException { /** Collection newProps = replaceValues(el.propertyIterator(), new ReplaceFunctionsWithStrings(masterFunction, @@ -71,6 +71,9 @@ **/ } + /** + * @throws InvalidVariableException not thrown currently + */ public void reverseReplace(TestElement el, boolean regexMatch) throws InvalidVariableException { /** Collection newProps = replaceValues(el.propertyIterator(), new ReplaceFunctionsWithStrings(masterFunction, @@ -79,6 +82,9 @@ **/ } + /** + * @throws InvalidVariableException not thrown currently + */ public void undoReverseReplace(TestElement el) throws InvalidVariableException { /** Collection newProps = replaceValues(el.propertyIterator(), new UndoVariableReplacement(masterFunction, --------------------------------------------------------------------- To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org