You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by vl...@apache.org on 2019/09/29 13:13:25 UTC

[jmeter] branch master updated: Remove excessive borders from UI components

This is an automated email from the ASF dual-hosted git repository.

vladimirsitnikov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jmeter.git


The following commit(s) were added to refs/heads/master by this push:
     new c5f2ad8  Remove excessive borders from UI components
c5f2ad8 is described below

commit c5f2ad8c467abeae70356f20ee96df92742acada
Author: Vladimir Sitnikov <si...@gmail.com>
AuthorDate: Sun Sep 29 16:10:17 2019 +0300

    Remove excessive borders from UI components
---
 .editorconfig                                            |  6 ++++++
 .../org/apache/jmeter/assertions/gui/AssertionGui.java   |  5 +++--
 .../jmeter/visualizers/ViewResultsFullVisualizer.java    |  1 +
 .../org/apache/jmeter/config/gui/ArgumentsPanel.java     | 16 ++++++++++++++--
 .../apache/jmeter/gui/AbstractJMeterGuiComponent.java    |  3 ++-
 .../main/java/org/apache/jmeter/gui/CommentPanel.java    | 11 +++++------
 .../src/main/java/org/apache/jmeter/gui/MainFrame.java   |  3 +++
 .../jmeter/threads/gui/AbstractThreadGroupGui.java       |  3 ++-
 .../src/main/java/org/apache/jorphan/gui/GuiUtils.java   | 13 +++++++++++++
 .../protocol/http/control/gui/HttpTestSampleGui.java     |  1 +
 .../org/apache/jmeter/protocol/http/gui/CookiePanel.java |  2 +-
 .../apache/jmeter/protocol/http/gui/DNSCachePanel.java   |  4 ++--
 .../jmeter/protocol/http/gui/HTTPArgumentsPanel.java     |  1 +
 .../jmeter/protocol/http/gui/HTTPFileArgsPanel.java      |  2 +-
 .../org/apache/jmeter/protocol/http/gui/HeaderPanel.java |  4 ++--
 .../jmeter/protocol/http/proxy/gui/ProxyControlGui.java  |  4 ++--
 .../protocol/jms/control/gui/JMSPropertiesPanel.java     |  2 +-
 17 files changed, 60 insertions(+), 21 deletions(-)

diff --git a/.editorconfig b/.editorconfig
index 3feeeda..0107a0f 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -14,3 +14,9 @@ end_of_line = crlf
 
 [{*.kts,*.kt}]
 ij_kotlin_code_style_defaults = KOTLIN_OFFICIAL
+
+[*.java]
+# Doc: https://youtrack.jetbrains.com/issue/IDEA-170643#focus=streamItem-27-3708697.0-0
+#"static ", "java.", "javax", "org", "net", "com", ""
+ij_java_imports_layout = $*,|,java.**,|,javax.**,|,org.**,|,net.**,|,com.**,|,*
+ij_java_use_single_class_imports = true
diff --git a/src/components/src/main/java/org/apache/jmeter/assertions/gui/AssertionGui.java b/src/components/src/main/java/org/apache/jmeter/assertions/gui/AssertionGui.java
index c4b337c..c7632b1 100644
--- a/src/components/src/main/java/org/apache/jmeter/assertions/gui/AssertionGui.java
+++ b/src/components/src/main/java/org/apache/jmeter/assertions/gui/AssertionGui.java
@@ -50,6 +50,7 @@ import org.apache.jmeter.gui.util.JTextScrollPane;
 import org.apache.jmeter.gui.util.PowerTableModel;
 import org.apache.jmeter.gui.util.TextAreaCellRenderer;
 import org.apache.jmeter.gui.util.TextAreaTableCellEditor;
+import org.apache.jmeter.gui.util.VerticalPanel;
 import org.apache.jmeter.testelement.TestElement;
 import org.apache.jmeter.testelement.property.JMeterProperty;
 import org.apache.jmeter.util.JMeterUtils;
