Author: sebb
Date: Wed Nov 30 16:49:04 2005
New Revision: 350089
URL: http://svn.apache.org/viewcvs?rev=350089&view=rev
Log:
Make inner classes static where possible
Modified:
jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/assertions/XMLSchemaAssertion.java
jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/visualizers/ViewResultsFullVisualizer.java
jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/JMeter.java
jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/MainFrame.java
jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/threads/JMeterThread.java
jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/threads/TestCompiler.java
jakarta/jmeter/branches/rel-2-1/src/jorphan/org/apache/jorphan/collections/HashTree.java
jakarta/jmeter/branches/rel-2-1/src/monitor/model/org/apache/jmeter/monitor/model/ObjectFactory.java
jakarta/jmeter/branches/rel-2-1/src/protocol/http/org/apache/jmeter/protocol/http/gui/AuthPanel.java
jakarta/jmeter/branches/rel-2-1/src/protocol/http/org/apache/jmeter/protocol/http/gui/HeaderPanel.java
jakarta/jmeter/branches/rel-2-1/src/reports/org/apache/jmeter/JMeterReport.java
jakarta/jmeter/branches/rel-2-1/src/reports/org/apache/jmeter/gui/ReportMainFrame.java
jakarta/jmeter/branches/rel-2-1/test/src/org/apache/jmeter/protocol/http/sampler/PostWriterTest.java
Modified:
jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/assertions/XMLSchemaAssertion.java
URL:
http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/assertions/XMLSchemaAssertion.java?rev=350089&r1=350088&r2=350089&view=diff
==============================================================================
---
jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/assertions/XMLSchemaAssertion.java
(original)
+++
jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/assertions/XMLSchemaAssertion.java
Wed Nov 30 16:49:04 2005
@@ -175,7 +175,7 @@
/**
* SAXErrorHandler class
*/
- private class SAXErrorHandler implements ErrorHandler {
+ private static class SAXErrorHandler implements ErrorHandler {
private AssertionResult result;
public SAXErrorHandler(AssertionResult result) {
Modified:
jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/visualizers/ViewResultsFullVisualizer.java
URL:
http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/visualizers/ViewResultsFullVisualizer.java?rev=350089&r1=350088&r2=350089&view=diff
==============================================================================
---
jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/visualizers/ViewResultsFullVisualizer.java
(original)
+++
jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/visualizers/ViewResultsFullVisualizer.java
Wed Nov 30 16:49:04 2005
@@ -641,7 +641,7 @@
return resultsPane;
}
- private class ResultsNodeRenderer extends DefaultTreeCellRenderer {
+ private static class ResultsNodeRenderer extends
DefaultTreeCellRenderer {
public Component getTreeCellRendererComponent(JTree tree,
Object value, boolean sel, boolean expanded,
boolean leaf, int row, boolean focus) {
super.getTreeCellRendererComponent(tree, value, sel,
expanded, leaf, row, focus);
@@ -688,7 +688,7 @@
* nodes in the tree using TreePath.
*
*/
- private class DOMTreePanel extends JPanel {
+ private static class DOMTreePanel extends JPanel {
private JTree domJTree;
@@ -739,7 +739,7 @@
* automatically wrap line for each 100 characters since tool
tip
* support html. author <a href="mailto:[EMAIL PROTECTED]">Dave
Maung</a>
*/
- private class DomTreeRenderer extends DefaultTreeCellRenderer {
+ private static class DomTreeRenderer extends
DefaultTreeCellRenderer {
public Component getTreeCellRendererComponent(JTree
tree, Object value, boolean sel, boolean expanded,
boolean leaf, int row, boolean
phasFocus) {
super.getTreeCellRendererComponent(tree, value,
sel, expanded, leaf, row, phasFocus);
@@ -814,7 +814,7 @@
return str.toString();
}
- private class SAXErrorHandler implements ErrorHandler {
+ private static class SAXErrorHandler implements ErrorHandler {
private String msg;
private int messageType;
Modified: jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/JMeter.java
URL:
http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/JMeter.java?rev=350089&r1=350088&r2=350089&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/JMeter.java
(original)
+++ jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/JMeter.java Wed
Nov 30 16:49:04 2005
@@ -571,7 +571,7 @@
* Listen to test and exit program after test completes, after a 5
second
* delay to give listeners a chance to close out their files.
*/
- private class ListenToTest implements TestListener, Runnable,
Remoteable {
+ private static class ListenToTest implements TestListener, Runnable,
Remoteable {
int started = 0;
private JMeter _parent;
Modified:
jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/MainFrame.java
URL:
http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/MainFrame.java?rev=350089&r1=350088&r2=350089&view=diff
==============================================================================
---
jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/MainFrame.java
(original)
+++
jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/MainFrame.java
Wed Nov 30 16:49:04 2005
@@ -459,7 +459,7 @@
* A window adapter used to detect when the main JMeter frame is being
* closed.
*/
- private class WindowHappenings extends WindowAdapter {
+ private static class WindowHappenings extends WindowAdapter {
/**
* Called when the main JMeter frame is being closed. Sends a
* notification so that JMeter can react appropriately.
Modified:
jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/threads/JMeterThread.java
URL:
http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/threads/JMeterThread.java?rev=350089&r1=350088&r2=350089&view=diff
==============================================================================
---
jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/threads/JMeterThread.java
(original)
+++
jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/threads/JMeterThread.java
Wed Nov 30 16:49:04 2005
@@ -355,7 +355,7 @@
threadGroup.decrNumberOfThreads();
}
- private class Traverser implements HashTreeTraverser {
+ private static class Traverser implements HashTreeTraverser {
private boolean isStart = false;
private Traverser(boolean start) {
Modified:
jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/threads/TestCompiler.java
URL:
http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/threads/TestCompiler.java?rev=350089&r1=350088&r2=350089&view=diff
==============================================================================
---
jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/threads/TestCompiler.java
(original)
+++
jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/threads/TestCompiler.java
Wed Nov 30 16:49:04 2005
@@ -268,7 +268,7 @@
}
}
- private class ObjectPair // TODO - should this be static?
+ private static class ObjectPair
{
TestElement child, parent;
Modified:
jakarta/jmeter/branches/rel-2-1/src/jorphan/org/apache/jorphan/collections/HashTree.java
URL:
http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/jorphan/org/apache/jorphan/collections/HashTree.java?rev=350089&r1=350088&r2=350089&view=diff
==============================================================================
---
jakarta/jmeter/branches/rel-2-1/src/jorphan/org/apache/jorphan/collections/HashTree.java
(original)
+++
jakarta/jmeter/branches/rel-2-1/src/jorphan/org/apache/jorphan/collections/HashTree.java
Wed Nov 30 16:49:04 2005
@@ -990,7 +990,7 @@
protected Map data;
- private class TreeSearcher implements HashTreeTraverser {
+ private static class TreeSearcher implements HashTreeTraverser {
Object target;
HashTree result;
@@ -1038,7 +1038,7 @@
}
}
- private class ConvertToString implements HashTreeTraverser {
+ private static class ConvertToString implements HashTreeTraverser {
StringBuffer string = new StringBuffer(getClass().getName() +
"{");
StringBuffer spaces = new StringBuffer();
Modified:
jakarta/jmeter/branches/rel-2-1/src/monitor/model/org/apache/jmeter/monitor/model/ObjectFactory.java
URL:
http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/monitor/model/org/apache/jmeter/monitor/model/ObjectFactory.java?rev=350089&r1=350088&r2=350089&view=diff
==============================================================================
---
jakarta/jmeter/branches/rel-2-1/src/monitor/model/org/apache/jmeter/monitor/model/ObjectFactory.java
(original)
+++
jakarta/jmeter/branches/rel-2-1/src/monitor/model/org/apache/jmeter/monitor/model/ObjectFactory.java
Wed Nov 30 16:49:04 2005
@@ -88,7 +88,7 @@
return new WorkersImpl();
}
- protected class MonitorParser extends ParserImpl {
+ protected static class MonitorParser extends ParserImpl {
public MonitorParser(ObjectFactory factory) {
super(factory);
}
Modified:
jakarta/jmeter/branches/rel-2-1/src/protocol/http/org/apache/jmeter/protocol/http/gui/AuthPanel.java
URL:
http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/protocol/http/org/apache/jmeter/protocol/http/gui/AuthPanel.java?rev=350089&r1=350088&r2=350089&view=diff
==============================================================================
---
jakarta/jmeter/branches/rel-2-1/src/protocol/http/org/apache/jmeter/protocol/http/gui/AuthPanel.java
(original)
+++
jakarta/jmeter/branches/rel-2-1/src/protocol/http/org/apache/jmeter/protocol/http/gui/AuthPanel.java
Wed Nov 30 16:49:04 2005
@@ -271,7 +271,7 @@
/**
* @version $Revision$
*/
- private class InnerTableModel extends AbstractTableModel {
+ private static class InnerTableModel extends AbstractTableModel {
AuthManager manager;
public InnerTableModel(AuthManager man) {
@@ -352,7 +352,7 @@
/**
* @version $Revision$
*/
- private class PasswordCellRenderer extends JPasswordField implements
TableCellRenderer {
+ private static class PasswordCellRenderer extends JPasswordField
implements TableCellRenderer {
private Border myBorder;
public PasswordCellRenderer() {
Modified:
jakarta/jmeter/branches/rel-2-1/src/protocol/http/org/apache/jmeter/protocol/http/gui/HeaderPanel.java
URL:
http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/protocol/http/org/apache/jmeter/protocol/http/gui/HeaderPanel.java?rev=350089&r1=350088&r2=350089&view=diff
==============================================================================
---
jakarta/jmeter/branches/rel-2-1/src/protocol/http/org/apache/jmeter/protocol/http/gui/HeaderPanel.java
(original)
+++
jakarta/jmeter/branches/rel-2-1/src/protocol/http/org/apache/jmeter/protocol/http/gui/HeaderPanel.java
Wed Nov 30 16:49:04 2005
@@ -408,7 +408,7 @@
/**
* @version $Revision$
*/
- private class InnerTableModel extends AbstractTableModel {
+ private static class InnerTableModel extends AbstractTableModel {
HeaderManager manager;
public InnerTableModel(HeaderManager man) {
Modified:
jakarta/jmeter/branches/rel-2-1/src/reports/org/apache/jmeter/JMeterReport.java
URL:
http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/reports/org/apache/jmeter/JMeterReport.java?rev=350089&r1=350088&r2=350089&view=diff
==============================================================================
---
jakarta/jmeter/branches/rel-2-1/src/reports/org/apache/jmeter/JMeterReport.java
(original)
+++
jakarta/jmeter/branches/rel-2-1/src/reports/org/apache/jmeter/JMeterReport.java
Wed Nov 30 16:49:04 2005
@@ -457,7 +457,7 @@
* Listen to test and exit program after test completes, after a 5 second
* delay to give listeners a chance to close out their files.
*/
- private class ListenToTest implements TestListener, Runnable, Remoteable {
+ private static class ListenToTest implements TestListener, Runnable,
Remoteable {
int started = 0;
private JMeterReport _parent;
Modified:
jakarta/jmeter/branches/rel-2-1/src/reports/org/apache/jmeter/gui/ReportMainFrame.java
URL:
http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/reports/org/apache/jmeter/gui/ReportMainFrame.java?rev=350089&r1=350088&r2=350089&view=diff
==============================================================================
---
jakarta/jmeter/branches/rel-2-1/src/reports/org/apache/jmeter/gui/ReportMainFrame.java
(original)
+++
jakarta/jmeter/branches/rel-2-1/src/reports/org/apache/jmeter/gui/ReportMainFrame.java
Wed Nov 30 16:49:04 2005
@@ -419,7 +419,7 @@
* A window adapter used to detect when the main JMeter frame is being
* closed.
*/
- protected class WindowHappenings extends WindowAdapter {
+ protected static class WindowHappenings extends WindowAdapter {
/**
* Called when the main JMeter frame is being closed. Sends a
* notification so that JMeter can react appropriately.
Modified:
jakarta/jmeter/branches/rel-2-1/test/src/org/apache/jmeter/protocol/http/sampler/PostWriterTest.java
URL:
http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/test/src/org/apache/jmeter/protocol/http/sampler/PostWriterTest.java?rev=350089&r1=350088&r2=350089&view=diff
==============================================================================
---
jakarta/jmeter/branches/rel-2-1/test/src/org/apache/jmeter/protocol/http/sampler/PostWriterTest.java
(original)
+++
jakarta/jmeter/branches/rel-2-1/test/src/org/apache/jmeter/protocol/http/sampler/PostWriterTest.java
Wed Nov 30 16:49:04 2005
@@ -205,7 +205,7 @@
* Mock an HttpURLConnection.
* extends HttpURLConnection instead of just URLConnection because there
is a cast in PostWriter.
*/
- private class StubURLConnection extends HttpURLConnection {
+ private static class StubURLConnection extends HttpURLConnection {
private OutputStream output = new ByteArrayOutputStream();
private Map properties = new HashMap();
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
