svn commit: r804452 - in /jakarta/jmeter/trunk/src: components/org/apache/jmeter/control/ core/org/apache/jmeter/ core/org/apache/jmeter/config/ core/org/apache/jmeter/control/ core/org/apache/jmeter/
Author: sebb
Date: Sat Aug 15 10:45:00 2009
New Revision: 804452
URL: http://svn.apache.org/viewvc?rev=804452view=rev
Log:
Fix up some raw types
Modified:
jakarta/jmeter/trunk/src/components/org/apache/jmeter/control/ModuleController.java
jakarta/jmeter/trunk/src/components/org/apache/jmeter/control/RandomOrderController.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/JMeter.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/NewDriver.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/config/Arguments.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/control/GenericController.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/util/FunctionParser.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/util/ValueReplacer.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/GUIFactory.java
jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/collections/Data.java
Modified:
jakarta/jmeter/trunk/src/components/org/apache/jmeter/control/ModuleController.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/control/ModuleController.java?rev=804452r1=804451r2=804452view=diff
==
---
jakarta/jmeter/trunk/src/components/org/apache/jmeter/control/ModuleController.java
(original)
+++
jakarta/jmeter/trunk/src/components/org/apache/jmeter/control/ModuleController.java
Sat Aug 15 10:45:00 2009
@@ -98,7 +98,7 @@
}
private void setNodePath() {
-List nodePath = new ArrayList();
+ListString nodePath = new ArrayListString();
if (selectedNode != null) {
TreeNode[] path = selectedNode.getPath();
for (int i = 0; i path.length; i++) {
Modified:
jakarta/jmeter/trunk/src/components/org/apache/jmeter/control/RandomOrderController.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/control/RandomOrderController.java?rev=804452r1=804451r2=804452view=diff
==
---
jakarta/jmeter/trunk/src/components/org/apache/jmeter/control/RandomOrderController.java
(original)
+++
jakarta/jmeter/trunk/src/components/org/apache/jmeter/control/RandomOrderController.java
Sat Aug 15 10:45:00 2009
@@ -21,6 +21,8 @@
import java.util.Iterator;
import java.util.List;
+import org.apache.jmeter.testelement.TestElement;
+
/**
* A controller that runs its children each at most once, but in a random
order.
*
@@ -57,13 +59,13 @@
int numElements = this.subControllersAndSamplers.size();
// Create a new list containing numElements null elements.
-List reordered = new ArrayList(this.subControllersAndSamplers.size());
+ListTestElement reordered = new
ArrayListTestElement(this.subControllersAndSamplers.size());
for (int i = 0; i numElements; i++) {
reordered.add(null);
}
// Insert the subControllersAndSamplers into random list positions.
-for (Iterator i = this.subControllersAndSamplers.iterator();
i.hasNext();) {
+for (IteratorTestElement i =
this.subControllersAndSamplers.iterator(); i.hasNext();) {
int idx = (int) Math.floor(Math.random() * reordered.size());
while (true) {
if (idx == numElements) {
Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/JMeter.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/JMeter.java?rev=804452r1=804451r2=804452view=diff
==
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/JMeter.java (original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/JMeter.java Sat Aug 15
10:45:00 2009
@@ -547,11 +547,11 @@
// Process command line property definitions
// These can potentially occur multiple times
-List clOptions = parser.getArguments();
+ListCLOption clOptions = parser.getArguments();
int size = clOptions.size();
for (int i = 0; i size; i++) {
-CLOption option = (CLOption) clOptions.get(i);
+CLOption option = clOptions.get(i);
String name = option.getArgument(0);
String value = option.getArgument(1);
FileInputStream fis = null;
@@ -756,7 +756,7 @@
}
}
-List engines = new LinkedList();
+ListJMeterEngine engines = new LinkedListJMeterEngine();
tree.add(tree.getArray()[0], new ListenToTest(parent, (remoteStart
remoteStop) ? engines : null));
println(Created the tree successfully using +testFile);
JMeterEngine engine = null;
@@ -777,9 +777,9 @@
println(Starting remote engines);
long now=System.currentTimeMillis();
svn commit: r804456 - /jakarta/jmeter/trunk/src/junit/org/apache/jmeter/protocol/java/control/gui/JUnitTestSamplerGui.java
Author: sebb
Date: Sat Aug 15 11:52:48 2009
New Revision: 804456
URL: http://svn.apache.org/viewvc?rev=804456view=rev
Log:
Fix types.
Fix bug where input array was used for methods and strings
Modified:
jakarta/jmeter/trunk/src/junit/org/apache/jmeter/protocol/java/control/gui/JUnitTestSamplerGui.java
Modified:
jakarta/jmeter/trunk/src/junit/org/apache/jmeter/protocol/java/control/gui/JUnitTestSamplerGui.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/junit/org/apache/jmeter/protocol/java/control/gui/JUnitTestSamplerGui.java?rev=804456r1=804455r2=804456view=diff
==
---
jakarta/jmeter/trunk/src/junit/org/apache/jmeter/protocol/java/control/gui/JUnitTestSamplerGui.java
(original)
+++
jakarta/jmeter/trunk/src/junit/org/apache/jmeter/protocol/java/control/gui/JUnitTestSamplerGui.java
Sat Aug 15 11:52:48 2009
@@ -24,6 +24,7 @@
import java.io.File;
import java.io.IOException;
import java.lang.reflect.Method;
+import java.util.ArrayList;
import java.util.List;
import javax.swing.JCheckBox;
@@ -131,10 +132,10 @@
private JComboBox classnameCombo;
private JComboBox methodName;
private transient TestCase TESTCLASS = null;
-private List METHODLIST = null;
+private ListString METHODLIST = null;
private transient ClassFilter FILTER = new ClassFilter();
-private List CLASSLIST = null;
+private ListString CLASSLIST = null;
/**
* Constructor for JUnitTestSamplerGui
@@ -166,7 +167,7 @@
private JPanel createClassPanel()
{
-METHODLIST = new java.util.ArrayList();
+METHODLIST = new ArrayListString();
try
{
@@ -346,7 +347,7 @@
public void configureMethodCombo(){
if (TESTCLASS != null) {
clearMethodCombo();
-String [] names = getMethodNames(getMethods(TESTCLASS,METHODLIST));
+String [] names = getMethodNames(getMethods(TESTCLASS));
for (int idx=0; idx names.length; idx++){
methodName.addItem(names[idx]);
METHODLIST.add(names[idx]);
@@ -360,9 +361,10 @@
METHODLIST.clear();
}
-public Method[] getMethods(Object obj, List list)
+public Method[] getMethods(Object obj)
{
Method[] meths = obj.getClass().getMethods();
+ListMethod list = new ArrayListMethod();
for (int idx=0; idx meths.length; idx++){
if (meths[idx].getName().startsWith(PREFIX) ||
meths[idx].getName().equals(ONETIMESETUP) ||
@@ -373,7 +375,7 @@
}
if (list.size() 0){
Method[] rmeth = new Method[list.size()];
-return (Method[])list.toArray(rmeth);
+return list.toArray(rmeth);
}
return new Method[0];
}
@@ -387,9 +389,9 @@
return names;
}
-public Class[] filterClasses(Class[] clz) {
+public Class?[] filterClasses(Class?[] clz) {
if (clz != null clz.length 0){
-Class[] nclz = null;
+Class?[] nclz = null;
return nclz;
}
return clz;
-
To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org
svn commit: r804508 - /jakarta/jmeter/trunk/test/src/org/apache/jorphan/math/TestStatCalculator.java
Author: sebb
Date: Sat Aug 15 18:20:43 2009
New Revision: 804508
URL: http://svn.apache.org/viewvc?rev=804508view=rev
Log:
Add more StatCalculator tests
Modified:
jakarta/jmeter/trunk/test/src/org/apache/jorphan/math/TestStatCalculator.java
Modified:
jakarta/jmeter/trunk/test/src/org/apache/jorphan/math/TestStatCalculator.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/test/src/org/apache/jorphan/math/TestStatCalculator.java?rev=804508r1=804507r2=804508view=diff
==
---
jakarta/jmeter/trunk/test/src/org/apache/jorphan/math/TestStatCalculator.java
(original)
+++
jakarta/jmeter/trunk/test/src/org/apache/jorphan/math/TestStatCalculator.java
Sat Aug 15 18:20:43 2009
@@ -74,4 +74,18 @@
assertEquals(3, calc.getMin().intValue());
assertEquals(15, calc.getMedian().intValue());
}
+public void testLong(){
+calc.addValue(0L);
+calc.addValue(2L);
+assertEquals(Long.valueOf(2),calc.getMax());
+assertEquals(Long.valueOf(0),calc.getMin());
+calc.getDistribution();
+}
+public void testInteger(){
+calc.addValue(0);
+calc.addValue(2);
+assertEquals(Integer.valueOf(2),calc.getMax());
+assertEquals(Integer.valueOf(0),calc.getMin());
+//calc.getDistribution(); // currently fails with ClassCastException
+}
}
-
To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org
svn commit: r804509 - in /jakarta/jmeter/trunk/src: core/org/apache/jmeter/gui/util/ core/org/apache/jmeter/samplers/ core/org/apache/jmeter/threads/ core/org/apache/jmeter/util/ jorphan/org/apache/jo
Author: sebb
Date: Sat Aug 15 18:21:26 2009
New Revision: 804509
URL: http://svn.apache.org/viewvc?rev=804509view=rev
Log:
Fix up some raw types
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/util/FileListPanel.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/util/FilePanel.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/samplers/Entry.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/threads/TestCompiler.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/BSFBeanInfoSupport.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/BeanShellBeanInfoSupport.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/BeanShellInterpreter.java
jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/math/StatCalculator.java
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSampler.java
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HttpClientDefaultParameters.java
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/WebServiceSampler.java
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/DOMPool.java
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/util/FileListPanel.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/util/FileListPanel.java?rev=804509r1=804508r2=804509view=diff
==
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/util/FileListPanel.java
(original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/util/FileListPanel.java
Sat Aug 15 18:21:26 2009
@@ -62,7 +62,7 @@
private JButton delete = new JButton(JMeterUtils.getResString(delete));
// $NON-NLS-1$
-private List listeners = new LinkedList();
+private ListChangeListener listeners = new LinkedListChangeListener();
private String title;
@@ -181,9 +181,9 @@
}
private void fireFileChanged() {
-Iterator iter = listeners.iterator();
+IteratorChangeListener iter = listeners.iterator();
while (iter.hasNext()) {
-((ChangeListener) iter.next()).stateChanged(new ChangeEvent(this));
+iter.next().stateChanged(new ChangeEvent(this));
}
}
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/util/FilePanel.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/util/FilePanel.java?rev=804509r1=804508r2=804509view=diff
==
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/util/FilePanel.java
(original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/util/FilePanel.java Sat
Aug 15 18:21:26 2009
@@ -39,44 +39,42 @@
* author Michael Stover Created April 18, 2002
*/
public class FilePanel extends HorizontalPanel implements ActionListener {
-JTextField filename = new JTextField(20);
+private final JTextField filename = new JTextField(20);
-JLabel label = new
JLabel(JMeterUtils.getResString(file_visualizer_filename)); //$NON-NLS-1$
+private final JLabel label = new
JLabel(JMeterUtils.getResString(file_visualizer_filename)); //$NON-NLS-1$
-JButton browse = new JButton(JMeterUtils.getResString(browse));
//$NON-NLS-1$
+private final JButton browse = new
JButton(JMeterUtils.getResString(browse)); //$NON-NLS-1$
private static final String ACTION_BROWSE = browse; //$NON-NLS-1$
-List listeners = new LinkedList();
+private final ListChangeListener listeners = new
LinkedListChangeListener();
-String title;
+private final String title;
-String filetype;
+private final String filetype;
/**
* Constructor for the FilePanel object.
*/
public FilePanel() {
-title = ; //$NON-NLS-1$
-init();
+this(, null);
}
public FilePanel(String title) {
-this.title = title;
-init();
+this(title, null);
}
public FilePanel(String title, String filetype) {
-this(title);
+this.title = title;
this.filetype = filetype;
+init();
}
/**
* Constructor for the FilePanel object.
*/
public FilePanel(ChangeListener l, String title) {
-this.title = title;
-init();
+this(title, null);
listeners.add(l);
}
@@ -131,9 +129,9 @@
}
private void fireFileChanged() {
-Iterator iter = listeners.iterator();
+IteratorChangeListener iter = listeners.iterator();
while (iter.hasNext()) {
-((ChangeListener) iter.next()).stateChanged(new ChangeEvent(this));
+iter.next().stateChanged(new ChangeEvent(this));
}
}
Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/samplers/Entry.java
URL:
svn commit: r804518 - in /jakarta/jmeter/trunk: src/core/org/apache/jmeter/engine/ src/core/org/apache/jmeter/gui/util/ src/jorphan/org/apache/jorphan/gui/ src/junit/org/apache/jmeter/protocol/java/sa
Author: sebb
Date: Sat Aug 15 19:22:55 2009
New Revision: 804518
URL: http://svn.apache.org/viewvc?rev=804518view=rev
Log:
Fix up some raw types
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/PreCompiler.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/util/JLabeledRadioI18N.java
jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/gui/JLabeledField.java
jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/gui/JLabeledTextArea.java
jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/gui/JLabeledTextField.java
jakarta/jmeter/trunk/src/junit/org/apache/jmeter/protocol/java/sampler/JUnitSampler.java
jakarta/jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/parser/MonitorHandler.java
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/AuthManager.java
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/CookieManager.java
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/HeaderManager.java
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/HTTPArgument.java
jakarta/jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/sampler/JavaSamplerContext.java
jakarta/jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/test/JavaTest.java
jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/client/ConnectionFactory.java
jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/client/InitialContextFactory.java
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/JMeterReport.java
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/gui/util/ReportFilePanel.java
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/tree/ReportTreeNode.java
jakarta/jmeter/trunk/test/src/org/apache/jmeter/engine/util/TestValueReplacer.java
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/PreCompiler.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/PreCompiler.java?rev=804518r1=804517r2=804518view=diff
==
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/PreCompiler.java
(original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/PreCompiler.java Sat
Aug 15 19:22:55 2009
@@ -58,11 +58,7 @@
isRemote = remote;
}
-/*
- * (non-Javadoc)
- *
- * @see HashTreeTraverser#addNode(Object, HashTree)
- */
+/** {...@inheritdoc} */
public void addNode(Object node, HashTree subTree) {
if(isRemote node instanceof ResultCollector)
{
@@ -85,7 +81,7 @@
}
if (node instanceof TestPlan) {
((TestPlan)node).prepareForPreCompile(); //A hack to make
user-defined variables in the testplan element more dynamic
-Map args = ((TestPlan) node).getUserDefinedVariables();
+MapString, String args = ((TestPlan)
node).getUserDefinedVariables();
replacer.setUserDefinedVariables(args);
JMeterVariables vars = new JMeterVariables();
vars.putAll(args);
@@ -94,25 +90,17 @@
if (node instanceof Arguments) {
((Arguments)node).setRunningVersion(true);
-Map args = ((Arguments) node).getArgumentsAsMap();
+MapString, String args = ((Arguments) node).getArgumentsAsMap();
replacer.addVariables(args);
JMeterContextService.getContext().getVariables().putAll(args);
}
}
-/*
- * (non-Javadoc)
- *
- * @see HashTreeTraverser#subtractNode()
- */
+/** {...@inheritdoc} */
public void subtractNode() {
}
-/*
- * (non-Javadoc)
- *
- * @see HashTreeTraverser#processPath()
- */
+/** {...@inheritdoc} */
public void processPath() {
}
}
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/util/JLabeledRadioI18N.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/util/JLabeledRadioI18N.java?rev=804518r1=804517r2=804518view=diff
==
---
jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/util/JLabeledRadioI18N.java
(original)
+++
jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/util/JLabeledRadioI18N.java
Sat Aug 15 19:22:55 2009
@@ -25,8 +25,10 @@
import java.util.LinkedList;
import java.util.List;
+import javax.swing.AbstractButton;
import javax.swing.ButtonGroup;
import javax.swing.ButtonModel;
+import javax.swing.JComponent;
import javax.swing.JLabel;
import javax.swing.JPanel;
import javax.swing.JRadioButton;
@@ -48,7 +50,7 @@
private final ButtonGroup bGroup = new ButtonGroup();
-private final ArrayList mChangeListeners = new ArrayList(3);
+private final ArrayListChangeListener mChangeListeners = new
svn commit: r804543 - in /jakarta/jmeter/trunk/src: components/org/apache/jmeter/modifiers/gui/ core/org/apache/jmeter/config/ core/org/apache/jmeter/reporters/ core/org/apache/jmeter/services/ core/o
Author: sebb
Date: Sun Aug 16 01:31:37 2009
New Revision: 804543
URL: http://svn.apache.org/viewvc?rev=804543view=rev
Log:
The typing continues ...
Modified:
jakarta/jmeter/trunk/src/components/org/apache/jmeter/modifiers/gui/UserParametersGui.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/config/Arguments.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/reporters/Summariser.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/services/FileServer.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testbeans/BeanInfoSupport.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testbeans/TestBeanHelper.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/AbstractProperty.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/threads/ListenerNotifier.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/visualizers/Sample.java
jakarta/jmeter/trunk/src/jorphan/org/apache/commons/jexl/bsf/JexlEngine.java
jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/collections/SearchByClass.java
jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/util/ClassContext.java
jakarta/jmeter/trunk/src/monitor/components/org/apache/jmeter/monitor/util/MemoryBenchmark.java
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/URLString.java
jakarta/jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/test/SleepTest.java
Modified:
jakarta/jmeter/trunk/src/components/org/apache/jmeter/modifiers/gui/UserParametersGui.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/modifiers/gui/UserParametersGui.java?rev=804543r1=804542r2=804543view=diff
==
---
jakarta/jmeter/trunk/src/components/org/apache/jmeter/modifiers/gui/UserParametersGui.java
(original)
+++
jakarta/jmeter/trunk/src/components/org/apache/jmeter/modifiers/gui/UserParametersGui.java
Sun Aug 16 01:31:37 2009
@@ -118,7 +118,7 @@
}
UserParameters userParams = ((UserParameters) params);
userParams.setNames(new CollectionProperty(UserParameters.NAMES,
tableModel.getColumnData(NAME_COL_RESOURCE)));
-CollectionProperty threadLists = new
CollectionProperty(UserParameters.THREAD_VALUES, new ArrayList());
+CollectionProperty threadLists = new
CollectionProperty(UserParameters.THREAD_VALUES, new ArrayListObject());
log.debug(making threadlists from gui);
for (int col = 1; col tableModel.getColumnCount(); col++) {
threadLists.addItem(tableModel.getColumnData(getUserColName(col)));
Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/config/Arguments.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/config/Arguments.java?rev=804543r1=804542r2=804543view=diff
==
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/config/Arguments.java
(original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/config/Arguments.java Sun
Aug 16 01:31:37 2009
@@ -40,7 +40,7 @@
* Create a new Arguments object with no arguments.
*/
public Arguments() {
-setProperty(new CollectionProperty(ARGUMENTS, new ArrayList()));
+setProperty(new CollectionProperty(ARGUMENTS, new
ArrayListArgument()));
}
/**
@@ -58,7 +58,7 @@
@Override
public void clear() {
super.clear();
-setProperty(new CollectionProperty(ARGUMENTS, new ArrayList()));
+setProperty(new CollectionProperty(ARGUMENTS, new
ArrayListArgument()));
}
/**
@@ -67,7 +67,7 @@
* @param arguments
*the new arguments
*/
-public void setArguments(List arguments) {
+public void setArguments(ListArgument arguments) {
setProperty(new CollectionProperty(ARGUMENTS, arguments));
}
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/reporters/Summariser.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/reporters/Summariser.java?rev=804543r1=804542r2=804543view=diff
==
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/reporters/Summariser.java
(original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/reporters/Summariser.java
Sun Aug 16 01:31:37 2009
@@ -22,6 +22,8 @@
import java.text.DecimalFormat;
import java.util.Hashtable;
import java.util.Map;
+import java.util.Set;
+import java.util.Map.Entry;
import org.apache.jmeter.engine.event.LoopIterationEvent;
import org.apache.jmeter.engine.util.NoThreadClone;
@@ -88,7 +90,7 @@
* This map allows summarisers with the same name to contribute to the
same totals.
*/
//@GuardedBy(accumulators)
-private static final Hashtable accumulators = new Hashtable();
+private static final
