Author: sebb
Date: Thu Apr 3 02:53:10 2008
New Revision: 644247
URL: http://svn.apache.org/viewvc?rev=644247&view=rev
Log:
Methods called from constructors must not be overridable
Modified:
jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/DistributionGraph.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/TextAreaEditor.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/BeanShellInterpreter.java
jakarta/jmeter/trunk/src/monitor/components/org/apache/jmeter/visualizers/MonitorHealthPanel.java
jakarta/jmeter/trunk/src/monitor/components/org/apache/jmeter/visualizers/MonitorPerformancePanel.java
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/config/gui/MultipartUrlConfigGui.java
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/config/gui/UrlConfigGui.java
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/HttpTestSampleGui.java
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/HttpTestSampleGui2.java
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/gui/AuthPanel.java
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/gui/HeaderPanel.java
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/modifier/gui/ParamModifierGui.java
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/accesslog/StandardGenerator.java
jakarta/jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/config/gui/JavaConfigGui.java
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/control/gui/ReportGui.java
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/gui/ReportMainFrame.java
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/BarChartGui.java
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/LineGraphGui.java
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/TableGui.java
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/writers/gui/HTMLReportWriterGui.java
Modified:
jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/DistributionGraph.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/DistributionGraph.java?rev=644247&r1=644246&r2=644247&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/DistributionGraph.java
(original)
+++
jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/DistributionGraph.java
Thu Apr 3 02:53:10 2008
@@ -80,7 +80,7 @@
setModel(model);
}
- public void init() {
+ private void init() {// called from ctor, so must not be overridable
repaint();
}
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/TextAreaEditor.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/TextAreaEditor.java?rev=644247&r1=644246&r2=644247&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/TextAreaEditor.java
(original)
+++
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/TextAreaEditor.java
Thu Apr 3 02:53:10 2008
@@ -57,7 +57,7 @@
}
- protected void init() {
+ private void init() {// called from ctor, so must not be overridable
textUI = new JTextArea();
textUI.addFocusListener(this);
textUI.setWrapStyleWord(true);
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/BeanShellInterpreter.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/BeanShellInterpreter.java?rev=644247&r1=644246&r2=644247&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/BeanShellInterpreter.java
(original)
+++
jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/BeanShellInterpreter.java
Thu Apr 3 02:53:10 2008
@@ -105,7 +105,8 @@
}
}
- public void init(final String initFile, final Object logger) throws
IOException, JMeterException {
+ // Called from ctor, so must be private (or final, but it does not seem
useful elsewhere)
+ private void init(final String initFile, final Object logger) throws
IOException, JMeterException {
if (logger != null) {// Do this before starting the script
try {
set("log", logger);//$NON-NLS-1$
Modified:
jakarta/jmeter/trunk/src/monitor/components/org/apache/jmeter/visualizers/MonitorHealthPanel.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/monitor/components/org/apache/jmeter/visualizers/MonitorHealthPanel.java?rev=644247&r1=644246&r2=644247&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/monitor/components/org/apache/jmeter/visualizers/MonitorHealthPanel.java
(original)
+++
jakarta/jmeter/trunk/src/monitor/components/org/apache/jmeter/visualizers/MonitorHealthPanel.java
Thu Apr 3 02:53:10 2008
@@ -76,7 +76,7 @@
* init is responsible for creating the necessary legends and
information
* for the health panel.
*/
- protected void init() {
+ private void init() {// called from ctor, so must not be overridable
this.setLayout(new BorderLayout());
ImageIcon legend = JMeterUtils.getImage("monitor-legend.gif");
//$NON-NLS-1$
JLabel label = new JLabel(legend);
Modified:
jakarta/jmeter/trunk/src/monitor/components/org/apache/jmeter/visualizers/MonitorPerformancePanel.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/monitor/components/org/apache/jmeter/visualizers/MonitorPerformancePanel.java?rev=644247&r1=644246&r2=644247&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/monitor/components/org/apache/jmeter/visualizers/MonitorPerformancePanel.java
(original)
+++
jakarta/jmeter/trunk/src/monitor/components/org/apache/jmeter/visualizers/MonitorPerformancePanel.java
Thu Apr 3 02:53:10 2008
@@ -119,7 +119,7 @@
* init() will create all the necessary swing panels, labels and icons
for
* the performance panel.
*/
- protected void init() {
+ private void init() {// called from ctor, so must not be overridable
ROOTSAMPLE = new SampleResult();
ROOTSAMPLE.setSampleLabel(SERVER_TITLE);
ROOTSAMPLE.setSuccessful(true);
Modified:
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/config/gui/MultipartUrlConfigGui.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/config/gui/MultipartUrlConfigGui.java?rev=644247&r1=644246&r2=644247&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/config/gui/MultipartUrlConfigGui.java
(original)
+++
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/config/gui/MultipartUrlConfigGui.java
Thu Apr 3 02:53:10 2008
@@ -59,8 +59,14 @@
public MultipartUrlConfigGui() {
super();
+ init();
}
+ public MultipartUrlConfigGui(boolean value) {
+ super(value);
+ init();
+ }
+
public TestElement createTestElement() {
TestElement ce = super.createTestElement();
@@ -111,7 +117,7 @@
}
}
- protected void init() {
+ private void init() {// called from ctor, so must not be overridable
this.setLayout(new BorderLayout());
// WEB SERVER PANEL
Modified:
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/config/gui/UrlConfigGui.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/config/gui/UrlConfigGui.java?rev=644247&r1=644246&r2=644247&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/config/gui/UrlConfigGui.java
(original)
+++
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/config/gui/UrlConfigGui.java
Thu Apr 3 02:53:10 2008
@@ -181,7 +181,7 @@
}
}
- protected void init() {
+ private void init() {// called from ctor, so must not be overridable
this.setLayout(new BorderLayout());
// WEB SERVER PANEL
Modified:
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/HttpTestSampleGui.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/HttpTestSampleGui.java?rev=644247&r1=644246&r2=644247&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/HttpTestSampleGui.java
(original)
+++
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/HttpTestSampleGui.java
Thu Apr 3 02:53:10 2008
@@ -99,7 +99,7 @@
return "web_testing_title"; // $NON-NLS-1$
}
- protected void init() {
+ private void init() {// called from ctor, so must not be overridable
setLayout(new BorderLayout(0, 5));
setBorder(makeBorder());
Modified:
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/HttpTestSampleGui2.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/HttpTestSampleGui2.java?rev=644247&r1=644246&r2=644247&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/HttpTestSampleGui2.java
(original)
+++
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/HttpTestSampleGui2.java
Thu Apr 3 02:53:10 2008
@@ -29,7 +29,7 @@
public class HttpTestSampleGui2 extends HttpTestSampleGui {
public HttpTestSampleGui2() {
- super.init();
+ super();
}
public TestElement createTestElement() {
Modified:
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/gui/AuthPanel.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/gui/AuthPanel.java?rev=644247&r1=644246&r2=644247&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/gui/AuthPanel.java
(original)
+++
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/gui/AuthPanel.java
Thu Apr 3 02:53:10 2008
@@ -139,7 +139,7 @@
/**
* Shows the main authentication panel for this object.
*/
- public void init() {
+ private void init() {// called from ctor, so must not be overridable
setLayout(new BorderLayout());
setBorder(makeBorder());
Modified:
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/gui/HeaderPanel.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/gui/HeaderPanel.java?rev=644247&r1=644246&r2=644247&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/gui/HeaderPanel.java
(original)
+++
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/gui/HeaderPanel.java
Thu Apr 3 02:53:10 2008
@@ -124,7 +124,7 @@
return "header_manager_title"; // $NON-NLS-1$
}
- public void init() {
+ private void init() {// called from ctor, so must not be overridable
setLayout(new BorderLayout());
setBorder(makeBorder());
Modified:
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/modifier/gui/ParamModifierGui.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/modifier/gui/ParamModifierGui.java?rev=644247&r1=644246&r2=644247&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/modifier/gui/ParamModifierGui.java
(original)
+++
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/modifier/gui/ParamModifierGui.java
Thu Apr 3 02:53:10 2008
@@ -144,7 +144,7 @@
}
}
- protected void init() {
+ private void init() {// called from ctor, so must not be overridable
setLayout(new BorderLayout());
setBorder(makeBorder());
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=644247&r1=644246&r2=644247&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
Thu Apr 3 02:53:10 2008
@@ -101,7 +101,7 @@
* <li> Writer</li>
* </ol>
*/
- protected void init() {
+ private void init() {// called from ctor, so must not be overridable
generateRequest();
}
Modified:
jakarta/jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/config/gui/JavaConfigGui.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/config/gui/JavaConfigGui.java?rev=644247&r1=644246&r2=644247&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/config/gui/JavaConfigGui.java
(original)
+++
jakarta/jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/config/gui/JavaConfigGui.java
Thu Apr 3 02:53:10 2008
@@ -96,7 +96,7 @@
/**
* Initialize the GUI components and layout.
*/
- protected void init() {
+ private void init() {// called from ctor, so must not be overridable
setLayout(new BorderLayout(0, 5));
if (displayName) {
Modified:
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/control/gui/ReportGui.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/reports/org/apache/jmeter/control/gui/ReportGui.java?rev=644247&r1=644246&r2=644247&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/control/gui/ReportGui.java
(original)
+++
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/control/gui/ReportGui.java
Thu Apr 3 02:53:10 2008
@@ -174,7 +174,7 @@
/**
* Initialize the components and layout of this component.
*/
- protected void init() {
+ private void init() {// called from ctor, so must not be overridable
setLayout(new BorderLayout(10, 10));
setBorder(makeBorder());
setBackground(Color.white);
Modified:
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/gui/ReportMainFrame.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/reports/org/apache/jmeter/gui/ReportMainFrame.java?rev=644247&r1=644246&r2=644247&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/reports/org/apache/jmeter/gui/ReportMainFrame.java
(original)
+++ jakarta/jmeter/trunk/src/reports/org/apache/jmeter/gui/ReportMainFrame.java
Thu Apr 3 02:53:10 2008
@@ -307,7 +307,7 @@
/**
* Create the GUI components and layout.
*/
- protected void init() {
+ private void init() {// called from ctor, so must not be overridable
menuBar = new ReportMenuBar();
setJMenuBar(menuBar);
Modified:
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/BarChartGui.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/BarChartGui.java?rev=644247&r1=644246&r2=644247&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/BarChartGui.java
(original)
+++
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/BarChartGui.java
Thu Apr 3 02:53:10 2008
@@ -69,7 +69,7 @@
return pop;
}
- protected void init() {
+ private void init() {// called from ctor, so must not be overridable
setLayout(new BorderLayout(10, 10));
setBorder(makeBorder());
setBackground(Color.white);
Modified:
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/LineGraphGui.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/LineGraphGui.java?rev=644247&r1=644246&r2=644247&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/LineGraphGui.java
(original)
+++
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/LineGraphGui.java
Thu Apr 3 02:53:10 2008
@@ -70,7 +70,7 @@
return pop;
}
- protected void init() {
+ private void init() {// called from ctor, so must not be overridable
setLayout(new BorderLayout(10, 10));
setBorder(makeBorder());
setBackground(Color.white);
Modified:
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/TableGui.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/TableGui.java?rev=644247&r1=644246&r2=644247&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/TableGui.java
(original)
+++ jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/TableGui.java
Thu Apr 3 02:53:10 2008
@@ -62,7 +62,7 @@
/**
* Initialize the components and layout of this component.
*/
- protected void init() {
+ private void init() {// called from ctor, so must not be overridable
setLayout(new BorderLayout(10, 10));
setBorder(makeBorder());
setBackground(Color.white);
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=644247&r1=644246&r2=644247&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
Thu Apr 3 02:53:10 2008
@@ -1,4 +1,3 @@
-//$Header$
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -59,7 +58,7 @@
/**
* init creates the necessary gui stuff.
*/
- public void init() {
+ private void init() {// called from ctor, so must not be overridable
setLayout(new BorderLayout(10, 10));
setBorder(makeBorder());
setBackground(Color.white);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
