Author: sebb
Date: Sat Aug 15 11:52:48 2009
New Revision: 804456
URL: http://svn.apache.org/viewvc?rev=804456&view=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=804456&r1=804455&r2=804456&view=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 List<String> METHODLIST = null;
private transient ClassFilter FILTER = new ClassFilter();
- private List CLASSLIST = null;
+ private List<String> CLASSLIST = null;
/**
* Constructor for JUnitTestSamplerGui
@@ -166,7 +167,7 @@
private JPanel createClassPanel()
{
- METHODLIST = new java.util.ArrayList();
+ METHODLIST = new ArrayList<String>();
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();
+ List<Method> list = new ArrayList<Method>();
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
