You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by fs...@apache.org on 2019/08/25 19:48:15 UTC
[jmeter] branch master updated (adb6993 -> 8c47aaa)
This is an automated email from the ASF dual-hosted git repository.
fschumacher pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/jmeter.git.
from adb6993 Use log string formatting
new 66b90bf Make inner class static
new 8c9328c Use Map#entrySet instead of keySet
new 8c47aaa Move JLabel fields to method variables
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../gui/action/template/TemplateManager.java | 2 +-
.../report/dashboard/HtmlTemplateExporter.java | 4 +-
.../report/processor/CsvFileSampleSource.java | 2 +-
.../protocol/smtp/sampler/gui/SmtpPanel.java | 54 ++++++++--------------
4 files changed, 23 insertions(+), 39 deletions(-)
[jmeter] 01/03: Make inner class static
Posted by fs...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
fschumacher pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jmeter.git
commit 66b90bf6b33094d4b1b1146435ecdccc6592e8dc
Author: Felix Schumacher <fe...@internetallee.de>
AuthorDate: Sun Aug 25 21:19:29 2019 +0200
Make inner class static
---
.../java/org/apache/jmeter/gui/action/template/TemplateManager.java | 2 +-
.../java/org/apache/jmeter/report/dashboard/HtmlTemplateExporter.java | 4 ++--
.../java/org/apache/jmeter/report/processor/CsvFileSampleSource.java | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/action/template/TemplateManager.java b/src/core/src/main/java/org/apache/jmeter/gui/action/template/TemplateManager.java
index 637e7c8..4c1699d 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/action/template/TemplateManager.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/action/template/TemplateManager.java
@@ -123,7 +123,7 @@ public class TemplateManager {
return temps;
}
- public final class LoggingErrorHandler implements ErrorHandler {
+ public static final class LoggingErrorHandler implements ErrorHandler {
private Logger logger;
private File file;
diff --git a/src/core/src/main/java/org/apache/jmeter/report/dashboard/HtmlTemplateExporter.java b/src/core/src/main/java/org/apache/jmeter/report/dashboard/HtmlTemplateExporter.java
index bd9d3bd..acd8515 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/dashboard/HtmlTemplateExporter.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/dashboard/HtmlTemplateExporter.java
@@ -124,7 +124,7 @@ public class HtmlTemplateExporter extends AbstractDataExporter {
* This class allows to inject graph_options properties to the exported data
*
*/
- private class ExtraOptionsResultCustomizer implements ResultCustomizer {
+ private static class ExtraOptionsResultCustomizer implements ResultCustomizer {
private SubConfiguration extraOptions;
/**
@@ -173,7 +173,7 @@ public class HtmlTemplateExporter extends AbstractDataExporter {
* This class allows to detect empty graphs
*
*/
- private class EmptyGraphChecker implements ResultChecker {
+ private static class EmptyGraphChecker implements ResultChecker {
private final boolean filtersOnlySampleSeries;
private final boolean showControllerSeriesOnly;
diff --git a/src/core/src/main/java/org/apache/jmeter/report/processor/CsvFileSampleSource.java b/src/core/src/main/java/org/apache/jmeter/report/processor/CsvFileSampleSource.java
index 57b737c..c486480 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/processor/CsvFileSampleSource.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/processor/CsvFileSampleSource.java
@@ -238,7 +238,7 @@ public class CsvFileSampleSource extends AbstractSampleSource {
produce();
}
- private class PrivateProducer extends AbstractSampleProcessor implements
+ private static class PrivateProducer extends AbstractSampleProcessor implements
SampleProducer {
private List<SampleConsumer> sampleConsumers = new ArrayList<>();
[jmeter] 03/03: Move JLabel fields to method variables
Posted by fs...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
fschumacher pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jmeter.git
commit 8c47aaad89cf8e3cbd202973d07c7e5fcee948b5
Author: Felix Schumacher <fe...@internetallee.de>
AuthorDate: Sun Aug 25 21:41:23 2019 +0200
Move JLabel fields to method variables
---
.../protocol/smtp/sampler/gui/SmtpPanel.java | 48 ++++++++--------------
1 file changed, 16 insertions(+), 32 deletions(-)
diff --git a/src/protocol/mail/src/main/java/org/apache/jmeter/protocol/smtp/sampler/gui/SmtpPanel.java b/src/protocol/mail/src/main/java/org/apache/jmeter/protocol/smtp/sampler/gui/SmtpPanel.java
index 6381d2b..8178082 100644
--- a/src/protocol/mail/src/main/java/org/apache/jmeter/protocol/smtp/sampler/gui/SmtpPanel.java
+++ b/src/protocol/mail/src/main/java/org/apache/jmeter/protocol/smtp/sampler/gui/SmtpPanel.java
@@ -52,7 +52,7 @@ import org.apache.jmeter.util.JMeterUtils;
*/
public class SmtpPanel extends JPanel {
- private static final long serialVersionUID = 1L;
+ private static final long serialVersionUID = 2L;
// local vars
private JTextField tfMailFrom;
@@ -72,22 +72,6 @@ public class SmtpPanel extends JPanel {
private JTextArea taMessage;
private JCheckBox cbPlainBody;
- private JLabel jlAddressFrom;
- private JLabel jlAddressReplyTo;
- private JLabel jlAddressTo;
- private JLabel jlAddressToCC;
- private JLabel jlAddressToBCC;
- private JLabel jlMailServerPort;
- private JLabel jlMailServerTimeout;
- private JLabel jlMailServerConnectionTimeout;
- private JLabel jlMailServer;
- private JLabel jlAttachFile;
- private JLabel jlDutPortStandard;
- private JLabel jlPassword;
- private JLabel jlSubject;
- private JLabel jlUsername;
- private JLabel jlMessage;
-
private JFileChooser attachmentFileChooser;
private JFileChooser emlFileChooser;
private JTextField tfAuthPassword;
@@ -528,21 +512,21 @@ public class SmtpPanel extends JPanel {
* Main method of class, builds all gui-components for SMTP-sampler.
*/
private void initComponents() {
- jlAddressReplyTo = new JLabel(JMeterUtils.getResString("smtp_replyto")); // $NON-NLS-1$
- jlAddressFrom = new JLabel(JMeterUtils.getResString("smtp_from")); // $NON-NLS-1$
- jlAddressTo = new JLabel(JMeterUtils.getResString("smtp_to")); // $NON-NLS-1$
- jlAddressToCC = new JLabel(JMeterUtils.getResString("smtp_cc")); // $NON-NLS-1$
- jlAddressToBCC = new JLabel(JMeterUtils.getResString("smtp_bcc")); // $NON-NLS-1$
- jlMailServerPort = new JLabel(JMeterUtils.getResString("smtp_server_port")); // $NON-NLS-1$
- jlMailServer = new JLabel(JMeterUtils.getResString("smtp_server")); // $NON-NLS-1$
- jlMailServerTimeout = new JLabel(JMeterUtils.getResString("smtp_server_timeout")); // $NON-NLS-1$
- jlMailServerConnectionTimeout = new JLabel(JMeterUtils.getResString("smtp_server_connection_timeout")); // $NON-NLS-1$
- jlAttachFile = new JLabel(JMeterUtils.getResString("smtp_attach_file")); // $NON-NLS-1$
- jlDutPortStandard = new JLabel(JMeterUtils.getResString("smtp_default_port")); // $NON-NLS-1$
- jlUsername = new JLabel(JMeterUtils.getResString("smtp_username")); // $NON-NLS-1$
- jlPassword = new JLabel(JMeterUtils.getResString("smtp_password")); // $NON-NLS-1$
- jlSubject = new JLabel(JMeterUtils.getResString("smtp_subject")); // $NON-NLS-1$
- jlMessage = new JLabel(JMeterUtils.getResString("smtp_message")); // $NON-NLS-1$
+ JLabel jlAddressReplyTo = new JLabel(JMeterUtils.getResString("smtp_replyto")); // $NON-NLS-1$
+ JLabel jlAddressFrom = new JLabel(JMeterUtils.getResString("smtp_from")); // $NON-NLS-1$
+ JLabel jlAddressTo = new JLabel(JMeterUtils.getResString("smtp_to")); // $NON-NLS-1$
+ JLabel jlAddressToCC = new JLabel(JMeterUtils.getResString("smtp_cc")); // $NON-NLS-1$
+ JLabel jlAddressToBCC = new JLabel(JMeterUtils.getResString("smtp_bcc")); // $NON-NLS-1$
+ JLabel jlMailServerPort = new JLabel(JMeterUtils.getResString("smtp_server_port")); // $NON-NLS-1$
+ JLabel jlMailServer = new JLabel(JMeterUtils.getResString("smtp_server")); // $NON-NLS-1$
+ JLabel jlMailServerTimeout = new JLabel(JMeterUtils.getResString("smtp_server_timeout")); // $NON-NLS-1$
+ JLabel jlMailServerConnectionTimeout = new JLabel(JMeterUtils.getResString("smtp_server_connection_timeout")); // $NON-NLS-1$
+ JLabel jlAttachFile = new JLabel(JMeterUtils.getResString("smtp_attach_file")); // $NON-NLS-1$
+ JLabel jlDutPortStandard = new JLabel(JMeterUtils.getResString("smtp_default_port")); // $NON-NLS-1$
+ JLabel jlUsername = new JLabel(JMeterUtils.getResString("smtp_username")); // $NON-NLS-1$
+ JLabel jlPassword = new JLabel(JMeterUtils.getResString("smtp_password")); // $NON-NLS-1$
+ JLabel jlSubject = new JLabel(JMeterUtils.getResString("smtp_subject")); // $NON-NLS-1$
+ JLabel jlMessage = new JLabel(JMeterUtils.getResString("smtp_message")); // $NON-NLS-1$
tfMailServer = new JTextField(30);
tfMailServerPort = new JTextField(6);
[jmeter] 02/03: Use Map#entrySet instead of keySet
Posted by fs...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
fschumacher pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jmeter.git
commit 8c9328ca6c0ba59a80ba96d96a3d0f50219230b2
Author: Felix Schumacher <fe...@internetallee.de>
AuthorDate: Sun Aug 25 21:36:40 2019 +0200
Use Map#entrySet instead of keySet
---
.../java/org/apache/jmeter/protocol/smtp/sampler/gui/SmtpPanel.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/protocol/mail/src/main/java/org/apache/jmeter/protocol/smtp/sampler/gui/SmtpPanel.java b/src/protocol/mail/src/main/java/org/apache/jmeter/protocol/smtp/sampler/gui/SmtpPanel.java
index e24fecb..6381d2b 100644
--- a/src/protocol/mail/src/main/java/org/apache/jmeter/protocol/smtp/sampler/gui/SmtpPanel.java
+++ b/src/protocol/mail/src/main/java/org/apache/jmeter/protocol/smtp/sampler/gui/SmtpPanel.java
@@ -492,9 +492,9 @@ public class SmtpPanel extends JPanel {
public CollectionProperty getHeaderFields() {
CollectionProperty result = new CollectionProperty();
result.setName(SmtpSampler.HEADER_FIELDS);
- for (JTextField headerName : headerFields.keySet()) {
- String name = headerName.getText();
- String value = headerFields.get(headerName).getText();
+ for (Map.Entry<JTextField, JTextField> header : headerFields.entrySet()) {
+ String name = header.getKey().getText();
+ String value = header.getValue().getText();
Argument argument = new Argument(name, value);
result.addItem(argument);
}