This is an automated email from the ASF dual-hosted git repository.
pmouawad 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 a0e132e Bug 64448 - User Defined Variable Duplication in Right Click
Context Menu
a0e132e is described below
commit a0e132e59c820858225e58a5e6f1f091c60f100d
Author: pmouawad <p.moua...@ubik-ingenierie.com>
AuthorDate: Sat Jun 6 11:27:35 2020 +0200
Bug 64448 - User Defined Variable Duplication in Right Click Context
Menu
---
src/core/src/main/java/org/apache/jmeter/config/gui/ArgumentsPanel.java | 2 ++
.../java/org/apache/jmeter/protocol/http/gui/HTTPArgumentsPanel.java | 2 --
xdocs/changes.xml | 1 +
3 files changed, 3 insertions(+), 2 deletions(-)
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 d3a0dcd..f71a812 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
@@ -44,6 +44,7 @@ import javax.swing.ListSelectionModel;
import org.apache.commons.lang3.StringUtils;
import org.apache.jmeter.config.Argument;
import org.apache.jmeter.config.Arguments;
+import org.apache.jmeter.gui.TestElementMetadata;
import org.apache.jmeter.gui.util.HeaderAsPropertyRenderer;
import org.apache.jmeter.testelement.TestElement;
import org.apache.jmeter.testelement.property.JMeterProperty;
@@ -58,6 +59,7 @@ import org.apache.jorphan.reflect.Functor;
* for some other component.
*
*/
+@TestElementMetadata(labelResource = "user_defined_variables")
public class ArgumentsPanel extends AbstractConfigGui implements
ActionListener {
private static final long serialVersionUID = 240L;
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 5451860..f087afe 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
@@ -28,7 +28,6 @@ import org.apache.commons.lang3.StringUtils;
import org.apache.jmeter.config.Argument;
import org.apache.jmeter.config.Arguments;
import org.apache.jmeter.config.gui.ArgumentsPanel;
-import org.apache.jmeter.gui.TestElementMetadata;
import org.apache.jmeter.protocol.http.util.HTTPArgument;
import org.apache.jmeter.testelement.TestElement;
import org.apache.jmeter.testelement.property.JMeterProperty;
@@ -42,7 +41,6 @@ import org.apache.jorphan.reflect.Functor;
* These have names and values, as well as check-boxes to determine whether or
not to
* include the "=" sign in the output and whether or not to encode the output.
*/
-@TestElementMetadata(labelResource = "user_defined_variables")
public class HTTPArgumentsPanel extends ArgumentsPanel {
private static final long serialVersionUID = 240L;
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index 5019d59..6154970 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -161,6 +161,7 @@ Summary
<h3>General</h3>
<ul>
+ <li><bug>64448</bug>User Defined Variable Duplication in Right Click
Context Menu</li>
</ul>
<!-- =================== Thanks =================== -->
