Feature to Change component after adding element to testplan

src/components/src/main/java/org/apache/jmeter/control/gui/IncludeControllerGui.java

@@ -17,14 +17,12 @@
 
 package org.apache.jmeter.control.gui;
 
-import javax.swing.JPopupMenu;
 
 import org.apache.jmeter.control.IncludeController;
 import org.apache.jmeter.control.IncludeControllerSchema;
 import org.apache.jmeter.gui.FilePanelEntryBinding;
 import org.apache.jmeter.gui.TestElementMetadata;
 import org.apache.jmeter.gui.util.FilePanel;
-import org.apache.jmeter.gui.util.MenuFactory;
 import org.apache.jmeter.testelement.TestElement;
 import org.apache.jmeter.util.JMeterUtils;
 import org.apache.jorphan.gui.layout.VerticalLayout;
@@ -65,14 +63,6 @@ public void clearGui() {
         includePanel.clearGui();
     }
 
-    @Override
-    public JPopupMenu createPopupMenu() {
-        JPopupMenu menu = new JPopupMenu();
-        MenuFactory.addEditMenu(menu, true);
-        MenuFactory.addFileMenu(menu);
-        return menu;
-    }
-
     private void init() { // WARNING: called from ctor so must not be overridden (i.e. must be private or final)
         setLayout(new VerticalLayout(5, VerticalLayout.BOTH, VerticalLayout.TOP));
         setBorder(makeBorder());

src/components/src/main/java/org/apache/jmeter/control/gui/ModuleControllerGui.java

@@ -31,7 +31,6 @@
 import javax.swing.JButton;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
-import javax.swing.JPopupMenu;
 import javax.swing.JTree;
 import javax.swing.SwingConstants;
 import javax.swing.tree.DefaultMutableTreeNode;
@@ -49,7 +48,6 @@
 import org.apache.jmeter.gui.GuiPackage;
 import org.apache.jmeter.gui.TestElementMetadata;
 import org.apache.jmeter.gui.tree.JMeterTreeNode;
-import org.apache.jmeter.gui.util.MenuFactory;
 import org.apache.jmeter.gui.util.MenuInfo;
 import org.apache.jmeter.testelement.TestElement;
 import org.apache.jmeter.testelement.TestPlan;
@@ -273,15 +271,6 @@ public void clearGui() {
         }
     }
 
