[jmeter] 01/02: Add ThreadGroup in the mix instead of duplicate condition

[fschumacher]

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 6fa1735f86f734edfe1093e0edf6c9a336811430
Author: Felix Schumacher <felix.schumac...@internetallee.de>
AuthorDate: Sun Aug 9 11:26:50 2020 +0200

    Add ThreadGroup in the mix instead of duplicate condition
    
    The other conditions are always using the dual components, so keep that 
pattern
    for the ThreadGroup <-> AbstractThreadGroupGui, too.
---
 .../main/java/org/apache/jmeter/gui/menu/StaticJMeterGUIComponent.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git 
a/src/core/src/main/java/org/apache/jmeter/gui/menu/StaticJMeterGUIComponent.java
 
b/src/core/src/main/java/org/apache/jmeter/gui/menu/StaticJMeterGUIComponent.java
index 6977e48..0ddd7bb 100644
--- 
a/src/core/src/main/java/org/apache/jmeter/gui/menu/StaticJMeterGUIComponent.java
+++ 
b/src/core/src/main/java/org/apache/jmeter/gui/menu/StaticJMeterGUIComponent.java
@@ -41,6 +41,7 @@ import 
org.apache.jmeter.processor.gui.AbstractPreProcessorGui;
 import org.apache.jmeter.samplers.Sampler;
 import org.apache.jmeter.samplers.gui.AbstractSamplerGui;
 import org.apache.jmeter.testelement.TestElement;
+import org.apache.jmeter.threads.ThreadGroup;
 import org.apache.jmeter.threads.gui.AbstractThreadGroupGui;
 import org.apache.jmeter.timers.Timer;
 import org.apache.jmeter.timers.gui.AbstractTimerGui;
@@ -100,7 +101,7 @@ public class StaticJMeterGUIComponent implements 
JMeterGUIComponent {
             group = MenuFactory.SAMPLERS;
         } else if (Timer.class.isAssignableFrom(c) || 
AbstractTimerGui.class.isAssignableFrom(c)) {
             group = MenuFactory.TIMERS;
-        } else if (AbstractThreadGroupGui.class.isAssignableFrom(c) || 
AbstractThreadGroupGui.class.isAssignableFrom(c)) {
+        } else if (ThreadGroup.class.isAssignableFrom(c) || 
AbstractThreadGroupGui.class.isAssignableFrom(c)) {
             group = MenuFactory.THREADS;
         } else {
             throw new IllegalArgumentException("Unknown group for class " + c);