jmeter-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fschumac...@apache.org
Subject svn commit: r1779811 - in /jmeter/trunk/src/protocol: ldap/org/apache/jmeter/protocol/ldap/sampler/LDAPExtSampler.java mail/org/apache/jmeter/protocol/smtp/sampler/gui/SmtpPanel.java
Date Sun, 22 Jan 2017 13:17:14 GMT
Author: fschumacher
Date: Sun Jan 22 13:17:13 2017
New Revision: 1779811

URL: http://svn.apache.org/viewvc?rev=1779811&view=rev
Log:
Utilised Java 8 (and 7) features to tidy up code. Formatting and minor tweaks. Contributed
by Graham Russell (graham at ham1.co.uk). Part 7/8 of github pr #255

Modified:
    jmeter/trunk/src/protocol/ldap/org/apache/jmeter/protocol/ldap/sampler/LDAPExtSampler.java
    jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/smtp/sampler/gui/SmtpPanel.java

Modified: jmeter/trunk/src/protocol/ldap/org/apache/jmeter/protocol/ldap/sampler/LDAPExtSampler.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/ldap/org/apache/jmeter/protocol/ldap/sampler/LDAPExtSampler.java?rev=1779811&r1=1779810&r2=1779811&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/ldap/org/apache/jmeter/protocol/ldap/sampler/LDAPExtSampler.java
(original)
+++ jmeter/trunk/src/protocol/ldap/org/apache/jmeter/protocol/ldap/sampler/LDAPExtSampler.java
Sun Jan 22 13:17:13 2017
@@ -978,8 +978,7 @@ public class LDAPExtSampler extends Abst
             }
 
             @Override
-            public int compare(SearchResult o1, SearchResult o2)
-            {
+            public int compare(SearchResult o1, SearchResult o2) {
                 String nm1 = o1.getName();
                 String nm2 = o2.getName();
 

Modified: jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/smtp/sampler/gui/SmtpPanel.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/smtp/sampler/gui/SmtpPanel.java?rev=1779811&r1=1779810&r2=1779811&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/smtp/sampler/gui/SmtpPanel.java
(original)
+++ jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/smtp/sampler/gui/SmtpPanel.java
Sun Jan 22 13:17:13 2017
@@ -384,7 +384,6 @@ public class SmtpPanel extends JPanel {
         tfAuthUsername.setEditable(selected); // ensure correctly set on initial display
     }
 
-
     public boolean isEnableDebug() {
         return cbEnableDebug.isSelected();
     }
@@ -393,8 +392,6 @@ public class SmtpPanel extends JPanel {
         cbEnableDebug.setSelected(selected);
     }
 
-
-
     /**
      * Returns if an .eml-message is sent instead of the content of message-text
      * area
@@ -902,8 +899,6 @@ public class SmtpPanel extends JPanel {
         tfAuthPassword.setEditable(cbUseAuth.isSelected());
     }
 
-
-
     /**
      * ActionPerformed-method for filechoser "attachmentFileChoser", creates
      * FileChoser-Object
@@ -913,18 +908,17 @@ public class SmtpPanel extends JPanel {
      */
     private void attachmentFolderFileChooserActionPerformed(ActionEvent evt) {
         File chosen = attachmentFileChooser.getSelectedFile();
-        if (chosen == null){
+        if (chosen == null) {
             return;
         }
         final String attachments = tfAttachment.getText().trim();
-        if (null != attachments && attachments.length() > 0) {
+        if (attachments.length() > 0) {
             tfAttachment.setText(attachments
                             + SmtpSampler.FILENAME_SEPARATOR
                             + chosen.getAbsolutePath());
         } else {
             tfAttachment.setText(chosen.getAbsolutePath());
         }
-
     }
 
     /**
@@ -986,8 +980,6 @@ public class SmtpPanel extends JPanel {
         emlFileChooser.showOpenDialog(this);
     }
 
-
-
     /**
      * Reset all the Gui fields.
      */



Mime
View raw message