Author: sebb Date: Wed Feb 17 17:55:07 2010 New Revision: 911118 URL: http://svn.apache.org/viewvc?rev=911118&view=rev Log: Replace ComboBox with JTextField TODO: New screen layout needs to be fixed.
Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties jakarta/jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/mail/sampler/MailReaderSampler.java jakarta/jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/mail/sampler/gui/MailReaderSamplerGui.java jakarta/jmeter/trunk/xdocs/usermanual/component_reference.xml Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties?rev=911118&r1=911117&r2=911118&view=diff ============================================================================== --- jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties (original) +++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties Wed Feb 17 17:55:07 2010 @@ -458,15 +458,11 @@ mail_reader_all_messages=All mail_reader_delete=Delete messages from the server mail_reader_folder=Folder: -mail_reader_imap=IMAP -mail_reader_imaps=IMAPS mail_reader_num_messages=Number of messages to retrieve: mail_reader_password=Password: -mail_reader_pop3=POP3 -mail_reader_pop3s=POP3S -mail_reader_port=Port (optional): -mail_reader_server=Server: -mail_reader_server_type=Server Type: +mail_reader_port=Server Port (optional): +mail_reader_server=Server Host: +mail_reader_server_type=JavaMail Protocol (e.g. pop3, imaps): mail_reader_storemime=Store the message using MIME mail_reader_title=Mail Reader Sampler mail_sent=Mail sent successfully Modified: jakarta/jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/mail/sampler/MailReaderSampler.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/mail/sampler/MailReaderSampler.java?rev=911118&r1=911117&r2=911118&view=diff ============================================================================== --- jakarta/jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/mail/sampler/MailReaderSampler.java (original) +++ jakarta/jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/mail/sampler/MailReaderSampler.java Wed Feb 17 17:55:07 2010 @@ -66,21 +66,17 @@ private final static String NUM_MESSAGES = "num_messages"; // $NON-NLS-1$ private static final String NEW_LINE = "\n"; // $NON-NLS-1$ private final static String STORE_MIME_MESSAGE = "storeMimeMessage"; - - // Needed by GUI - public final static String TYPE_POP3 = "pop3"; // $NON-NLS-1$ - public final static String TYPE_POP3S = "pop3s"; // $NON-NLS-1$ - public final static String TYPE_IMAP = "imap"; // $NON-NLS-1$ - public final static String TYPE_IMAPS = "imaps"; // $NON-NLS-1$ //- + public static final String DEFAULT_PROTOCOL = "pop3"; // $NON-NLS-1$ + public static final int ALL_MESSAGES = -1; // special value private volatile boolean busy; public MailReaderSampler() { - setServerType(TYPE_POP3); - setFolder("INBOX"); + setServerType(DEFAULT_PROTOCOL); + setFolder("INBOX"); // $NON-NLS-1$ setNumMessages(ALL_MESSAGES); setDeleteMessages(false); } Modified: jakarta/jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/mail/sampler/gui/MailReaderSamplerGui.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/mail/sampler/gui/MailReaderSamplerGui.java?rev=911118&r1=911117&r2=911118&view=diff ============================================================================== --- jakarta/jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/mail/sampler/gui/MailReaderSamplerGui.java (original) +++ jakarta/jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/mail/sampler/gui/MailReaderSamplerGui.java Wed Feb 17 17:55:07 2010 @@ -19,11 +19,11 @@ import java.awt.event.ActionEvent; import java.awt.event.ActionListener; +import java.awt.event.FocusEvent; +import java.awt.event.FocusListener; import javax.swing.ButtonGroup; -import javax.swing.DefaultComboBoxModel; import javax.swing.JCheckBox; -import javax.swing.JComboBox; import javax.swing.JLabel; import javax.swing.JPanel; import javax.swing.JRadioButton; @@ -38,12 +38,12 @@ import org.apache.jmeter.util.JMeterUtils; import org.apache.jorphan.gui.layout.VerticalLayout; -public class MailReaderSamplerGui extends AbstractSamplerGui { +public class MailReaderSamplerGui extends AbstractSamplerGui implements ActionListener, FocusListener { private static final long serialVersionUID = 240L; // Gui Components - private JComboBox serverTypeBox; + private JTextField serverTypeBox; private JTextField serverBox; @@ -68,13 +68,6 @@ private JCheckBox storeMimeMessageBox; // Labels - don't make these static, else language change will not work - private final String POP3Label = JMeterUtils.getResString("mail_reader_pop3");// $NON-NLS-1$ - - private final String IMAPLabel = JMeterUtils.getResString("mail_reader_imap");// $NON-NLS-1$ - - private final String POP3SLabel = JMeterUtils.getResString("mail_reader_pop3s");// $NON-NLS-1$ - - private final String IMAPSLabel = JMeterUtils.getResString("mail_reader_imaps");// $NON-NLS-1$ private final String ServerTypeLabel = JMeterUtils.getResString("mail_reader_server_type");// $NON-NLS-1$ @@ -113,23 +106,8 @@ @Override public void configure(TestElement element) { MailReaderSampler mrs = (MailReaderSampler) element; - final String serverType = mrs.getServerType(); - if (serverType.equals(MailReaderSampler.TYPE_POP3)) { - serverTypeBox.setSelectedItem(POP3Label); - folderBox.setText(INBOX); - } else if (serverType.equals(MailReaderSampler.TYPE_POP3S)) { - serverTypeBox.setSelectedItem(POP3SLabel); - folderBox.setText(INBOX); - } else if (serverType.equals(MailReaderSampler.TYPE_IMAPS)) { - serverTypeBox.setSelectedItem(IMAPSLabel); - folderBox.setText(mrs.getFolder()); - } else if (serverType.equals(MailReaderSampler.TYPE_IMAP)) { - serverTypeBox.setSelectedItem(IMAPLabel); - folderBox.setText(mrs.getFolder()); - } else { - serverTypeBox.setSelectedItem(serverType); - folderBox.setText(mrs.getFolder()); - } + serverTypeBox.setText(mrs.getServerType()); + folderBox.setText(mrs.getFolder()); serverBox.setText(mrs.getServer()); portBox.setText(mrs.getPort()); usernameBox.setText(mrs.getUserName()); @@ -164,19 +142,7 @@ MailReaderSampler mrs = (MailReaderSampler) te; - final String item = (String) serverTypeBox.getSelectedItem(); - if (item.equals(POP3Label)) { - mrs.setServerType(MailReaderSampler.TYPE_POP3); - } else if (item.equals(POP3SLabel)){ - mrs.setServerType(MailReaderSampler.TYPE_POP3S); - } else if (item.equals(IMAPSLabel)){ - mrs.setServerType(MailReaderSampler.TYPE_IMAPS); - } else if (item.equals(IMAPLabel)){ - mrs.setServerType(MailReaderSampler.TYPE_IMAP); - } else { - mrs.setServerType(item); - } - + mrs.setServerType(serverTypeBox.getText()); mrs.setFolder(folderBox.getText()); mrs.setServer(serverBox.getText()); mrs.setPort(portBox.getText()); @@ -203,26 +169,9 @@ JPanel serverTypePanel = new JPanel(); serverTypePanel.add(new JLabel(ServerTypeLabel)); - DefaultComboBoxModel serverTypeModel = new DefaultComboBoxModel(); - serverTypeModel.addElement(POP3Label); - serverTypeModel.addElement(POP3SLabel); - serverTypeModel.addElement(IMAPLabel); - serverTypeModel.addElement(IMAPSLabel); - serverTypeBox = new JComboBox(serverTypeModel); - serverTypeBox.setEditable(true); - serverTypeBox.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent e) { - final String item = (String) serverTypeBox.getSelectedItem(); - if (item.equals(POP3Label)||item.equals(POP3SLabel)) { - folderLabel.setEnabled(false); - folderBox.setText(INBOX); - folderBox.setEnabled(false); - } else { - folderLabel.setEnabled(true); - folderBox.setEnabled(true); - } - } - }); + serverTypeBox = new JTextField(20); + serverTypeBox.addActionListener(this); + serverTypeBox.addFocusListener(this); serverTypePanel.add(serverTypeBox); add(serverTypePanel); @@ -300,15 +249,32 @@ private void initGui() { allMessagesButton.setSelected(true); - //someMessagesButton.setSelected(false); - //someMessagesField.setText("0"); deleteBox.setSelected(false); storeMimeMessageBox.setSelected(false); folderBox.setText(INBOX); - serverTypeBox.setSelectedIndex(0); + serverTypeBox.setText(MailReaderSampler.DEFAULT_PROTOCOL); passwordBox.setText("");// $NON-NLS-1$ serverBox.setText("");// $NON-NLS-1$ portBox.setText("");// $NON-NLS-1$ usernameBox.setText("");// $NON-NLS-1$ } + + public void actionPerformed(ActionEvent e) { + final String item = serverTypeBox.getText(); + if (item.equals("pop3")||item.equals("pop3s")) { + folderLabel.setEnabled(false); + folderBox.setText(INBOX); + folderBox.setEnabled(false); + } else { + folderLabel.setEnabled(true); + folderBox.setEnabled(true); + } + } + + public void focusGained(FocusEvent e) { + } + + public void focusLost(FocusEvent e) { + actionPerformed(null); + } } Modified: jakarta/jmeter/trunk/xdocs/usermanual/component_reference.xml URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/xdocs/usermanual/component_reference.xml?rev=911118&r1=911117&r2=911118&view=diff ============================================================================== --- jakarta/jmeter/trunk/xdocs/usermanual/component_reference.xml (original) +++ jakarta/jmeter/trunk/xdocs/usermanual/component_reference.xml Wed Feb 17 17:55:07 2010 @@ -1326,9 +1326,10 @@ </description> <properties> <property name="Name" required="">Descriptive name for this element that is shown in the tree.</property> -<property name="Server Type" required="Yes">The protocol used by the server: POP3, POP3S, IMAP, IMAPS -or another string representing the server type. +<property name="Server Type" required="Yes">The protocol used by the provider: e.g. pop3, pop3s, imap, imaps. +or another string representing the server protocol. For example <code>file</code> for use with the read-only mail file provider. +The actual provider names for POP3 and IMAP are <code>pop3</code> and <code>imap</code> </property> <property name="Server" required="Yes">Hostname or IP address of the server</property> <property name="Port" required="No">Port to be used to connect to the server (optional)</property> --------------------------------------------------------------------- To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org