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 2020/04/07 09:55:04 UTC
[jmeter] branch master updated: UX: align component fields with
name and description fields
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 ac25a10 UX: align component fields with name and description fields
ac25a10 is described below
commit ac25a104b2b0d4561999bbcebabd7de672fe488c
Author: Vladimir Sitnikov <si...@gmail.com>
AuthorDate: Tue Apr 7 12:54:45 2020 +0300
UX: align component fields with name and description fields
---
.../main/java/org/apache/jmeter/control/gui/ForeachControlPanel.java | 2 +-
.../java/org/apache/jmeter/control/gui/ThroughputControllerGui.java | 3 +++
.../main/java/org/apache/jmeter/extractor/gui/XPath2ExtractorGui.java | 2 +-
.../main/java/org/apache/jmeter/modifiers/gui/CounterConfigGui.java | 2 +-
.../src/main/java/org/apache/jmeter/control/gui/IfControllerPanel.java | 2 +-
.../main/java/org/apache/jmeter/control/gui/WhileControllerGui.java | 2 +-
.../apache/jmeter/protocol/java/control/gui/JUnitTestSamplerGui.java | 2 +-
7 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/src/components/src/main/java/org/apache/jmeter/control/gui/ForeachControlPanel.java b/src/components/src/main/java/org/apache/jmeter/control/gui/ForeachControlPanel.java
index c1f5449..67cd2fa 100644
--- a/src/components/src/main/java/org/apache/jmeter/control/gui/ForeachControlPanel.java
+++ b/src/components/src/main/java/org/apache/jmeter/control/gui/ForeachControlPanel.java
@@ -190,7 +190,7 @@ public class ForeachControlPanel extends AbstractControllerGui {
* @return a GUI panel containing the loop count components
*/
private JPanel createLoopCountPanel() {
- JPanel loopPanel = new JPanel(new MigLayout("fillx, wrap 2", "[][fill,grow]"));
+ JPanel loopPanel = new JPanel(new MigLayout("fillx, wrap 2, insets 0", "[][fill,grow]"));
// TEXT FIELD
inputVal = new JTextField("", 5); // $NON-NLS-1$
diff --git a/src/components/src/main/java/org/apache/jmeter/control/gui/ThroughputControllerGui.java b/src/components/src/main/java/org/apache/jmeter/control/gui/ThroughputControllerGui.java
index bf7a307..35f27e7 100644
--- a/src/components/src/main/java/org/apache/jmeter/control/gui/ThroughputControllerGui.java
+++ b/src/components/src/main/java/org/apache/jmeter/control/gui/ThroughputControllerGui.java
@@ -18,6 +18,7 @@
package org.apache.jmeter.control.gui;
import java.awt.BorderLayout;
+import java.awt.Dimension;
import java.awt.event.ItemEvent;
import javax.swing.DefaultComboBoxModel;
@@ -127,6 +128,8 @@ public class ThroughputControllerGui extends AbstractControllerGui {
setLayout(new BorderLayout());
setBorder(makeBorder());
+ // TODO: add "insets 0", however, for now JComboBox consumes more space than its cell
+ // for some reason.
JPanel panel = new JPanel(new MigLayout("fillx, wrap 2", "[][fill,grow]"));
DefaultComboBoxModel<String> styleModel = new DefaultComboBoxModel<>();
diff --git a/src/components/src/main/java/org/apache/jmeter/extractor/gui/XPath2ExtractorGui.java b/src/components/src/main/java/org/apache/jmeter/extractor/gui/XPath2ExtractorGui.java
index 8720c5e..e6b2523 100644
--- a/src/components/src/main/java/org/apache/jmeter/extractor/gui/XPath2ExtractorGui.java
+++ b/src/components/src/main/java/org/apache/jmeter/extractor/gui/XPath2ExtractorGui.java
@@ -126,7 +126,7 @@ public class XPath2ExtractorGui extends AbstractPostProcessorGui{ // NOSONAR Ign
JPanel mainPanel = new JPanel(new BorderLayout());
mainPanel.add(createScopePanel(true, true, true), BorderLayout.NORTH);
- JPanel panel = new JPanel(new MigLayout("fillx, wrap 2", "[][fill,grow]"));
+ JPanel panel = new JPanel(new MigLayout("fillx, wrap 2, insets 0", "[][fill,grow]"));
panel.setBorder(BorderFactory.createTitledBorder(
JMeterUtils.getResString("xpath2_extractor_properties")));
diff --git a/src/components/src/main/java/org/apache/jmeter/modifiers/gui/CounterConfigGui.java b/src/components/src/main/java/org/apache/jmeter/modifiers/gui/CounterConfigGui.java
index 52e24cd..4eb17e2 100644
--- a/src/components/src/main/java/org/apache/jmeter/modifiers/gui/CounterConfigGui.java
+++ b/src/components/src/main/java/org/apache/jmeter/modifiers/gui/CounterConfigGui.java
@@ -124,7 +124,7 @@ public class CounterConfigGui extends AbstractConfigGui implements ActionListene
setBorder(makeBorder());
setLayout(new BorderLayout());
- JPanel counterPanel = new JPanel(new MigLayout("fillx, wrap 2", "[][fill,grow]"));
+ JPanel counterPanel = new JPanel(new MigLayout("fillx, wrap 2, insets 0", "[][fill,grow]"));
startField = new JTextField(20);
counterPanel.add(JMeterUtils.labelFor(startField, "start_value"));
diff --git a/src/core/src/main/java/org/apache/jmeter/control/gui/IfControllerPanel.java b/src/core/src/main/java/org/apache/jmeter/control/gui/IfControllerPanel.java
index 7419622..c40943d 100644
--- a/src/core/src/main/java/org/apache/jmeter/control/gui/IfControllerPanel.java
+++ b/src/core/src/main/java/org/apache/jmeter/control/gui/IfControllerPanel.java
@@ -188,7 +188,7 @@ public class IfControllerPanel extends AbstractControllerGui implements ChangeLi
* @return a GUI panel containing the condition components
*/
private JPanel createConditionPanel() {
- JPanel conditionPanel = new JPanel(new MigLayout("fillx, wrap 2", "[][fill,grow]"));
+ JPanel conditionPanel = new JPanel(new MigLayout("fillx, wrap 2, insets 0", "[][fill,grow]"));
ImageIcon image = JMeterUtils.getImage("warning.png"); // $NON-NLS-1$
warningLabel = new JLabel(JMeterUtils.getResString("if_controller_warning"), image, SwingConstants.LEFT); // $NON-NLS-1$
diff --git a/src/core/src/main/java/org/apache/jmeter/control/gui/WhileControllerGui.java b/src/core/src/main/java/org/apache/jmeter/control/gui/WhileControllerGui.java
index 30921fc..42bd95e 100644
--- a/src/core/src/main/java/org/apache/jmeter/control/gui/WhileControllerGui.java
+++ b/src/core/src/main/java/org/apache/jmeter/control/gui/WhileControllerGui.java
@@ -125,7 +125,7 @@ public class WhileControllerGui extends AbstractControllerGui {
* @return a GUI panel containing the condition components
*/
private JPanel createConditionPanel() {
- JPanel conditionPanel = new JPanel(new MigLayout("fillx, wrap 2", "[][fill,grow]"));
+ JPanel conditionPanel = new JPanel(new MigLayout("fillx, wrap 2, insets 0", "[][fill,grow]"));
// Condition
// This means exit if last sample failed
diff --git a/src/protocol/junit/src/main/java/org/apache/jmeter/protocol/java/control/gui/JUnitTestSamplerGui.java b/src/protocol/junit/src/main/java/org/apache/jmeter/protocol/java/control/gui/JUnitTestSamplerGui.java
index eeed649..6e0455f 100644
--- a/src/protocol/junit/src/main/java/org/apache/jmeter/protocol/java/control/gui/JUnitTestSamplerGui.java
+++ b/src/protocol/junit/src/main/java/org/apache/jmeter/protocol/java/control/gui/JUnitTestSamplerGui.java
@@ -208,7 +208,7 @@ implements ChangeListener, ActionListener, ItemListener
methodName.addActionListener(this);
setupClasslist(false);
- JPanel panel = new JPanel(new MigLayout("fillx, wrap 2", "[][fill,grow]"));
+ JPanel panel = new JPanel(new MigLayout("fillx, wrap 2, insets 0", "[][fill,grow]"));
panel.add(junit4, "span 2");
junit4.addItemListener(this);