-    /** {@inheritDoc}} */
-    @Override
-    public JPopupMenu createPopupMenu() {
-        JPopupMenu menu = new JPopupMenu();
-        MenuFactory.addEditMenu(menu, true);
-        MenuFactory.addFileMenu(menu);
-        return menu;
-    }
-
     private void init() { // WARNING: called from ctor so must not be overridden (i.e. must be private or final)
         setLayout(new VerticalLayout(5, VerticalLayout.BOTH, VerticalLayout.TOP));
         setBorder(makeBorder());

src/core/src/main/java/org/apache/jmeter/gui/action/ActionNames.java

@@ -31,12 +31,19 @@ public final class ActionNames {
     public static final String ACTION_STOP      = "stop"; // $NON-NLS-1$
     public static final String ADD              = "Add"; // $NON-NLS-1$
     public static final String ADD_ALL          = "add_all"; // $NON-NLS-1$
-    public static final String ADD_PARENT       = "Add Parent"; // $NON-NLS-1$
     public static final String ADD_THINK_TIME_BETWEEN_EACH_STEP    = "Add Think Time between each step"; // $NON-NLS-1$
     public static final String ANALYZE_FILE     = "Analyze File"; // $NON-NLS-1$
     public static final String APPLY_NAMING_CONVENTION    = "Apply Naming Convention"; // $NON-NLS-1$
     public static final String CHANGE_LANGUAGE  = "change_language"; // $NON-NLS-1$
-    public static final String CHANGE_PARENT    = "Change Parent"; // $NON-NLS-1$
+    public static final String CHANGE_ASSERTION = "change_assertion"; // $NON-NLS-1$
+    public static final String CHANGE_CONFIG_ELEMENT = "change_config_element"; // $NON-NLS-1$
+    public static final String CHANGE_CONTROLLER = "change_controller"; // $NON-NLS-1$
+    public static final String CHANGE_LISTENER = "change_listener"; // $NON-NLS-1$
+    public static final String CHANGE_PRE_PROCESSOR = "change_pre_processor";
+    public static final String CHANGE_POST_PROCESSOR = "change_post_processor";
+    public static final String CHANGE_SAMPLER = "change_sampler"; // $NON-NLS-1$
+    public static final String CHANGE_THREAD_GROUP = "change_thread_group";
+    public static final String CHANGE_TIMER = "change_timer";
     public static final String CHECK_DIRTY      = "check_dirty"; // $NON-NLS-1$
     public static final String CHECK_REMOVE     = "check_remove"; // $NON-NLS-1$
     public static final String CHECK_CUT        = "check_cut"; // $NON-NLS-1$

src/core/src/main/java/org/apache/jmeter/gui/action/ChangeAssertion.java

@@ -0,0 +1,74 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jmeter.gui.action;
+
+import java.awt.Component;
+import java.awt.Toolkit;
+import java.awt.event.ActionEvent;
+import java.util.HashSet;
+import java.util.Set;
+
+import org.apache.jmeter.assertions.Assertion;
+import org.apache.jmeter.exceptions.IllegalUserActionException;
+import org.apache.jmeter.gui.GuiPackage;
+import org.apache.jmeter.gui.tree.JMeterTreeNode;
+import org.apache.jmeter.gui.util.ChangeElement;
+import org.apache.jmeter.testelement.TestElement;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.google.auto.service.AutoService;
+
+/**
+ * Allows to change Assertion implementation
+ */
+@AutoService(Command.class)
+public class ChangeAssertion extends AbstractAction {
+    private static final Logger log = LoggerFactory.getLogger(ChangeAssertion.class);
+    private static final Set<String> commands = new HashSet<>();
+
+    static {
+        commands.add(ActionNames.CHANGE_ASSERTION);
+    }
+
+    public ChangeAssertion() {
+    }
+    @Override
+    public Set<String> getActionNames() {
+        return commands;
+    }
+
+    @Override
+    public void doAction(ActionEvent e) throws IllegalUserActionException {
+        String name = ((Component) e.getSource()).getName();
+        GuiPackage guiPackage = GuiPackage.getInstance();
+        JMeterTreeNode currentNode = guiPackage.getTreeListener().getCurrentNode();
+        if (!(currentNode.getUserObject() instanceof Assertion)) {
+            Toolkit.getDefaultToolkit().beep();
+            return;
+        }
+        try {
+            guiPackage.updateCurrentNode();
+            TestElement assertion = guiPackage.createTestElement(name);
+            ChangeElement.assertion(assertion, guiPackage, currentNode);
+        } catch (Exception err) {
+            Toolkit.getDefaultToolkit().beep();
+            log.error("Failed to change controller", err);
+        }
+    }
+}

src/core/src/main/java/org/apache/jmeter/gui/action/ChangeConfigElement.java

@@ -0,0 +1,71 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jmeter.gui.action;
+
+import java.awt.Component;
+import java.awt.Toolkit;
+import java.awt.event.ActionEvent;
+import java.util.HashSet;
+import java.util.Set;
+
+import org.apache.jmeter.exceptions.IllegalUserActionException;
+import org.apache.jmeter.gui.GuiPackage;
+import org.apache.jmeter.gui.tree.JMeterTreeNode;
+import org.apache.jmeter.gui.util.ChangeElement;
+import org.apache.jmeter.testelement.AbstractTestElement;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.google.auto.service.AutoService;
+
+/**
+ * Allows to change Config element implementation
+ */
+@AutoService(Command.class)
+public class ChangeConfigElement extends AbstractAction {
+    private static final Logger log = LoggerFactory.getLogger(ChangeConfigElement.class);
+    private static final Set<String> commands = new HashSet<>();
+
+    static {
+        commands.add(ActionNames.CHANGE_CONFIG_ELEMENT);
+    }
+
+    @Override
+    public void doAction(ActionEvent e) throws IllegalUserActionException {
+        String name = ((Component) e.getSource()).getName();
+        GuiPackage guiPackage = GuiPackage.getInstance();
+        JMeterTreeNode currentNode = guiPackage.getTreeListener().getCurrentNode();
+        if (!(currentNode.getUserObject() instanceof AbstractTestElement)) {
+            Toolkit.getDefaultToolkit().beep();
+            return;
+        }
+        try {
+            guiPackage.updateCurrentNode();
+            AbstractTestElement configElement = (AbstractTestElement) guiPackage.createTestElement(name);
+            ChangeElement.configElement(configElement, guiPackage, currentNode);
+        } catch (Exception err) {
+            Toolkit.getDefaultToolkit().beep();
+            log.error("Failed to change config element", err);
+        }
+    }
+
+    @Override
+    public Set<String> getActionNames() {
+        return commands;
+    }
+}

src/core/src/main/java/org/apache/jmeter/gui/action/ChangeController.java

@@ -0,0 +1,74 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jmeter.gui.action;
+
+import java.awt.Component;
+import java.awt.Toolkit;
+import java.awt.event.ActionEvent;
+import java.util.HashSet;
+import java.util.Set;
+
+import org.apache.jmeter.control.GenericController;
+import org.apache.jmeter.gui.GuiPackage;
+import org.apache.jmeter.gui.tree.JMeterTreeNode;
+import org.apache.jmeter.gui.util.ChangeElement;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.google.auto.service.AutoService;
+
+/**
+ * Allows to change Controller implementation
+ */
+@AutoService(Command.class)
+public class ChangeController extends AbstractAction {
+    private static final Logger log = LoggerFactory.getLogger(ChangeController.class);
+
+    private static final Set<String> commands = new HashSet<>();
+
+    static {
+        commands.add(ActionNames.CHANGE_CONTROLLER);
+    }
+
+    public ChangeController() {
+    }
+
+    @Override
+    public void doAction(ActionEvent e) {
+        String name = ((Component) e.getSource()).getName();
+        GuiPackage guiPackage = GuiPackage.getInstance();
+        JMeterTreeNode currentNode = guiPackage.getTreeListener().getCurrentNode();
+        if (!(currentNode.getUserObject() instanceof GenericController)) {
+            Toolkit.getDefaultToolkit().beep();
+            return;
+        }
+        try {
+            guiPackage.updateCurrentNode();
+            GenericController controller = (GenericController) guiPackage.createTestElement(name);
+            ChangeElement.controller(controller, guiPackage, currentNode);
+        } catch (Exception err) {
+            Toolkit.getDefaultToolkit().beep();
+            log.error("Failed to change controller", err);
+        }
+    }
+
+    @Override
+    public Set<String> getActionNames() {
+        return commands;
+    }
+}

src/core/src/main/java/org/apache/jmeter/gui/action/AddParent.java → src/core/src/main/java/org/apache/jmeter/gui/action/ChangeListener.java

@@ -18,68 +18,59 @@
 package org.apache.jmeter.gui.action;
 
 import java.awt.Component;
+import java.awt.Toolkit;
 import java.awt.event.ActionEvent;
 import java.util.HashSet;
 import java.util.Set;
 
+import org.apache.jmeter.exceptions.IllegalUserActionException;
 import org.apache.jmeter.gui.GuiPackage;
 import org.apache.jmeter.gui.tree.JMeterTreeNode;
+import org.apache.jmeter.gui.util.ChangeElement;
 import org.apache.jmeter.testelement.TestElement;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import com.google.auto.service.AutoService;
 
 /**
- * Implements the Add Parent menu command
+ * Allows to change Listener implementation
  */
 @AutoService(Command.class)
-public class AddParent extends AbstractAction {
-    private static final Logger log = LoggerFactory.getLogger(AddParent.class);
+public class ChangeListener extends AbstractAction {
+    private static final Logger log = LoggerFactory.getLogger(ChangeListener.class);
 
     private static final Set<String> commands = new HashSet<>();
 
     static {
-        commands.add(ActionNames.ADD_PARENT);
+        commands.add(ActionNames.CHANGE_LISTENER);
     }
 
-    public AddParent() {
+    public ChangeListener() {
     }
 
     @Override
-    public void doAction(ActionEvent e) {
+    public void doAction(ActionEvent e) throws IllegalUserActionException {
         String name = ((Component) e.getSource()).getName();
         GuiPackage guiPackage = GuiPackage.getInstance();
+        JMeterTreeNode currentNode = guiPackage.getTreeListener().getCurrentNode();
+        if (!(currentNode.getUserObject() instanceof TestElement)) {
+            Toolkit.getDefaultToolkit().beep();
+            return;
+        }
         try {
             guiPackage.updateCurrentNode();
-            TestElement controller = guiPackage.createTestElement(name);
-            addParentToTree(controller);
+            TestElement listener = guiPackage.createTestElement(name);
+            ChangeElement.listener(listener, guiPackage, currentNode);
         } catch (Exception err) {
-            log.error("Exception while adding a TestElement.", err);
+            Toolkit.getDefaultToolkit().beep();
+            log.error("Failed to change listener element", err);
         }
-
     }
 
     @Override
     public Set<String> getActionNames() {
         return commands;
     }
 
-    protected static void addParentToTree(TestElement newParent) {
-        GuiPackage guiPackage = GuiPackage.getInstance();
-        JMeterTreeNode newNode = new JMeterTreeNode(newParent, guiPackage.getTreeModel());
-        JMeterTreeNode currentNode = guiPackage.getTreeListener().getCurrentNode();
-        JMeterTreeNode parentNode = (JMeterTreeNode) currentNode.getParent();
-        int index = parentNode.getIndex(currentNode);
-        guiPackage.getTreeModel().insertNodeInto(newNode, parentNode, index);
-        JMeterTreeNode[] nodes = guiPackage.getTreeListener().getSelectedNodes();
-        for (JMeterTreeNode node : nodes) {
-            moveNode(guiPackage, node, newNode);
-        }
-    }
-
-    private static void moveNode(GuiPackage guiPackage, JMeterTreeNode node, JMeterTreeNode newParentNode) {
-        guiPackage.getTreeModel().removeNodeFromParent(node);
-        guiPackage.getTreeModel().insertNodeInto(node, newParentNode, newParentNode.getChildCount());
-    }
 }