Author: sebb
Date: Sat May 10 09:13:49 2008
New Revision: 655121
URL: http://svn.apache.org/viewvc?rev=655121&view=rev
Log:
Standardise placing of transient marker
Modified:
jakarta/jmeter/trunk/src/components/org/apache/jmeter/control/InterleaveControl.java
jakarta/jmeter/trunk/src/components/org/apache/jmeter/modifiers/CounterConfig.java
jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/GraphAccumVisualizer.java
jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/SplineVisualizer.java
jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/StatGraphVisualizer.java
jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/StatVisualizer.java
jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/SummaryReport.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/control/TransactionController.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/reporters/AbstractListenerElement.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/reporters/ResultCollector.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/reporters/Summariser.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/AbstractProperty.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/CollectionProperty.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/BeanShellTestElement.java
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/BeanShell.java
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/IterationCounter.java
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/StringFromFile.java
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/TimeFunction.java
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/AccessLogSampler.java
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/accesslog/StandardGenerator.java
Modified:
jakarta/jmeter/trunk/src/components/org/apache/jmeter/control/InterleaveControl.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/control/InterleaveControl.java?rev=655121&r1=655120&r2=655121&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/components/org/apache/jmeter/control/InterleaveControl.java
(original)
+++
jakarta/jmeter/trunk/src/components/org/apache/jmeter/control/InterleaveControl.java
Sat May 10 09:13:49 2008
@@ -33,7 +33,7 @@
private boolean skipNext;
- transient private TestElement searchStart = null;
+ private transient TestElement searchStart = null;
private boolean currentReturnedAtLeastOne;
Modified:
jakarta/jmeter/trunk/src/components/org/apache/jmeter/modifiers/CounterConfig.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/modifiers/CounterConfig.java?rev=655121&r1=655120&r2=655121&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/components/org/apache/jmeter/modifiers/CounterConfig.java
(original)
+++
jakarta/jmeter/trunk/src/components/org/apache/jmeter/modifiers/CounterConfig.java
Sat May 10 09:13:49 2008
@@ -53,7 +53,7 @@
private long globalCounter = Long.MIN_VALUE;
// Used for per-thread/user numbers
- transient private ThreadLocal perTheadNumber;
+ private transient ThreadLocal perTheadNumber;
private void init() {
perTheadNumber = new ThreadLocal() {
Modified:
jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/GraphAccumVisualizer.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/GraphAccumVisualizer.java?rev=655121&r1=655120&r2=655121&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/GraphAccumVisualizer.java
(original)
+++
jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/GraphAccumVisualizer.java
Sat May 10 09:13:49 2008
@@ -53,7 +53,7 @@
protected transient GraphAccum graph;
- transient protected JPanel legendPanel;
+ protected transient JPanel legendPanel;
/**
* Constructor.
Modified:
jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/SplineVisualizer.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/SplineVisualizer.java?rev=655121&r1=655120&r2=655121&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/SplineVisualizer.java
(original)
+++
jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/SplineVisualizer.java
Sat May 10 09:13:49 2008
@@ -62,7 +62,7 @@
protected final boolean FILL_UP_WITH_ZEROS = false;
- transient private SplineGraph graph = null;
+ private transient SplineGraph graph = null;
private JLabel minimumLabel = null;
@@ -80,7 +80,7 @@
private JLabel incomingNumberLabel = null;
- transient private SplineModel model;
+ private transient SplineModel model;
public SplineVisualizer() {
super();
Modified:
jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/StatGraphVisualizer.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/StatGraphVisualizer.java?rev=655121&r1=655120&r2=655121&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/StatGraphVisualizer.java
(original)
+++
jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/StatGraphVisualizer.java
Sat May 10 09:13:49 2008
@@ -101,7 +101,7 @@
protected JScrollPane myScrollPane;
- transient private ObjectTableModel model;
+ private transient ObjectTableModel model;
Map tableRows = Collections.synchronizedMap(new HashMap());
Modified:
jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/StatVisualizer.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/StatVisualizer.java?rev=655121&r1=655120&r2=655121&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/StatVisualizer.java
(original)
+++
jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/StatVisualizer.java
Sat May 10 09:13:49 2008
@@ -96,7 +96,7 @@
private JCheckBox useGroupName =
new
JCheckBox(JMeterUtils.getResString("aggregate_graph_use_group_name"));
//$NON-NLS-1$
- transient private ObjectTableModel model;
+ private transient ObjectTableModel model;
Map tableRows = Collections.synchronizedMap(new HashMap());
Modified:
jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/SummaryReport.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/SummaryReport.java?rev=655121&r1=655120&r2=655121&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/SummaryReport.java
(original)
+++
jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/SummaryReport.java
Sat May 10 09:13:49 2008
@@ -90,7 +90,7 @@
private JCheckBox useGroupName =
new
JCheckBox(JMeterUtils.getResString("aggregate_graph_use_group_name"));
//$NON-NLS-1$
- transient private ObjectTableModel model;
+ private transient ObjectTableModel model;
Map tableRows = Collections.synchronizedMap(new HashMap());
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/control/TransactionController.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/control/TransactionController.java?rev=655121&r1=655120&r2=655121&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/core/org/apache/jmeter/control/TransactionController.java
(original)
+++
jakarta/jmeter/trunk/src/core/org/apache/jmeter/control/TransactionController.java
Sat May 10 09:13:49 2008
@@ -44,15 +44,15 @@
public class TransactionController extends GenericController implements
SampleListener, Controller, Serializable {
private static final Logger log = LoggingManager.getLoggerForClass();
- transient private TransactionSampler transactionSampler;
+ private transient TransactionSampler transactionSampler;
- transient private ListenerNotifier lnf;
+ private transient ListenerNotifier lnf;
- transient private SampleResult res;
+ private transient SampleResult res;
- transient private int calls;
+ private transient int calls;
- transient private int noFailingSamples;
+ private transient int noFailingSamples;
private static final String PARENT = "TransactionController.parent";//
$NON-NLS-1$
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/reporters/AbstractListenerElement.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/reporters/AbstractListenerElement.java?rev=655121&r1=655120&r2=655121&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/core/org/apache/jmeter/reporters/AbstractListenerElement.java
(original)
+++
jakarta/jmeter/trunk/src/core/org/apache/jmeter/reporters/AbstractListenerElement.java
Sat May 10 09:13:49 2008
@@ -29,7 +29,7 @@
public abstract class AbstractListenerElement extends AbstractTestElement {
// TODO should class implement SampleListener?
- transient private WeakReference listener;
+ private transient WeakReference listener;
public AbstractListenerElement() {
}
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/reporters/ResultCollector.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/reporters/ResultCollector.java?rev=655121&r1=655120&r2=655121&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/core/org/apache/jmeter/reporters/ResultCollector.java
(original)
+++
jakarta/jmeter/trunk/src/core/org/apache/jmeter/reporters/ResultCollector.java
Sat May 10 09:13:49 2008
@@ -92,9 +92,9 @@
private static final String SUCCESS_ONLY_LOGGING =
"ResultCollector.success_only_logging"; // $NON-NLS-1$
- transient private DefaultConfigurationSerializer serializer;
+ private transient DefaultConfigurationSerializer serializer;
- transient private volatile PrintWriter out;
+ private transient volatile PrintWriter out;
private boolean inTest = false;
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=655121&r1=655120&r2=655121&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/reporters/Summariser.java
(original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/reporters/Summariser.java
Sat May 10 09:13:49 2008
@@ -134,9 +134,9 @@
* The variables do not need to be synchronised,
* as they are not shared between threads
*/
- transient private Totals myTotals = null;
+ private transient Totals myTotals = null;
- transient private String myName;
+ private transient String myName;
/*
* Ensure that a report is not skipped if we are slightly late in
checking
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/AbstractProperty.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/AbstractProperty.java?rev=655121&r1=655120&r2=655121&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/AbstractProperty.java
(original)
+++
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/AbstractProperty.java
Sat May 10 09:13:49 2008
@@ -32,7 +32,7 @@
private String name;
- transient private boolean runningVersion = false;
+ private transient boolean runningVersion = false;
// private static StringProperty defaultProperty = new StringProperty();
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/CollectionProperty.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/CollectionProperty.java?rev=655121&r1=655120&r2=655121&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/CollectionProperty.java
(original)
+++
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/CollectionProperty.java
Sat May 10 09:13:49 2008
@@ -30,7 +30,7 @@
private Collection value;
- transient private Collection savedValue;
+ private transient Collection savedValue;
public CollectionProperty(String name, Collection value) {
super(name);
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/BeanShellTestElement.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/BeanShellTestElement.java?rev=655121&r1=655120&r2=655121&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/BeanShellTestElement.java
(original)
+++
jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/BeanShellTestElement.java
Sat May 10 09:13:49 2008
@@ -49,9 +49,9 @@
//-- For TestBean implementations only
- transient private BeanShellInterpreter bshInterpreter = null;
+ private transient BeanShellInterpreter bshInterpreter = null;
- transient private boolean hasInitFile = false;
+ private transient boolean hasInitFile = false;
public BeanShellTestElement() {
super();
Modified:
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/BeanShell.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/BeanShell.java?rev=655121&r1=655120&r2=655121&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/BeanShell.java
(original)
+++
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/BeanShell.java
Sat May 10 09:13:49 2008
@@ -55,9 +55,9 @@
desc.add(JMeterUtils.getResString("function_name_paropt"));//
$NON-NLS1$
}
- transient private Object[] values;
+ private transient Object[] values;
- transient private BeanShellInterpreter bshInterpreter = null;
+ private transient BeanShellInterpreter bshInterpreter = null;
public BeanShell() {
}
Modified:
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/IterationCounter.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/IterationCounter.java?rev=655121&r1=655120&r2=655121&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/IterationCounter.java
(original)
+++
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/IterationCounter.java
Sat May 10 09:13:49 2008
@@ -52,9 +52,9 @@
desc.add(JMeterUtils.getResString("function_name_paropt"));
//$NON-NLS-1$
}
- transient private Object[] variables;
+ private transient Object[] variables;
- transient private int globalCounter;//MAXINT = 2,147,483,647
+ private transient int globalCounter;//MAXINT = 2,147,483,647
public IterationCounter() {
init();
Modified:
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/StringFromFile.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/StringFromFile.java?rev=655121&r1=655120&r2=655121&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/StringFromFile.java
(original)
+++
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/StringFromFile.java
Sat May 10 09:13:49 2008
@@ -90,20 +90,20 @@
private static final int MAX_PARAM_COUNT = 4;
- transient private String myValue;
+ private transient String myValue;
- transient private String myName;
+ private transient String myName;
- transient private Object[] values;
+ private transient Object[] values;
- transient private BufferedReader myBread = null; // Buffered reader
+ private transient BufferedReader myBread = null; // Buffered reader
- transient private FileReader fis; // keep this round to close it
+ private transient FileReader fis; // keep this round to close it
- transient private boolean firstTime = false; // should we try to open
the
+ private transient boolean firstTime = false; // should we try to open
the
// file?
- transient private String fileName; // needed for error messages
+ private transient String fileName; // needed for error messages
public StringFromFile() {
init();
Modified:
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/TimeFunction.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/TimeFunction.java?rev=655121&r1=655120&r2=655121&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/TimeFunction.java
(original)
+++
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/TimeFunction.java
Sat May 10 09:13:49 2008
@@ -67,8 +67,8 @@
}
// Ensure that these are set, even if no paramters are provided
- transient private String format = ""; //$NON-NLS-1$
- transient private String variable = ""; //$NON-NLS-1$
+ private transient String format = ""; //$NON-NLS-1$
+ private transient String variable = ""; //$NON-NLS-1$
private Object readResolve(){
format="";
Modified:
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/AccessLogSampler.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/AccessLogSampler.java?rev=655121&r1=655120&r2=655121&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/AccessLogSampler.java
(original)
+++
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/AccessLogSampler.java
Sat May 10 09:13:49 2008
@@ -72,12 +72,12 @@
public static final String DEFAULT_CLASS =
"org.apache.jmeter.protocol.http.util.accesslog.TCLogParser"; // $NON-NLS-1$
/** private members used by class * */
- transient private LogParser PARSER = null;
+ private transient LogParser PARSER = null;
// NOTUSED private Class PARSERCLASS = null;
private String logFile, parserClassName, filterClassName;
- transient private Filter filter;
+ private transient Filter filter;
private int count = 0;
Modified:
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/accesslog/StandardGenerator.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/accesslog/StandardGenerator.java?rev=655121&r1=655120&r2=655121&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/accesslog/StandardGenerator.java
(original)
+++
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/accesslog/StandardGenerator.java
Sat May 10 09:13:49 2008
@@ -62,9 +62,9 @@
protected HTTPSamplerBase SAMPLE = null;
- transient protected FileWriter WRITER = null;
+ protected transient FileWriter WRITER = null;
- transient protected OutputStream OUTPUT = null;
+ protected transient OutputStream OUTPUT = null;
protected String FILENAME = null;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
