sebb 2005/04/27 15:45:53
Modified: src/protocol/jms/org/apache/jmeter/protocol/jms/control/gui
JMSConfigGui.java
Log:
Fix class so it works as a Config item.
TODO - are all fields needed on config GUI?
Revision Changes Path
1.4 +27 -19
jakarta-jmeter/src/protocol/jms/org/apache/jmeter/protocol/jms/control/gui/JMSConfigGui.java
Index: JMSConfigGui.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/protocol/jms/org/apache/jmeter/protocol/jms/control/gui/JMSConfigGui.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- JMSConfigGui.java 24 Apr 2005 19:19:32 -0000 1.3
+++ JMSConfigGui.java 27 Apr 2005 22:45:53 -0000 1.4
@@ -20,11 +20,13 @@
import java.awt.BorderLayout;
import javax.swing.BorderFactory;
+import javax.swing.Box;
import javax.swing.JComboBox;
import javax.swing.JPanel;
import org.apache.jmeter.config.Arguments;
import org.apache.jmeter.config.ConfigTestElement;
+import org.apache.jmeter.config.gui.AbstractConfigGui;
import org.apache.jmeter.config.gui.ArgumentsPanel;
import org.apache.jmeter.protocol.jms.sampler.JMSSampler;
import org.apache.jmeter.testelement.TestElement;
@@ -43,7 +45,7 @@
* @author Martijn Blankestijn
* @version $Id$
*/
-public class JMSConfigGui extends JPanel {
+public class JMSConfigGui extends AbstractConfigGui {
private JLabeledTextField queueuConnectionFactory =
new
JLabeledTextField(JMeterUtils.getResString("jms_queue_connection_factory"));
@@ -74,15 +76,6 @@
}
/**
- * @param element
- */
- protected void configureTestElement(TestElement element) {
- element.setProperty(TestElement.NAME, getName());
- element.setProperty(TestElement.GUI_CLASS,
this.getClass().getName());
- element.setProperty(TestElement.TEST_CLASS,
element.getClass().getName());
- }
-
- /**
* Clears all fields.
*/
public void clear() {
@@ -99,13 +92,19 @@
jndiPropertiesPanel.clear();
}
+ public TestElement createTestElement()
+ {
+ ConfigTestElement element = new ConfigTestElement();
+ modifyTestElement(element);
+ return element;
+ }
+
/**
* @return
*/
- public TestElement createTestElement() {
- ConfigTestElement element = new ConfigTestElement();
+ public void modifyTestElement(TestElement element) {
+ super.configureTestElement(element);
- this.configureTestElement(element);
element.setProperty(
JMSSampler.QUEUE_CONNECTION_FACTORY_JNDI,
queueuConnectionFactory.getText());
@@ -127,14 +126,13 @@
Arguments args = (Arguments)
jmsPropertiesPanel.createTestElement();
element.setProperty(new
TestElementProperty(JMSSampler.JMS_PROPERTIES, args));
- return element;
}
/**
* @param el
*/
public void configure(TestElement el) {
- setName(el.getPropertyAsString(TestElement.NAME));
+ super.configure(el);
queueuConnectionFactory.setText(
el.getPropertyAsString(JMSSampler.QUEUE_CONNECTION_FACTORY_JNDI));
sendQueue.setText(el.getPropertyAsString(JMSSampler.SEND_QUEUE));
@@ -168,6 +166,10 @@
*/
private void init() {
setLayout(new BorderLayout());
+ setBorder(makeBorder());
+ add(makeTitlePanel(), BorderLayout.NORTH);
+
+ Box mainPanel = Box.createVerticalBox();
JPanel jmsQueueingPanel = new JPanel(new BorderLayout());
jmsQueueingPanel.setBorder(
@@ -213,9 +215,11 @@
jmsPropertiesPanel = new
ArgumentsPanel(JMeterUtils.getResString("jms_props"));
messagePanel.add(jmsPropertiesPanel, BorderLayout.SOUTH);
- add(jmsQueueingPanel, BorderLayout.NORTH);
- add(messagePanel, BorderLayout.CENTER);
- add(jndiPanel, BorderLayout.SOUTH);
+ mainPanel.add(jmsQueueingPanel, BorderLayout.NORTH);
+ mainPanel.add(messagePanel, BorderLayout.CENTER);
+ mainPanel.add(jndiPanel, BorderLayout.SOUTH);
+
+ add(mainPanel, BorderLayout.CENTER);
}
/**
@@ -242,4 +246,8 @@
return jndiPanel;
}
+ public String getLabelResource() {
+ return "jms_config_title";// TODO - probably wrong
+ }
+
}
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
