Author: sebb
Date: Wed Jan 27 20:55:36 2010
New Revision: 903825
URL: http://svn.apache.org/viewvc?rev=903825&view=rev
Log:
Tidyup
Modified:
jakarta/jmeter/trunk/src/components/org/apache/jmeter/reporters/MailerModel.java
jakarta/jmeter/trunk/src/components/org/apache/jmeter/timers/RandomTimer.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/control/gui/TestPlanGui.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/DoubleProperty.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/FloatProperty.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/FunctionProperty.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/IntegerProperty.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/LongProperty.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/ObjectProperty.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/threads/TestCompiler.java
jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/gui/AbstractTreeTableModel.java
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/LoopbackHTTPSocket.java
jakarta/jmeter/trunk/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/config/DataSourceElementBeanInfo.java
jakarta/jmeter/trunk/src/protocol/ldap/org/apache/jmeter/protocol/ldap/config/gui/LdapConfigGui.java
jakarta/jmeter/trunk/src/protocol/ldap/org/apache/jmeter/protocol/ldap/config/gui/LdapExtConfigGui.java
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/writers/gui/HTMLReportWriterGui.java
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/testelement/JTLData.java
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/testelement/LineChart.java
jakarta/jmeter/trunk/test/src/org/apache/jmeter/assertions/ResponseAssertionTest.java
jakarta/jmeter/trunk/test/src/org/apache/jmeter/engine/util/TestValueReplacer.java
jakarta/jmeter/trunk/test/src/org/apache/jmeter/extractor/TestRegexExtractor.java
jakarta/jmeter/trunk/test/src/org/apache/jmeter/extractor/TestXPathExtractor.java
jakarta/jmeter/trunk/test/src/org/apache/jmeter/functions/TestJexlFunction.java
jakarta/jmeter/trunk/test/src/org/apache/jmeter/functions/TestRegexFunction.java
jakarta/jmeter/trunk/test/src/org/apache/jmeter/gui/action/TestSave.java
jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/config/UrlConfigTest.java
jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/control/TestCacheManager.java
jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/proxy/TestProxyControl.java
jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/sampler/PostWriterTest.java
jakarta/jmeter/trunk/test/src/org/apache/jmeter/testbeans/gui/PackageTest.java
Modified:
jakarta/jmeter/trunk/src/components/org/apache/jmeter/reporters/MailerModel.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/reporters/MailerModel.java?rev=903825&r1=903824&r2=903825&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/components/org/apache/jmeter/reporters/MailerModel.java
(original)
+++
jakarta/jmeter/trunk/src/components/org/apache/jmeter/reporters/MailerModel.java
Wed Jan 27 20:55:36 2010
@@ -78,7 +78,7 @@
private static final String DEFAULT_LIMIT = "2"; //$NON-NLS-1$
/** The listener for changes. */
- transient ChangeListener changeListener;
+ private transient ChangeListener changeListener;
/**
* Constructs a MailerModel.
Modified:
jakarta/jmeter/trunk/src/components/org/apache/jmeter/timers/RandomTimer.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/timers/RandomTimer.java?rev=903825&r1=903824&r2=903825&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/components/org/apache/jmeter/timers/RandomTimer.java
(original)
+++
jakarta/jmeter/trunk/src/components/org/apache/jmeter/timers/RandomTimer.java
Wed Jan 27 20:55:36 2010
@@ -33,7 +33,7 @@
public abstract class RandomTimer extends ConstantTimer implements Timer,
Serializable {
public final static String RANGE = "RandomTimer.range";
- protected Random random;
+ protected final Random random;
/**
* No-arg constructor.
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/control/gui/TestPlanGui.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/control/gui/TestPlanGui.java?rev=903825&r1=903824&r2=903825&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/core/org/apache/jmeter/control/gui/TestPlanGui.java
(original)
+++
jakarta/jmeter/trunk/src/core/org/apache/jmeter/control/gui/TestPlanGui.java
Wed Jan 27 20:55:36 2010
@@ -19,12 +19,10 @@
package org.apache.jmeter.control.gui;
import java.awt.BorderLayout;
-import java.awt.Container;
import java.util.Collection;
import javax.swing.JCheckBox;
import javax.swing.JMenu;
-import javax.swing.JPanel;
import javax.swing.JPopupMenu;
import javax.swing.JTextArea;
@@ -52,19 +50,23 @@
* A checkbox allowing the user to specify whether or not JMeter should do
* functional testing.
*/
- private JCheckBox functionalMode;
+ private final JCheckBox functionalMode;
- private JCheckBox serializedMode;
+ private final JCheckBox serializedMode;
/** A panel allowing the user to define variables. */
- private ArgumentsPanel argsPanel;
+ private final ArgumentsPanel argsPanel;
- FileListPanel browseJar = null;
+ private final FileListPanel browseJar;
/**
* Create a new TestPlanGui.
*/
public TestPlanGui() {
+ browseJar = new
FileListPanel(JMeterUtils.getResString("test_plan_classpath_browse"), ".jar");
// $NON-NLS-1$ $NON-NLS-2$
+ argsPanel = new
ArgumentsPanel(JMeterUtils.getResString("user_defined_variables")); //
$NON-NLS-1$
+ serializedMode = new
JCheckBox(JMeterUtils.getResString("testplan.serialized")); // $NON-NLS-1$
+ functionalMode = new
JCheckBox(JMeterUtils.getResString("functional_mode")); // $NON-NLS-1$
init();
}
@@ -157,22 +159,6 @@
}
/**
- * Create a panel allowing the user to define variables for the test.
- *
- * @return a panel for user-defined variables
- */
- private JPanel createVariablePanel() {
- argsPanel = new
ArgumentsPanel(JMeterUtils.getResString("user_defined_variables")); //
$NON-NLS-1$
-
- return argsPanel;
- }
-
- protected Container createClassPathPanel() {
- browseJar = new
FileListPanel(JMeterUtils.getResString("test_plan_classpath_browse"), ".jar");
// $NON-NLS-1$ $NON-NLS-2$
- return browseJar;
- }
-
- /**
* Initialize the components and layout of this component.
*/
private void init() {
@@ -181,18 +167,16 @@
add(makeTitlePanel(), BorderLayout.NORTH);
- add(createVariablePanel(), BorderLayout.CENTER);
+ add(argsPanel, BorderLayout.CENTER);
VerticalPanel southPanel = new VerticalPanel();
- serializedMode = new
JCheckBox(JMeterUtils.getResString("testplan.serialized")); // $NON-NLS-1$
southPanel.add(serializedMode);
- functionalMode = new
JCheckBox(JMeterUtils.getResString("functional_mode")); // $NON-NLS-1$
southPanel.add(functionalMode);
JTextArea explain = new
JTextArea(JMeterUtils.getResString("functional_mode_explanation")); //
$NON-NLS-1$
explain.setEditable(false);
explain.setBackground(this.getBackground());
southPanel.add(explain);
- southPanel.add(createClassPathPanel());
+ southPanel.add(browseJar);
add(southPanel, BorderLayout.SOUTH);
}
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/DoubleProperty.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/DoubleProperty.java?rev=903825&r1=903824&r2=903825&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/DoubleProperty.java
(original)
+++
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/DoubleProperty.java
Wed Jan 27 20:55:36 2010
@@ -24,9 +24,9 @@
* @version $Revision$
*/
public class DoubleProperty extends NumberProperty {
- double value;
+ private double value;
- double savedValue;
+ private double savedValue;
public DoubleProperty(String name, double value) {
super(name);
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/FloatProperty.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/FloatProperty.java?rev=903825&r1=903824&r2=903825&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/FloatProperty.java
(original)
+++
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/FloatProperty.java
Wed Jan 27 20:55:36 2010
@@ -24,9 +24,9 @@
* @version $Revision$
*/
public class FloatProperty extends NumberProperty {
- float value;
+ private float value;
- float savedValue;
+ private float savedValue;
public FloatProperty(String name, float value) {
super(name);
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/FunctionProperty.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/FunctionProperty.java?rev=903825&r1=903824&r2=903825&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/FunctionProperty.java
(original)
+++
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/FunctionProperty.java
Wed Jan 27 20:55:36 2010
@@ -29,11 +29,11 @@
public class FunctionProperty extends AbstractProperty {
private static final long serialVersionUID = 233L;
- transient CompoundVariable function;
+ private transient CompoundVariable function;
- int testIteration = -1;
+ private int testIteration = -1;
- String cacheValue;
+ private String cacheValue;
public FunctionProperty(String name, CompoundVariable func) {
super(name);
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/IntegerProperty.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/IntegerProperty.java?rev=903825&r1=903824&r2=903825&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/IntegerProperty.java
(original)
+++
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/IntegerProperty.java
Wed Jan 27 20:55:36 2010
@@ -24,9 +24,9 @@
* @version $Revision$
*/
public class IntegerProperty extends NumberProperty {
- int value;
+ private int value;
- int savedValue;
+ private int savedValue;
public IntegerProperty(String name, int value) {
super(name);
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/LongProperty.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/LongProperty.java?rev=903825&r1=903824&r2=903825&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/LongProperty.java
(original)
+++
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/LongProperty.java
Wed Jan 27 20:55:36 2010
@@ -24,9 +24,9 @@
* @version $Revision$
*/
public class LongProperty extends NumberProperty {
- long value;
+ private long value;
- long savedValue;
+ private long savedValue;
public LongProperty(String name, long value) {
super(name);
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/ObjectProperty.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/ObjectProperty.java?rev=903825&r1=903824&r2=903825&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/ObjectProperty.java
(original)
+++
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/ObjectProperty.java
Wed Jan 27 20:55:36 2010
@@ -24,11 +24,11 @@
import org.apache.jmeter.testelement.TestElement;
public class ObjectProperty extends AbstractProperty {
- static final long serialVersionUID = 1;
+ private static final long serialVersionUID = 1;
- Object value;
+ private Object value;
- Object savedValue;
+ private Object savedValue;
/*
* (non-Javadoc)
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/threads/TestCompiler.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/threads/TestCompiler.java?rev=903825&r1=903824&r2=903825&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/threads/TestCompiler.java
(original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/threads/TestCompiler.java
Wed Jan 27 20:55:36 2010
@@ -240,7 +240,7 @@
private static class ObjectPair
{
- TestElement child, parent;
+ private TestElement child, parent;
public ObjectPair(TestElement one, TestElement two) {
this.child = one;
Modified:
jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/gui/AbstractTreeTableModel.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/gui/AbstractTreeTableModel.java?rev=903825&r1=903824&r2=903825&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/gui/AbstractTreeTableModel.java
(original)
+++
jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/gui/AbstractTreeTableModel.java
Wed Jan 27 20:55:36 2010
@@ -31,31 +31,34 @@
public abstract class AbstractTreeTableModel extends DefaultTableModel
implements TreeTableModel {
- protected TreeNode rootNode = null;
- protected EventListenerList listener = new EventListenerList();
+ protected final TreeNode rootNode;
+ protected final EventListenerList listener = new EventListenerList();
- protected transient ArrayList<Object> objects = new ArrayList<Object>();
+ protected transient final ArrayList<Object> objects = new
ArrayList<Object>();
- protected transient List<String> headers = new ArrayList<String>();
+ protected transient final List<String> headers = new ArrayList<String>();
- protected transient ArrayList<Class<?>> classes = new
ArrayList<Class<?>>();
+ protected transient final ArrayList<Class<?>> classes = new
ArrayList<Class<?>>();
- protected transient ArrayList<Functor> readFunctors = new
ArrayList<Functor>();
+ protected transient final ArrayList<Functor> readFunctors;
- protected transient ArrayList<Functor> writeFunctors = new
ArrayList<Functor>();
+ protected transient final ArrayList<Functor> writeFunctors;
public AbstractTreeTableModel(TreeNode root) {
this.rootNode = root;
+ readFunctors = new ArrayList<Functor>();
+ writeFunctors = new ArrayList<Functor>();
}
public AbstractTreeTableModel(TreeNode root, boolean editable) {
- this.rootNode = root;
+ this(root);
}
public AbstractTreeTableModel(String[] headers,
Functor[] readFunctors,
Functor[] writeFunctors,
Class<?>[] editorClasses) {
+ this.rootNode = null;
this.headers.addAll(Arrays.asList(headers));
this.classes.addAll(Arrays.asList(editorClasses));
this.readFunctors = new
ArrayList<Functor>(Arrays.asList(readFunctors));
Modified:
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/LoopbackHTTPSocket.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/LoopbackHTTPSocket.java?rev=903825&r1=903824&r2=903825&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/LoopbackHTTPSocket.java
(original)
+++
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/LoopbackHTTPSocket.java
Wed Jan 27 20:55:36 2010
@@ -41,7 +41,7 @@
// wrap read() methods to track output buffer
static class LoopBackInputStream extends ByteArrayInputStream{
- LoopbackOutputStream os;
+ private LoopbackOutputStream os;
@Override
public synchronized int read() {
buf=os.getBuffer(); // make sure buffer details
Modified:
jakarta/jmeter/trunk/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/config/DataSourceElementBeanInfo.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/config/DataSourceElementBeanInfo.java?rev=903825&r1=903824&r2=903825&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/config/DataSourceElementBeanInfo.java
(original)
+++
jakarta/jmeter/trunk/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/config/DataSourceElementBeanInfo.java
Wed Jan 27 20:55:36 2010
@@ -24,12 +24,8 @@
import java.beans.PropertyDescriptor;
import org.apache.jmeter.testbeans.BeanInfoSupport;
-import org.apache.jorphan.logging.LoggingManager;
-import org.apache.log.Logger;
public class DataSourceElementBeanInfo extends BeanInfoSupport {
- Logger log = LoggingManager.getLoggerForClass();
-
public DataSourceElementBeanInfo() {
super(DataSourceElement.class);
createPropertyGroup("varName", new String[] { "dataSource" });
Modified:
jakarta/jmeter/trunk/src/protocol/ldap/org/apache/jmeter/protocol/ldap/config/gui/LdapConfigGui.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/ldap/org/apache/jmeter/protocol/ldap/config/gui/LdapConfigGui.java?rev=903825&r1=903824&r2=903825&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/protocol/ldap/org/apache/jmeter/protocol/ldap/config/gui/LdapConfigGui.java
(original)
+++
jakarta/jmeter/trunk/src/protocol/ldap/org/apache/jmeter/protocol/ldap/config/gui/LdapConfigGui.java
Wed Jan 27 20:55:36 2010
@@ -81,9 +81,9 @@
private boolean displayName = true;
- ArgumentsPanel tableAddPanel = new
ArgumentsPanel(JMeterUtils.getResString("add_test")); // $NON-NLS-1$
+ private ArgumentsPanel tableAddPanel = new
ArgumentsPanel(JMeterUtils.getResString("add_test")); // $NON-NLS-1$
- ArgumentsPanel tableModifyPanel = new
ArgumentsPanel(JMeterUtils.getResString("modify_test")); // $NON-NLS-1$
+ private ArgumentsPanel tableModifyPanel = new
ArgumentsPanel(JMeterUtils.getResString("modify_test")); // $NON-NLS-1$
private JPanel cards;
Modified:
jakarta/jmeter/trunk/src/protocol/ldap/org/apache/jmeter/protocol/ldap/config/gui/LdapExtConfigGui.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/ldap/org/apache/jmeter/protocol/ldap/config/gui/LdapExtConfigGui.java?rev=903825&r1=903824&r2=903825&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/protocol/ldap/org/apache/jmeter/protocol/ldap/config/gui/LdapExtConfigGui.java
(original)
+++
jakarta/jmeter/trunk/src/protocol/ldap/org/apache/jmeter/protocol/ldap/config/gui/LdapExtConfigGui.java
Wed Jan 27 20:55:36 2010
@@ -160,9 +160,9 @@
private boolean displayName = true;
- ArgumentsPanel tableAddPanel = new
ArgumentsPanel(JMeterUtils.getResString("addtest")); // $NON-NLS-1$
+ private ArgumentsPanel tableAddPanel = new
ArgumentsPanel(JMeterUtils.getResString("addtest")); // $NON-NLS-1$
- LDAPArgumentsPanel tableModifyPanel = new
LDAPArgumentsPanel(JMeterUtils.getResString("modtest")); // $NON-NLS-1$
+ private LDAPArgumentsPanel tableModifyPanel = new
LDAPArgumentsPanel(JMeterUtils.getResString("modtest")); // $NON-NLS-1$
private JPanel cards;
Modified:
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/writers/gui/HTMLReportWriterGui.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/writers/gui/HTMLReportWriterGui.java?rev=903825&r1=903824&r2=903825&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/writers/gui/HTMLReportWriterGui.java
(original)
+++
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/writers/gui/HTMLReportWriterGui.java
Wed Jan 27 20:55:36 2010
@@ -32,7 +32,7 @@
public class HTMLReportWriterGui extends AbstractReportGui {
- ReportFilePanel outputDirectory = new ReportFilePanel(
+ private ReportFilePanel outputDirectory = new ReportFilePanel(
JMeterUtils.getResString("report_output_directory"), "*");
public HTMLReportWriterGui() {
Modified:
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/testelement/JTLData.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/reports/org/apache/jmeter/testelement/JTLData.java?rev=903825&r1=903824&r2=903825&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/reports/org/apache/jmeter/testelement/JTLData.java
(original)
+++ jakarta/jmeter/trunk/src/reports/org/apache/jmeter/testelement/JTLData.java
Wed Jan 27 20:55:36 2010
@@ -40,11 +40,11 @@
*/
public class JTLData implements Serializable, DataSet {
- protected final HashMap<String, SamplingStatCalculator> data = new
HashMap<String, SamplingStatCalculator>();
- protected String jtl_file = null;
- protected long startTimestamp = 0;
- protected long endTimestamp = 0;
- protected File inputFile = null;
+ private final HashMap<String, SamplingStatCalculator> data = new
HashMap<String, SamplingStatCalculator>();
+ private String jtl_file = null;
+ private long startTimestamp = 0;
+ private long endTimestamp = 0;
+ private File inputFile = null;
/**
*
Modified:
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/testelement/LineChart.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/reports/org/apache/jmeter/testelement/LineChart.java?rev=903825&r1=903824&r2=903825&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/testelement/LineChart.java
(original)
+++
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/testelement/LineChart.java
Wed Jan 27 20:55:36 2010
@@ -41,10 +41,7 @@
PointChartProperties.SHAPE_DIAMOND,PointChartProperties.SHAPE_SQUARE,
PointChartProperties.SHAPE_TRIANGLE};
- protected int width = 350;
- protected int height = 250;
-
- protected int shape_counter = 0;
+ private int shape_counter = 0;
public LineChart() {
super();
Modified:
jakarta/jmeter/trunk/test/src/org/apache/jmeter/assertions/ResponseAssertionTest.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/test/src/org/apache/jmeter/assertions/ResponseAssertionTest.java?rev=903825&r1=903824&r2=903825&view=diff
==============================================================================
---
jakarta/jmeter/trunk/test/src/org/apache/jmeter/assertions/ResponseAssertionTest.java
(original)
+++
jakarta/jmeter/trunk/test/src/org/apache/jmeter/assertions/ResponseAssertionTest.java
Wed Jan 27 20:55:36 2010
@@ -204,9 +204,9 @@
assertTrue("Expecting failure",result.isFailure());
}
- volatile int threadsRunning;
+ private volatile int threadsRunning;
- volatile int failed;
+ private volatile int failed;
public void testThreadSafety() throws Exception {
Thread[] threads = new Thread[100];
Modified:
jakarta/jmeter/trunk/test/src/org/apache/jmeter/engine/util/TestValueReplacer.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/test/src/org/apache/jmeter/engine/util/TestValueReplacer.java?rev=903825&r1=903824&r2=903825&view=diff
==============================================================================
---
jakarta/jmeter/trunk/test/src/org/apache/jmeter/engine/util/TestValueReplacer.java
(original)
+++
jakarta/jmeter/trunk/test/src/org/apache/jmeter/engine/util/TestValueReplacer.java
Wed Jan 27 20:55:36 2010
@@ -32,7 +32,7 @@
import org.apache.jmeter.threads.JMeterVariables;
public class TestValueReplacer extends JMeterTestCase {
- TestPlan variables;
+ private TestPlan variables;
public TestValueReplacer(String name) {
super(name);
Modified:
jakarta/jmeter/trunk/test/src/org/apache/jmeter/extractor/TestRegexExtractor.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/test/src/org/apache/jmeter/extractor/TestRegexExtractor.java?rev=903825&r1=903824&r2=903825&view=diff
==============================================================================
---
jakarta/jmeter/trunk/test/src/org/apache/jmeter/extractor/TestRegexExtractor.java
(original)
+++
jakarta/jmeter/trunk/test/src/org/apache/jmeter/extractor/TestRegexExtractor.java
Wed Jan 27 20:55:36 2010
@@ -29,17 +29,17 @@
import org.apache.jmeter.threads.JMeterVariables;
public class TestRegexExtractor extends TestCase {
- RegexExtractor extractor;
+ private RegexExtractor extractor;
- SampleResult result;
+ private SampleResult result;
- JMeterVariables vars;
+ private JMeterVariables vars;
public TestRegexExtractor(String name) {
super(name);
}
- private JMeterContext jmctx = null;
+ private JMeterContext jmctx;
@Override
public void setUp() {
Modified:
jakarta/jmeter/trunk/test/src/org/apache/jmeter/extractor/TestXPathExtractor.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/test/src/org/apache/jmeter/extractor/TestXPathExtractor.java?rev=903825&r1=903824&r2=903825&view=diff
==============================================================================
---
jakarta/jmeter/trunk/test/src/org/apache/jmeter/extractor/TestXPathExtractor.java
(original)
+++
jakarta/jmeter/trunk/test/src/org/apache/jmeter/extractor/TestXPathExtractor.java
Wed Jan 27 20:55:36 2010
@@ -27,17 +27,17 @@
import org.apache.jmeter.threads.JMeterVariables;
public class TestXPathExtractor extends TestCase {
- XPathExtractor extractor;
+ private XPathExtractor extractor;
- SampleResult result;
+ private SampleResult result;
- JMeterVariables vars;
+ private JMeterVariables vars;
public TestXPathExtractor(String name) {
super(name);
}
- private JMeterContext jmctx = null;
+ private JMeterContext jmctx;
private final static String VAL_NAME = "value";
private final static String VAL_NAME_NR = "value_matchNr";
Modified:
jakarta/jmeter/trunk/test/src/org/apache/jmeter/functions/TestJexlFunction.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/test/src/org/apache/jmeter/functions/TestJexlFunction.java?rev=903825&r1=903824&r2=903825&view=diff
==============================================================================
---
jakarta/jmeter/trunk/test/src/org/apache/jmeter/functions/TestJexlFunction.java
(original)
+++
jakarta/jmeter/trunk/test/src/org/apache/jmeter/functions/TestJexlFunction.java
Wed Jan 27 20:55:36 2010
@@ -29,15 +29,15 @@
import org.apache.jmeter.threads.JMeterVariables;
public class TestJexlFunction extends JMeterTestCase {
- JexlFunction function;
+ private JexlFunction function;
- SampleResult result;
+ private SampleResult result;
- Collection<CompoundVariable> params;
+ private Collection<CompoundVariable> params;
private JMeterVariables vars;
- private JMeterContext jmctx = null;
+ private JMeterContext jmctx;
public TestJexlFunction(String name) {
super(name);
Modified:
jakarta/jmeter/trunk/test/src/org/apache/jmeter/functions/TestRegexFunction.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/test/src/org/apache/jmeter/functions/TestRegexFunction.java?rev=903825&r1=903824&r2=903825&view=diff
==============================================================================
---
jakarta/jmeter/trunk/test/src/org/apache/jmeter/functions/TestRegexFunction.java
(original)
+++
jakarta/jmeter/trunk/test/src/org/apache/jmeter/functions/TestRegexFunction.java
Wed Jan 27 20:55:36 2010
@@ -31,15 +31,15 @@
public class TestRegexFunction extends JMeterTestCase {
private static final String INPUT_VARIABLE_NAME = "INVAR";
- RegexFunction variable;
+ private RegexFunction variable;
- SampleResult result;
+ private SampleResult result;
- Collection<CompoundVariable> params;
+ private Collection<CompoundVariable> params;
private JMeterVariables vars;
- private JMeterContext jmctx = null;
+ private JMeterContext jmctx;
public TestRegexFunction(String name) {
super(name);
Modified:
jakarta/jmeter/trunk/test/src/org/apache/jmeter/gui/action/TestSave.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/test/src/org/apache/jmeter/gui/action/TestSave.java?rev=903825&r1=903824&r2=903825&view=diff
==============================================================================
--- jakarta/jmeter/trunk/test/src/org/apache/jmeter/gui/action/TestSave.java
(original)
+++ jakarta/jmeter/trunk/test/src/org/apache/jmeter/gui/action/TestSave.java
Wed Jan 27 20:55:36 2010
@@ -24,7 +24,7 @@
import org.apache.jorphan.collections.ListedHashTree;
public class TestSave extends junit.framework.TestCase {
- Save save;
+ private Save save;
public TestSave(String name) {
super(name);
Modified:
jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/config/UrlConfigTest.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/config/UrlConfigTest.java?rev=903825&r1=903824&r2=903825&view=diff
==============================================================================
---
jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/config/UrlConfigTest.java
(original)
+++
jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/config/UrlConfigTest.java
Wed Jan 27 20:55:36 2010
@@ -27,11 +27,11 @@
import org.apache.jmeter.testelement.property.TestElementProperty;
public class UrlConfigTest extends JMeterTestCase {
- HTTPSamplerBase config;
+ private HTTPSamplerBase config;
- HTTPSamplerBase defaultConfig;
+ private HTTPSamplerBase defaultConfig;
- HTTPSamplerBase partialConfig;
+ private HTTPSamplerBase partialConfig;
public UrlConfigTest(String name) {
super(name);
Modified:
jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/control/TestCacheManager.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/control/TestCacheManager.java?rev=903825&r1=903824&r2=903825&view=diff
==============================================================================
---
jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/control/TestCacheManager.java
(original)
+++
jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/control/TestCacheManager.java
Wed Jan 27 20:55:36 2010
@@ -111,7 +111,7 @@
}
private class HttpURLConnectionStub extends HttpURLConnection {
- Map<String, List<String>> properties;
+ private Map<String, List<String>> properties;
public HttpURLConnectionStub(HttpMethod method, URL url) {
super(method, url);
Modified:
jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/proxy/TestProxyControl.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/proxy/TestProxyControl.java?rev=903825&r1=903824&r2=903825&view=diff
==============================================================================
---
jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/proxy/TestProxyControl.java
(original)
+++
jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/proxy/TestProxyControl.java
Wed Jan 27 20:55:36 2010
@@ -25,9 +25,9 @@
import org.apache.jmeter.protocol.http.sampler.HTTPSamplerBase;
public class TestProxyControl extends TestCase {
- HTTPSamplerBase sampler;
+ private HTTPSamplerBase sampler;
- ProxyControl control;
+ private ProxyControl control;
public TestProxyControl(String name) {
super(name);
Modified:
jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/sampler/PostWriterTest.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/sampler/PostWriterTest.java?rev=903825&r1=903824&r2=903825&view=diff
==============================================================================
---
jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/sampler/PostWriterTest.java
(original)
+++
jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/sampler/PostWriterTest.java
Wed Jan 27 20:55:36 2010
@@ -52,7 +52,7 @@
private HTTPSampler sampler;
private File temporaryFile;
- PostWriter postWriter;
+ private PostWriter postWriter;
@Override
protected void setUp() throws Exception {
establishConnection();
Modified:
jakarta/jmeter/trunk/test/src/org/apache/jmeter/testbeans/gui/PackageTest.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/test/src/org/apache/jmeter/testbeans/gui/PackageTest.java?rev=903825&r1=903824&r2=903825&view=diff
==============================================================================
---
jakarta/jmeter/trunk/test/src/org/apache/jmeter/testbeans/gui/PackageTest.java
(original)
+++
jakarta/jmeter/trunk/test/src/org/apache/jmeter/testbeans/gui/PackageTest.java
Wed Jan 27 20:55:36 2010
@@ -74,9 +74,9 @@
this.defaultBundle = null;
}
- BeanInfo beanInfo;
+ private BeanInfo beanInfo;
- ResourceBundle bundle;
+ private ResourceBundle bundle;
@Override
public void setUp() {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
