mstover1 2005/09/01 10:21:07
Modified: src/core/org/apache/jmeter/gui/util Tag: rel-2-1
MenuFactory.java
src/core/org/apache/jmeter/testbeans/gui Tag: rel-2-1
TestBeanGUI.java
src/core/org/apache/jmeter/threads/gui Tag: rel-2-1
ThreadGroupGui.java
src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/config
Tag: rel-2-1 DataSourceElement.java
Log:
Fixing some bugs (like #36465)
Revision Changes Path
No revision
No revision
1.33.2.1 +3 -3
jakarta-jmeter/src/core/org/apache/jmeter/gui/util/MenuFactory.java
Index: MenuFactory.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/gui/util/MenuFactory.java,v
retrieving revision 1.33
retrieving revision 1.33.2.1
diff -u -r1.33 -r1.33.2.1
--- MenuFactory.java 12 Jul 2005 20:50:45 -0000 1.33
+++ MenuFactory.java 1 Sep 2005 17:21:06 -0000 1.33.2.1
@@ -81,7 +81,7 @@
// MENU_ADD_xxx - controls which items are in the ADD menu
// MENU_PARENT_xxx - controls which items are in the Insert Parent menu
private static final String[] MENU_ADD_CONTROLLER = new String[] {
MenuFactory.CONTROLLERS, MenuFactory.SAMPLERS,
- MenuFactory.CONFIG_ELEMENTS, MenuFactory.TIMERS,
MenuFactory.LISTENERS, MenuFactory.PRE_PROCESSORS,
+ MenuFactory.ASSERTIONS, MenuFactory.CONFIG_ELEMENTS,
MenuFactory.TIMERS, MenuFactory.LISTENERS, MenuFactory.PRE_PROCESSORS,
MenuFactory.POST_PROCESSORS };
private static final String[] MENU_PARENT_CONTROLLER = new String[] {
MenuFactory.CONTROLLERS };
No revision
No revision
1.22.2.1 +27 -4
jakarta-jmeter/src/core/org/apache/jmeter/testbeans/gui/TestBeanGUI.java
Index: TestBeanGUI.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/testbeans/gui/TestBeanGUI.java,v
retrieving revision 1.22
retrieving revision 1.22.2.1
diff -u -r1.22 -r1.22.2.1
--- TestBeanGUI.java 12 Jul 2005 20:51:01 -0000 1.22
+++ TestBeanGUI.java 1 Sep 2005 17:21:06 -0000 1.22.2.1
@@ -38,6 +38,7 @@
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;
@@ -48,6 +49,7 @@
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;
@@ -134,7 +136,7 @@
}
// Dummy for JUnit test
- public TestBeanGUI() {
+ TestBeanGUI() {
log.warn("Only for use in testing");
}
@@ -267,7 +269,28 @@
{
return MenuFactory.getDefaultTimerMenu();
}
- return MenuFactory.getDefaultControllerMenu();
+ else if(Sampler.class.isAssignableFrom(testBeanClass))
+ {
+ return MenuFactory.getDefaultSamplerMenu();
+ }
+ else if(ConfigTestElement.class.isAssignableFrom(testBeanClass))
+ {
+ return MenuFactory.getDefaultConfigElementMenu();
+ }
+ else if(Assertion.class.isAssignableFrom(testBeanClass))
+ {
+ return MenuFactory.getDefaultAssertionMenu();
+ }
+ else if(PostProcessor.class.isAssignableFrom(testBeanClass) ||
+ PreProcessor.class.isAssignableFrom(testBeanClass))
+ {
+ return MenuFactory.getDefaultExtractorMenu();
+ }
+ else
if(AbstractListenerElement.class.isAssignableFrom(testBeanClass))
+ {
+ return MenuFactory.getDefaultVisualizerMenu();
+ }
+ else return MenuFactory.getDefaultControllerMenu();
}
/*
No revision
No revision
1.29.2.1 +3 -3
jakarta-jmeter/src/core/org/apache/jmeter/threads/gui/ThreadGroupGui.java
Index: ThreadGroupGui.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/threads/gui/ThreadGroupGui.java,v
retrieving revision 1.29
retrieving revision 1.29.2.1
diff -u -r1.29 -r1.29.2.1
--- ThreadGroupGui.java 12 Jul 2005 20:50:48 -0000 1.29
+++ ThreadGroupGui.java 1 Sep 2005 17:21:06 -0000 1.29.2.1
@@ -180,7 +180,7 @@
public JPopupMenu createPopupMenu() {
JPopupMenu pop = new JPopupMenu();
pop.add(MenuFactory.makeMenus(new String[] {
MenuFactory.CONTROLLERS, MenuFactory.LISTENERS,
- MenuFactory.SAMPLERS, MenuFactory.TIMERS,
MenuFactory.CONFIG_ELEMENTS, MenuFactory.PRE_PROCESSORS,
+ MenuFactory.SAMPLERS,
MenuFactory.ASSERTIONS,MenuFactory.TIMERS, MenuFactory.CONFIG_ELEMENTS,
MenuFactory.PRE_PROCESSORS,
MenuFactory.POST_PROCESSORS },
JMeterUtils.getResString("Add"), "Add"));
MenuFactory.addEditMenu(pop, true);
MenuFactory.addFileMenu(pop);
No revision
No revision
1.6.2.1 +3 -0
jakarta-jmeter/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/config/DataSourceElement.java
Index: DataSourceElement.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/config/DataSourceElement.java,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -u -r1.6 -r1.6.2.1
--- DataSourceElement.java 12 Jul 2005 20:51:05 -0000 1.6
+++ DataSourceElement.java 1 Sep 2005 17:21:06 -0000 1.6.2.1
@@ -22,6 +22,7 @@
import org.apache.jmeter.config.ConfigElement;
import org.apache.jmeter.engine.event.LoopIterationEvent;
import org.apache.jmeter.testbeans.TestBean;
+import org.apache.jmeter.testbeans.TestBeanHelper;
import org.apache.jmeter.testelement.AbstractTestElement;
import org.apache.jmeter.testelement.TestListener;
import org.apache.jorphan.logging.LoggingManager;
@@ -89,6 +90,8 @@
public void testStarted() {
if (!started[0]) {
try {
+ this.setRunningVersion(true);
+ TestBeanHelper.prepare(this);
initPool();
} catch (Exception e) {
log.error("Unable to start database connection
pool.", e);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
