You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by se...@apache.org on 2016/01/14 22:55:19 UTC

svn commit: r1724700 - in /jmeter/trunk/src: core/org/apache/jmeter/config/gui/ArgumentsPanel.java protocol/http/org/apache/jmeter/protocol/http/gui/HTTPArgumentsPanel.java

Author: sebb
Date: Thu Jan 14 21:55:19 2016
New Revision: 1724700

URL: http://svn.apache.org/viewvc?rev=1724700&view=rev
Log:
Methods called from ctor must not be overridden. Fix due to Felix.
Bugzilla Id: 58860

Modified:
    jmeter/trunk/src/core/org/apache/jmeter/config/gui/ArgumentsPanel.java
    jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/gui/HTTPArgumentsPanel.java

Modified: jmeter/trunk/src/core/org/apache/jmeter/config/gui/ArgumentsPanel.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/config/gui/ArgumentsPanel.java?rev=1724700&r1=1724699&r2=1724700&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/config/gui/ArgumentsPanel.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/config/gui/ArgumentsPanel.java Thu Jan 14 21:55:19 2016
@@ -680,7 +680,7 @@ public class ArgumentsPanel extends Abst
     /**
      * Initialize the components and layout of this component.
      */
-    protected void init() {
+    private void init() { // WARNING: called from ctor so must not be overridden (i.e. must be private or final)
         JPanel p = this;
 
         if (standalone) {

Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/gui/HTTPArgumentsPanel.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/gui/HTTPArgumentsPanel.java?rev=1724700&r1=1724699&r2=1724700&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/gui/HTTPArgumentsPanel.java (original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/gui/HTTPArgumentsPanel.java Thu Jan 14 21:55:19 2016
@@ -92,6 +92,7 @@ public class HTTPArgumentsPanel extends
 
     public HTTPArgumentsPanel() {
         super(JMeterUtils.getResString("paramtable")); //$NON-NLS-1$
+        init();
     }
 
     @Override
@@ -166,9 +167,7 @@ public class HTTPArgumentsPanel extends
         return argument;
     }
 
-    @Override
-    protected void init() {
-        super.init();
+    private void init() { // WARNING: called from ctor so must not be overridden (i.e. must be private or final)
         
         // register the right click menu
         JTable table = getTable();