Author: sebb Date: Tue Sep 22 16:49:31 2009 New Revision: 817724 URL: http://svn.apache.org/viewvc?rev=817724&view=rev Log: Disallow adding any child elements to JDBC Configuration TestBeanGUI was using ConfigTestElement instead of ConfigElement Also don't default to sampler menu if type not recognised
Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/util/MenuFactory.java jakarta/jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/TestBeanGUI.java jakarta/jmeter/trunk/xdocs/changes.xml Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/util/MenuFactory.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/util/MenuFactory.java?rev=817724&r1=817723&r2=817724&view=diff ============================================================================== --- jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/util/MenuFactory.java (original) +++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/util/MenuFactory.java Tue Sep 22 16:49:31 2009 @@ -283,6 +283,13 @@ return pop; } + public static JPopupMenu getDefaultMenu() { // if type is unknown + JPopupMenu pop = new JPopupMenu(); + MenuFactory.addEditMenu(pop, true); + MenuFactory.addFileMenu(pop); + return pop; + } + /** * Create a menu from a menu category. * Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/TestBeanGUI.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/TestBeanGUI.java?rev=817724&r1=817723&r2=817724&view=diff ============================================================================== --- jakarta/jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/TestBeanGUI.java (original) +++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/TestBeanGUI.java Tue Sep 22 16:49:31 2009 @@ -38,7 +38,6 @@ import org.apache.jmeter.assertions.Assertion; import org.apache.jmeter.assertions.gui.AbstractAssertionGui; import org.apache.jmeter.config.ConfigElement; -import org.apache.jmeter.config.ConfigTestElement; import org.apache.jmeter.config.gui.AbstractConfigGui; import org.apache.jmeter.control.Controller; import org.apache.jmeter.control.gui.AbstractControllerGui; @@ -279,7 +278,7 @@ { return MenuFactory.getDefaultSamplerMenu(); } - else if(ConfigTestElement.class.isAssignableFrom(testBeanClass)) + else if(ConfigElement.class.isAssignableFrom(testBeanClass)) { return MenuFactory.getDefaultConfigElementMenu(); } @@ -296,9 +295,14 @@ { return MenuFactory.getDefaultVisualizerMenu(); } - else { + else if(Controller.class.isAssignableFrom(testBeanClass)) + { return MenuFactory.getDefaultControllerMenu(); } + else { + log.warn("Cannot determine PopupMenu for "+testBeanClass.getName()); + return MenuFactory.getDefaultMenu(); + } } /* Modified: jakarta/jmeter/trunk/xdocs/changes.xml URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/xdocs/changes.xml?rev=817724&r1=817723&r2=817724&view=diff ============================================================================== --- jakarta/jmeter/trunk/xdocs/changes.xml (original) +++ jakarta/jmeter/trunk/xdocs/changes.xml Tue Sep 22 16:49:31 2009 @@ -101,6 +101,7 @@ <h3>General</h3> <ul> <li>Bug 47646 - NullPointerException in the "Random Variable" element</li> +<li>Disallow adding any child elements to JDBC Configuration</li> </ul> <!-- ==================================================== --> --------------------------------------------------------------------- To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org