You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@jakarta.apache.org by se...@apache.org on 2010/07/03 13:14:06 UTC
svn commit: r960199 -
/jakarta/jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/smtp/sampler/gui/SmtpPanel.java
Author: sebb
Date: Sat Jul 3 11:14:06 2010
New Revision: 960199
URL: http://svn.apache.org/viewvc?rev=960199&view=rev
Log:
cbTrustAllCerts and cbUseLocalTrustSTore are mutually exclusive
Modified:
jakarta/jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/smtp/sampler/gui/SmtpPanel.java
Modified: jakarta/jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/smtp/sampler/gui/SmtpPanel.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/smtp/sampler/gui/SmtpPanel.java?rev=960199&r1=960198&r2=960199&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/smtp/sampler/gui/SmtpPanel.java (original)
+++ jakarta/jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/smtp/sampler/gui/SmtpPanel.java Sat Jul 3 11:14:06 2010
@@ -772,6 +772,11 @@ public class SmtpPanel extends JPanel {
cbTrustAllCerts.setMargin(new java.awt.Insets(0, 0, 0, 0));
cbTrustAllCerts.setEnabled(false);
cbTrustAllCerts.setToolTipText(JMeterUtils.getResString("smtp_trustall_tooltip")); // $NON-NLS-1$
+ cbTrustAllCerts.addActionListener(new ActionListener() {
+ public void actionPerformed(ActionEvent evt) {
+ cbTrustAllCertsActionPerformed(evt);
+ }
+ });
gridBagConstraints.gridx = 1;
gridBagConstraints.gridy = 1;
@@ -926,7 +931,7 @@ public class SmtpPanel extends JPanel {
* ActionPerformed-method for checkbox "useAuth"
*
* @param evt
- * ActionEvent to be handeled
+ * ActionEvent to be handled
*/
private void cbUseAuthActionPerformed(ActionEvent evt) {
tfAuthUsername.setEditable(cbUseAuth.isSelected());
@@ -937,7 +942,7 @@ public class SmtpPanel extends JPanel {
* ActionPerformed-method for checkbox "useLocalTrustStore"
*
* @param evt
- * ActionEvent to be handeled
+ * ActionEvent to be handled
*/
private void cbUseLocalTrustStoreActionPerformed(
ActionEvent evt) {
@@ -949,6 +954,21 @@ public class SmtpPanel extends JPanel {
}
/**
+ * ActionPerformed-method for checkbox "cbTrustAllCerts"
+ *
+ * @param evt
+ * ActionEvent to be handled
+ */
+ private void cbTrustAllCertsActionPerformed(
+ ActionEvent evt) {
+ final boolean selected = cbTrustAllCerts.isSelected();
+ if (selected) {
+ cbUseLocalTrustStore.setSelected(false); // not compatible
+ tfTrustStoreToUse.setEditable(false); // must follow the checkbox setting
+ }
+ }
+
+ /**
* ActionPerformed-method for filechoser "attachmentFileChoser", creates
* FileChoser-Object
*
@@ -973,7 +993,7 @@ public class SmtpPanel extends JPanel {
* ActionPerformed-method for button "browseButton", opens FileDialog-Object
*
* @param evt
- * ActionEvent to be handeled
+ * ActionEvent to be handled
*/
private void browseButtonActionPerformed(ActionEvent evt) {
attachmentFileChooser.showOpenDialog(this);
@@ -1012,7 +1032,7 @@ public class SmtpPanel extends JPanel {
* FileChoser-Object
*
* @param evt
- * ActionEvent to be handeled
+ * ActionEvent to be handled
*/
private void emlFileChooserActionPerformed(ActionEvent evt) {
tfEmlMessage.setText(emlFileChooser.getSelectedFile().getAbsolutePath());
@@ -1022,7 +1042,7 @@ public class SmtpPanel extends JPanel {
* ActionPerformed-method for button "emlButton", opens FileDialog-Object
*
* @param evt
- * ActionEvent to be handeled
+ * ActionEvent to be handled
*/
private void emlBrowseButtonActionPerformed(ActionEvent evt) {
emlFileChooser.showOpenDialog(this);
@@ -1033,7 +1053,7 @@ public class SmtpPanel extends JPanel {
* header
*
* @param evt
- * ActionEvent to be handeled
+ * ActionEvent to be handled
*/
private void cbEnforceStartTLSActionPerformed(ActionEvent evt) {
}
@@ -1042,7 +1062,7 @@ public class SmtpPanel extends JPanel {
* ItemStateChanged-method for radiobutton "securitySettings"
*
* @param evt
- * ItemEvent to be handeled
+ * ItemEvent to be handled
*/
private void rbSecuritySettingsItemStateChanged(ItemEvent evt) {
final Object source = evt.getSource();
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@jakarta.apache.org
For additional commands, e-mail: notifications-help@jakarta.apache.org