khammond 01/10/07 08:40:30
Modified: src/org/apache/jmeter/config Arguments.java
Log:
Added new method removeAll(), and added some sanity checks.
Revision Changes Path
1.14 +21 -9 jakarta-jmeter/src/org/apache/jmeter/config/Arguments.java
Index: Arguments.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/org/apache/jmeter/config/Arguments.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- Arguments.java 2001/08/30 17:19:01 1.13
+++ Arguments.java 2001/10/07 15:40:30 1.14
@@ -65,13 +65,12 @@
* Apache Foundation
*
*@author Michael Stover
- *@created $Date: 2001/08/30 17:19:01 $
+ *@created $Date: 2001/10/07 15:40:30 $
*@version 1.0
***********************************************************/
public class Arguments implements JMeterComponentModel,
Saveable,Serializable,Cloneable
{
-
public static String[] COLUMN_NAMES = {"Name", "Value"};
private List args;
@@ -108,6 +107,7 @@
Argument item = (Argument)iter.next();
newArgs.addArgument(item.getName(),item.getValue());
}
+
return newArgs;
}
@@ -171,8 +171,6 @@
return null;
}
-
-
/************************************************************
* Description of the Method
***********************************************************/
@@ -209,7 +207,7 @@
{
Argument arg = (Argument)iter.next();
str.append(arg.name+"="+arg.value);
- if(iter.hasNext())
+ if (iter.hasNext())
{
str.append("&");
}
@@ -218,8 +216,19 @@
}
public void removeArgument(int row)
+ {
+ if (row < args.size())
+ {
+ args.remove(row);
+ }
+ }
+
+ public void removeAllArguments()
{
- args.remove(row);
+ if (args.size() > 0)
+ {
+ args.clear();
+ }
}
public void addEmptyArgument()
@@ -234,10 +243,13 @@
public Argument getArgument(int row)
{
- if(args.size() > row)
+ Argument argument = null;
+
+ if (row < args.size())
{
- return (Argument)args.get(row);
+ argument = (Argument)args.get(row);
}
- return null;
+
+ return argument;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
