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/11 16:57:57 UTC
[jmeter] branch master updated (00023c0 -> 7897df5)
This is an automated email from the ASF dual-hosted git repository.
vladimirsitnikov pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/jmeter.git.
from 00023c0 Bug 64340 - Workbench reappears in menu to add Non Test Elements, related to PR 573
new cc97012 Revert "Bug 64340 - Workbench reappears in menu to add Non Test Elements, related to PR 573"
new 7897df5 Bug 64340 - Hide Workbench from Add context menu
The 2 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:
src/core/src/main/java/org/apache/jmeter/control/gui/WorkBenchGui.java | 1 +
1 file changed, 1 insertion(+)
[jmeter] 01/02: Revert "Bug 64340 - Workbench reappears in menu to
add Non Test Elements, related to PR 573"
Posted by vl...@apache.org.
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
commit cc97012122f943414590a6c98ea0299012eedd26
Author: Vladimir Sitnikov <si...@gmail.com>
AuthorDate: Sat Apr 11 19:56:54 2020 +0300
Revert "Bug 64340 - Workbench reappears in menu to add Non Test Elements, related to PR 573"
This reverts commit 00023c0083642954ee12f2a704856e088dca6da9.
---
src/core/src/main/java/org/apache/jmeter/control/gui/WorkBenchGui.java | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/core/src/main/java/org/apache/jmeter/control/gui/WorkBenchGui.java b/src/core/src/main/java/org/apache/jmeter/control/gui/WorkBenchGui.java
index 2143079..69b589b 100644
--- a/src/core/src/main/java/org/apache/jmeter/control/gui/WorkBenchGui.java
+++ b/src/core/src/main/java/org/apache/jmeter/control/gui/WorkBenchGui.java
@@ -39,6 +39,7 @@ import org.apache.jmeter.util.JMeterUtils;
* @deprecated since 4.0 Non Test Elements are now children of Test Plan
*/
@Deprecated
+@TestElementMetadata(labelResource = "workbench_title", actionGroups = MenuFactory.NON_TEST_ELEMENTS)
public class WorkBenchGui extends AbstractJMeterGuiComponent {
private static final long serialVersionUID = 240L;
// This check-box defines whether to save WorkBench content or not
[jmeter] 02/02: Bug 64340 - Hide Workbench from Add context menu
Posted by vl...@apache.org.
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
commit 7897df534dbe8cebcb2284134fcccbc50b3b2a41
Author: Vladimir Sitnikov <si...@gmail.com>
AuthorDate: Sat Apr 11 19:57:39 2020 +0300
Bug 64340 - Hide Workbench from Add context menu
---
src/core/src/main/java/org/apache/jmeter/control/gui/WorkBenchGui.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/core/src/main/java/org/apache/jmeter/control/gui/WorkBenchGui.java b/src/core/src/main/java/org/apache/jmeter/control/gui/WorkBenchGui.java
index 69b589b..4caec0d 100644
--- a/src/core/src/main/java/org/apache/jmeter/control/gui/WorkBenchGui.java
+++ b/src/core/src/main/java/org/apache/jmeter/control/gui/WorkBenchGui.java
@@ -39,7 +39,7 @@ import org.apache.jmeter.util.JMeterUtils;
* @deprecated since 4.0 Non Test Elements are now children of Test Plan
*/
@Deprecated
-@TestElementMetadata(labelResource = "workbench_title", actionGroups = MenuFactory.NON_TEST_ELEMENTS)
+@TestElementMetadata(labelResource = "workbench_title", actionGroups = "")
public class WorkBenchGui extends AbstractJMeterGuiComponent {
private static final long serialVersionUID = 240L;
// This check-box defines whether to save WorkBench content or not