@@ -312,7 +313,7 @@ public class AssertionGui extends AbstractAssertionGui {
      */
     void init() { // WARNING: called from ctor so must not be overridden (i.e. must be private or final)
         setLayout(new BorderLayout());
-        Box box = Box.createVerticalBox();
+        VerticalPanel box = new VerticalPanel();
         setBorder(makeBorder());
 
         box.add(makeTitlePanel());
@@ -463,7 +464,7 @@ public class AssertionGui extends AbstractAssertionGui {
         panel.setLayout(new BorderLayout());
         panel.setBorder(BorderFactory.createTitledBorder(JMeterUtils.getResString("assertion_patterns_to_test"))); //$NON-NLS-1$
 
-        panel.add(new JScrollPane(stringTable), BorderLayout.CENTER);
+        panel.add(GuiUtils.emptyBorder(new JScrollPane(stringTable)), BorderLayout.CENTER);
         panel.add(createButtonPanel(), BorderLayout.SOUTH);
 
         return panel;
diff --git a/src/components/src/main/java/org/apache/jmeter/visualizers/ViewResultsFullVisualizer.java b/src/components/src/main/java/org/apache/jmeter/visualizers/ViewResultsFullVisualizer.java
index fc9ac24..50e63d0 100644
--- a/src/components/src/main/java/org/apache/jmeter/visualizers/ViewResultsFullVisualizer.java
+++ b/src/components/src/main/java/org/apache/jmeter/visualizers/ViewResultsFullVisualizer.java
@@ -348,6 +348,7 @@ implements ActionListener, TreeSelectionListener, Clearable, ItemListener {
         searchAndMainSP.setOneTouchExpandable(true);
         JSplitPane splitPane = new JSplitPane(JSplitPane.VERTICAL_SPLIT, makeTitlePanel(), searchAndMainSP);
         splitPane.setOneTouchExpandable(true);
+        splitPane.setBorder(BorderFactory.createEmptyBorder());
         add(splitPane);
 
         // init right side with first render
diff --git a/src/core/src/main/java/org/apache/jmeter/config/gui/ArgumentsPanel.java b/src/core/src/main/java/org/apache/jmeter/config/gui/ArgumentsPanel.java
index eaaf228..3b6c1a4 100644
--- a/src/core/src/main/java/org/apache/jmeter/config/gui/ArgumentsPanel.java
+++ b/src/core/src/main/java/org/apache/jmeter/config/gui/ArgumentsPanel.java
@@ -34,6 +34,7 @@ import java.util.Iterator;
 import javax.swing.BorderFactory;
 import javax.swing.Box;
 import javax.swing.JButton;
+import javax.swing.JComponent;
 import javax.swing.JLabel;
 import javax.swing.JOptionPane;
 import javax.swing.JPanel;
@@ -71,6 +72,8 @@ public class ArgumentsPanel extends AbstractConfigGui implements ActionListener
     /** The model for the arguments table. */
     protected transient ObjectTableModel tableModel; // will only contain Argument or HTTPArgument
 
+    private JComponent mainPanel;
+
     /** A button for adding new arguments to the table. */
     private JButton add;
 
@@ -659,7 +662,7 @@ public class ArgumentsPanel extends AbstractConfigGui implements ActionListener
      *
      * @return the main GUI panel
      */
-    private Component makeMainPanel() {
+    private JComponent makeMainPanel() {
         initializeTableModel();
         table = new JTable(tableModel);
         table.getTableHeader().setDefaultRenderer(new HeaderAsPropertyRenderer());
@@ -755,7 +758,8 @@ public class ArgumentsPanel extends AbstractConfigGui implements ActionListener
         p.setLayout(new BorderLayout());
 
         p.add(makeLabelPanel(), BorderLayout.NORTH);
-        p.add(makeMainPanel(), BorderLayout.CENTER);
+        mainPanel = makeMainPanel();
+        p.add(mainPanel, BorderLayout.CENTER);
         // Force a minimum table height of 70 pixels
         p.add(Box.createVerticalStrut(70), BorderLayout.WEST);
         if (!disableButtons) {
@@ -769,4 +773,12 @@ public class ArgumentsPanel extends AbstractConfigGui implements ActionListener
         table.revalidate();
         sizeColumns(table);
     }
+
+    /**
+     * Clear border around "table with arguments".
+     * Extra border is not required when the panel is already surrounded by a border.
+     */
+    public void clearBorderForMainPanel() {
+        GuiUtils.emptyBorder(mainPanel);
+    }
 }
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/AbstractJMeterGuiComponent.java b/src/core/src/main/java/org/apache/jmeter/gui/AbstractJMeterGuiComponent.java
index 6d75156..01fe2a7 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/AbstractJMeterGuiComponent.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/AbstractJMeterGuiComponent.java
@@ -35,6 +35,7 @@ import org.apache.jmeter.testelement.TestElement;
 import org.apache.jmeter.testelement.property.StringProperty;
 import org.apache.jmeter.util.JMeterUtils;
 import org.apache.jmeter.visualizers.Printable;
+import org.apache.jorphan.gui.GuiUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -251,7 +252,7 @@ public abstract class AbstractJMeterGuiComponent extends JPanel implements JMete
         VerticalPanel titlePanel = new VerticalPanel();
         titlePanel.add(createTitleLabel());
         VerticalPanel contentPanel = new VerticalPanel();
-        contentPanel.setBorder(BorderFactory.createEtchedBorder());
+        contentPanel.setBorder(BorderFactory.createEmptyBorder());
         contentPanel.add(getNamePanel());
         contentPanel.add(getCommentPanel());
         titlePanel.add(contentPanel);
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/CommentPanel.java b/src/core/src/main/java/org/apache/jmeter/gui/CommentPanel.java
index 00a6457..f90fcf4 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/CommentPanel.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/CommentPanel.java
@@ -20,6 +20,7 @@ package org.apache.jmeter.gui;
 
 import java.awt.BorderLayout;
 
+import javax.swing.BorderFactory;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
 import javax.swing.JTextArea;
@@ -51,12 +52,10 @@ public class CommentPanel extends JPanel {
         commentField = new JTextArea();
         JLabel commentLabel = new JLabel(JMeterUtils.getResString("testplan_comments")); //$NON-NLS-1$
         commentLabel.setLabelFor(commentField);
-
-        JPanel commentPanel = new JPanel();
-        commentPanel.setLayout(new BorderLayout(0, 5));
-        commentPanel.add(commentLabel,BorderLayout.WEST);
-        commentPanel.add(commentField,BorderLayout.CENTER);
-        add(commentPanel);
+        commentField.setBorder(BorderFactory.createEtchedBorder());
+        commentLabel.setVerticalAlignment(JLabel.TOP);
+        add(commentLabel, BorderLayout.WEST);
+        add(commentField, BorderLayout.CENTER);
     }
 
     public void setText(String comment) {
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/MainFrame.java b/src/core/src/main/java/org/apache/jmeter/gui/MainFrame.java
index 5b4be81..ff4a8b3 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/MainFrame.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/MainFrame.java
@@ -101,6 +101,7 @@ import org.apache.jmeter.testelement.TestStateListener;
 import org.apache.jmeter.threads.JMeterContextService;
 import org.apache.jmeter.util.JMeterUtils;
 import org.apache.jorphan.gui.ComponentUtil;
+import org.apache.jorphan.gui.GuiUtils;
 import org.apache.jorphan.util.JOrphanUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -512,8 +513,10 @@ public class MainFrame extends JFrame implements TestStateListener, Remoteable,
             topAndDown.setDividerSize(0);
         }
         mainPanel = createMainPanel();
+        mainPanel.setBorder(BorderFactory.createEmptyBorder());
 
         logPanel = createLoggerPanel();
+        logPanel.setBorder(BorderFactory.createEmptyBorder());
         errorsAndFatalsCounterLogTarget = new ErrorsAndFatalsCounterLogTarget();
         GuiPackage.getInstance().getLogEventBus().registerEventListener(logPanel);
         GuiPackage.getInstance().getLogEventBus().registerEventListener(errorsAndFatalsCounterLogTarget);
diff --git a/src/core/src/main/java/org/apache/jmeter/threads/gui/AbstractThreadGroupGui.java b/src/core/src/main/java/org/apache/jmeter/threads/gui/AbstractThreadGroupGui.java
index 33cc0e0..60973d3 100644
--- a/src/core/src/main/java/org/apache/jmeter/threads/gui/AbstractThreadGroupGui.java
+++ b/src/core/src/main/java/org/apache/jmeter/threads/gui/AbstractThreadGroupGui.java
@@ -36,6 +36,7 @@ import org.apache.jmeter.gui.AbstractJMeterGuiComponent;
 import org.apache.jmeter.gui.action.ActionNames;
 import org.apache.jmeter.gui.action.ActionRouter;
 import org.apache.jmeter.gui.util.MenuFactory;
+import org.apache.jmeter.gui.util.VerticalPanel;
 import org.apache.jmeter.testelement.TestElement;
 import org.apache.jmeter.testelement.property.StringProperty;
 import org.apache.jmeter.threads.AbstractThreadGroup;
@@ -125,7 +126,7 @@ public abstract class AbstractThreadGroupGui extends AbstractJMeterGuiComponent
         setLayout(new BorderLayout(0, 5));
         setBorder(makeBorder());
 
-        Box box = Box.createVerticalBox();
+        VerticalPanel box = new VerticalPanel();
         box.add(makeTitlePanel());
         box.add(createOnErrorPanel());
         add(box, BorderLayout.NORTH);
diff --git a/src/jorphan/src/main/java/org/apache/jorphan/gui/GuiUtils.java b/src/jorphan/src/main/java/org/apache/jorphan/gui/GuiUtils.java
index 8d3e937..615a6c1 100644
--- a/src/jorphan/src/main/java/org/apache/jorphan/gui/GuiUtils.java
+++ b/src/jorphan/src/main/java/org/apache/jorphan/gui/GuiUtils.java
@@ -33,6 +33,7 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 
+import javax.swing.BorderFactory;
 import javax.swing.JComboBox;
 import javax.swing.JComponent;
 import javax.swing.JLabel;
@@ -66,6 +67,18 @@ public final class GuiUtils {
     }
 
     /**
+     * Clears border of the given component.
+     *
+     * @param comp input component
+     * @param <C> component type
+     * @return the given component with border set to empty
+     */
+    public static<C extends JComponent> C emptyBorder(C comp) {
+        comp.setBorder(BorderFactory.createEmptyBorder());
+        return comp;
+    }
+
+    /**
      * Fix the size of a column according to the header text.
      *
      * @param column to be resized
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/gui/HttpTestSampleGui.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/gui/HttpTestSampleGui.java
index 6bcf4d2..a39d03e 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/gui/HttpTestSampleGui.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/gui/HttpTestSampleGui.java
@@ -194,6 +194,7 @@ public class HttpTestSampleGui extends AbstractSamplerGui {
                 .getResString("web_testing_advanced"), advancedPanel);
 
         JSplitPane splitPane = new JSplitPane(JSplitPane.VERTICAL_SPLIT, makeTitlePanel(), tabbedPane);
+        splitPane.setBorder(BorderFactory.createEmptyBorder());
         splitPane.setOneTouchExpandable(true);
         add(splitPane);
     }
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/gui/CookiePanel.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/gui/CookiePanel.java
index 0058ffc..8742dd7 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/gui/CookiePanel.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/gui/CookiePanel.java
@@ -325,7 +325,7 @@ public class CookiePanel extends AbstractConfigGui implements ActionListener {
         panel.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(), JMeterUtils
                 .getResString("cookies_stored"))); //$NON-NLS-1$
 
-        panel.add(new JScrollPane(cookieTable), BorderLayout.CENTER);
+        panel.add(GuiUtils.emptyBorder(new JScrollPane(cookieTable)), BorderLayout.CENTER);
         panel.add(buttonPanel, BorderLayout.SOUTH);
         return panel;
     }
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/gui/DNSCachePanel.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/gui/DNSCachePanel.java
index 3ea75ed..6d5b95e 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/gui/DNSCachePanel.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/gui/DNSCachePanel.java
@@ -251,7 +251,7 @@ public class DNSCachePanel extends AbstractConfigGui implements ActionListener {
         JPanel panel = new JPanel(new BorderLayout(0, 5));
         panel.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(),
                 JMeterUtils.getResString("dns_servers"))); // $NON-NLS-1$
-        JScrollPane dnsServScrollPane = new JScrollPane(dnsServersTable);
+        JScrollPane dnsServScrollPane = GuiUtils.emptyBorder(new JScrollPane(dnsServersTable));
         panel.add(dnsServScrollPane, BorderLayout.CENTER);
         dnsServButPanel = createButtonPanel();
         panel.add(dnsServButPanel, BorderLayout.SOUTH);
@@ -268,7 +268,7 @@ public class DNSCachePanel extends AbstractConfigGui implements ActionListener {
         JPanel panel = new JPanel(new BorderLayout(0, 5));
         panel.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(),
                 JMeterUtils.getResString("dns_hosts"))); // $NON-NLS-1$
-        JScrollPane dnsHostsScrollPane = new JScrollPane(dnsHostsTable);
+        JScrollPane dnsHostsScrollPane = GuiUtils.emptyBorder(new JScrollPane(dnsHostsTable));
         panel.add(dnsHostsScrollPane, BorderLayout.CENTER);
         dnsHostsButPanel = createHostsButtonPanel();
         panel.add(dnsHostsButPanel, BorderLayout.SOUTH);
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/gui/HTTPArgumentsPanel.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/gui/HTTPArgumentsPanel.java
index 8acd61c..98e425f 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/gui/HTTPArgumentsPanel.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/gui/HTTPArgumentsPanel.java
@@ -101,6 +101,7 @@ public class HTTPArgumentsPanel extends ArgumentsPanel {
     public HTTPArgumentsPanel() {
         super(JMeterUtils.getResString("paramtable")); //$NON-NLS-1$
         init();
+        clearBorderForMainPanel();
     }
 
     @Override
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/gui/HTTPFileArgsPanel.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/gui/HTTPFileArgsPanel.java
index 5439bf8..db7eb0c 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/gui/HTTPFileArgsPanel.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/gui/HTTPFileArgsPanel.java
@@ -363,6 +363,6 @@ public class HTTPFileArgsPanel extends JPanel implements ActionListener {
     private JScrollPane makeScrollPane(Component comp) {
         JScrollPane pane = new JScrollPane(comp);
         pane.setPreferredSize(pane.getMinimumSize());
-        return pane;
+        return GuiUtils.emptyBorder(pane);
     }
 }
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/gui/HeaderPanel.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/gui/HeaderPanel.java
index a66c6f5..5d4060b 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/gui/HeaderPanel.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/gui/HeaderPanel.java
@@ -122,7 +122,7 @@ public class HeaderPanel extends AbstractConfigGui implements ActionListener {
     }
 
     private void init() {// called from ctor, so must not be overridable
-        setLayout(new BorderLayout());
+        setLayout(new BorderLayout(0, 5));
         setBorder(makeBorder());
 
         add(makeTitlePanel(), BorderLayout.NORTH);
@@ -277,7 +277,7 @@ public class HeaderPanel extends AbstractConfigGui implements ActionListener {
         JPanel panel = new JPanel(new BorderLayout(0, 5));
         panel.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(),
                 JMeterUtils.getResString("headers_stored"))); // $NON-NLS-1$
-        panel.add(new JScrollPane(headerTable), BorderLayout.CENTER);
+        panel.add(GuiUtils.emptyBorder(new JScrollPane(headerTable)), BorderLayout.CENTER);
         panel.add(createButtonPanel(), BorderLayout.SOUTH);
         return panel;
     }
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java
index b17deec..d2996e1 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java
@@ -1095,7 +1095,7 @@ public class ProxyControlGui extends LogicControllerGui implements JMeterGUIComp
         panel.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(), JMeterUtils
                 .getResString("patterns_to_include"))); // $NON-NLS-1$
 
-        panel.add(new JScrollPane(includeTable), BorderLayout.CENTER);
+        panel.add(GuiUtils.emptyBorder(new JScrollPane(includeTable)), BorderLayout.CENTER);
         panel.add(createTableButtonPanel(ADD_INCLUDE, DELETE_INCLUDE, ADD_TO_INCLUDE_FROM_CLIPBOARD, null), BorderLayout.SOUTH);
 
         return panel;
@@ -1112,7 +1112,7 @@ public class ProxyControlGui extends LogicControllerGui implements JMeterGUIComp
         panel.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(), JMeterUtils
                 .getResString("patterns_to_exclude"))); // $NON-NLS-1$
 
-        panel.add(new JScrollPane(excludeTable), BorderLayout.CENTER);
+        panel.add(GuiUtils.emptyBorder(new JScrollPane(excludeTable)), BorderLayout.CENTER);
         panel.add(createTableButtonPanel(ADD_EXCLUDE, DELETE_EXCLUDE, ADD_TO_EXCLUDE_FROM_CLIPBOARD, ADD_SUGGESTED_EXCLUDES), BorderLayout.SOUTH);
 
         return panel;
diff --git a/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/control/gui/JMSPropertiesPanel.java b/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/control/gui/JMSPropertiesPanel.java
index fbc7e10..dff6a5d 100644
--- a/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/control/gui/JMSPropertiesPanel.java
+++ b/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/control/gui/JMSPropertiesPanel.java
@@ -197,7 +197,7 @@ public class JMSPropertiesPanel extends JPanel implements ActionListener {
         JPanel panel = new JPanel(new BorderLayout(0, 5));
         panel.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(),
                 JMeterUtils.getResString("jms_props"))); //$NON-NLS-1$
-        panel.add(new JScrollPane(jmsPropertiesTable));
+        panel.add(GuiUtils.emptyBorder(new JScrollPane(jmsPropertiesTable)));
         panel.add(createButtonPanel(), BorderLayout.SOUTH);
         return panel;
     }