svn commit: r672060 - /jakarta/jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/TestBeanGUI.java

[se...@apache.org]

Author: sebb
Date: Thu Jun 26 17:27:24 2008
New Revision: 672060

URL: http://svn.apache.org/viewvc?rev=672060&view=rev
Log:
Correct menu popup for Listeners

Modified:
    jakarta/jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/TestBeanGUI.java

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=672060&r1=672059&r2=672060&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 Thu Jun 26 17:27:24 2008
@@ -49,7 +49,6 @@
 import org.apache.jmeter.processor.PreProcessor;
 import org.apache.jmeter.processor.gui.AbstractPostProcessorGui;
 import org.apache.jmeter.processor.gui.AbstractPreProcessorGui;
-import org.apache.jmeter.reporters.AbstractListenerElement;
 import org.apache.jmeter.samplers.Sampler;
 import org.apache.jmeter.samplers.gui.AbstractSamplerGui;
 import org.apache.jmeter.testbeans.BeanInfoSupport;
@@ -89,11 +88,11 @@
 public class TestBeanGUI extends AbstractJMeterGuiComponent implements JMeterGUIComponent {
 	private static final Logger log = LoggingManager.getLoggerForClass();
 
-	private Class testBeanClass;
+	private final Class testBeanClass;
 
 	private transient BeanInfo beanInfo;
 
-	private Class customizerClass;
+	private final Class customizerClass;
 
 	/**
 	 * The single customizer if the customizer class implements
@@ -107,7 +106,7 @@
 	 * needs to be limited, though, to avoid memory issues when editing very
 	 * large test plans.
 	 */
-	private Map customizers = new LRUMap(20);
+	private final Map customizers = new LRUMap(20);
 
 	/**
 	 * Index of the customizer in the JPanel's child component list:
@@ -117,7 +116,7 @@
 	/**
 	 * The property name to value map that the active customizer edits:
 	 */
-	private Map propertyMap = new HashMap();
+	private final Map propertyMap = new HashMap();
 
 	/**
 	 * Whether the GUI components have been created.
@@ -138,6 +137,8 @@
 	// Dummy for JUnit test
 	public TestBeanGUI() {
 		log.warn("Constructor only for use in testing");// $NON-NLS-1$
+		testBeanClass = null;
+		customizerClass = null;
 	}
 
 	public TestBeanGUI(Class testBeanClass) {
@@ -268,10 +269,7 @@
 	 * @see org.apache.jmeter.gui.JMeterGUIComponent#createPopupMenu()
 	 */
 	public JPopupMenu createPopupMenu() {
-		// TODO: this menu is too wide (allows, e.g. to add controllers, no
-		// matter what the type of the element).
-        // Change to match the actual bean's capabilities.
-		if (Timer.class.isAssignableFrom(testBeanClass))// HACK: Fix one such problem
+		if (Timer.class.isAssignableFrom(testBeanClass))
 		{
 			return MenuFactory.getDefaultTimerMenu();
 		}
@@ -292,7 +290,7 @@
         {
             return MenuFactory.getDefaultExtractorMenu();
         }
-        else if(AbstractListenerElement.class.isAssignableFrom(testBeanClass))
+        else if(Visualizer.class.isAssignableFrom(testBeanClass))
         {
             return MenuFactory.getDefaultVisualizerMenu();
         }



---------------------------------------------------------------------
To unsubscribe, e-mail: jmeter-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-help@jakarta.apache.org