sebb 2003/10/19 15:36:30
Modified: src/functions/org/apache/jmeter/functions
StringFromFile.java CSVRead.java
IterationCounter.java
Log:
Made some fields private; fixed javadoc tags
Revision Changes Path
1.11 +3 -3
jakarta-jmeter/src/functions/org/apache/jmeter/functions/StringFromFile.java
Index: StringFromFile.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/functions/org/apache/jmeter/functions/StringFromFile.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- StringFromFile.java 10 Oct 2003 16:46:32 -0000 1.10
+++ StringFromFile.java 19 Oct 2003 22:36:30 -0000 1.11
@@ -113,8 +113,8 @@
private String myValue = ERR_IND;
private String myName = "StringFromFile_";//$NON-NLS-1$ - Name to store the
value in
private Object[] values;
- private BufferedReader myBread; // Buffered reader
- private FileReader fis; // keep this round to close it
+ transient private BufferedReader myBread; // Buffered reader
+ transient private FileReader fis; // keep this round to close it
private boolean firstTime = false; // should we try to open the file?
private boolean reopenFile = true; // Set from parameter list one day ...
private String fileName; // needed for error messages
1.7 +10 -10
jakarta-jmeter/src/functions/org/apache/jmeter/functions/CSVRead.java
Index: CSVRead.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/functions/org/apache/jmeter/functions/CSVRead.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- CSVRead.java 5 Oct 2003 00:52:25 -0000 1.6
+++ CSVRead.java 19 Oct 2003 22:36:30 -0000 1.7
@@ -90,6 +90,7 @@
* Use CSVRead to isolate the file usage between different threads.
*
* @author Cyrus M.
+ * @version $Revision$ Last Updated: $Date$
*/
/*
@@ -98,21 +99,20 @@
*/
public class CSVRead extends AbstractFunction implements Serializable
{
- transient protected static Logger log = LoggingManager.getLoggerForClass();
+ transient private static final Logger log = LoggingManager.getLoggerForClass();
- private static final String KEY = "__CSVRead"; // Function name (only 1 _)
+ private static final String KEY = "__CSVRead"; // Function name
- protected static final List desc = new LinkedList();
+ private static final List desc = new LinkedList();
- protected static FileDataContainer fileData;
+ private static FileDataContainer fileData;
- protected String myValue = "<please supply a file>"; // Default value
- protected String myName = "CSVRead_"; // Name to store value in
- protected Object[] values;
- protected BufferedReader myBread; // Buffered reader
- protected boolean reopenFile = true; // Set from parameter list one day...
+ private String myValue = "<please supply a file>"; // Default value
+ private String myName = "CSVRead_"; // Name to store value in
+ private Object[] values;
+ private BufferedReader myBread; // Buffered reader
- protected static Hashtable threadData = null;
+ private static Hashtable threadData = null;
static {
desc.add(JMeterUtils.getResString("csvread_file_file_name"));
1.12 +1 -2
jakarta-jmeter/src/functions/org/apache/jmeter/functions/IterationCounter.java
Index: IterationCounter.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/functions/org/apache/jmeter/functions/IterationCounter.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- IterationCounter.java 10 Oct 2003 16:12:04 -0000 1.11
+++ IterationCounter.java 19 Oct 2003 22:36:30 -0000 1.12
@@ -50,8 +50,7 @@
JMeterVariables vars = getVariables();
boolean perThread =
- new Boolean(((CompoundVariable) variables[0]).execute())
- .booleanValue();
+ Boolean.valueOf(((CompoundVariable)
variables[0]).execute()).booleanValue();
String varName =
((CompoundVariable) variables[variables.length - 1]).execute();
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
