From 7c289b94d465fb24ae759fc5395514d17e6c26f4 Mon Sep 17 00:00:00 2001 From: Vincent Herilier Date: Fri, 2 Dec 2016 17:29:18 +0100 Subject: [PATCH 01/10] introduce the submenu mechanism coming from the gui ot the beaninfo definiton --- .../apache/jmeter/gui/JMeterGUIComponent.java | 17 ++++ .../jmeter/gui/tree/JMeterTreeNode.java | 9 ++ .../apache/jmeter/gui/util/MenuFactory.java | 92 +++++++++++++++---- .../org/apache/jmeter/gui/util/MenuInfo.java | 12 ++- .../jmeter/testbeans/BeanInfoSupport.java | 11 +++ .../jmeter/testbeans/gui/TestBeanGUI.java | 24 ++++- 6 files changed, 144 insertions(+), 21 deletions(-) diff --git a/src/core/org/apache/jmeter/gui/JMeterGUIComponent.java b/src/core/org/apache/jmeter/gui/JMeterGUIComponent.java index b4f546f4e00..0e28baee017 100644 --- a/src/core/org/apache/jmeter/gui/JMeterGUIComponent.java +++ b/src/core/org/apache/jmeter/gui/JMeterGUIComponent.java @@ -221,4 +221,21 @@ public interface JMeterGUIComponent extends ClearGui { * @see org.apache.jmeter.gui.util.MenuFactory */ Collection getMenuCategories(); + + /** + * This is the list of add sub menu categories this gui component will be + * available under. For instance, if this represents a Controller, then the + * MenuFactory.CONTROLLERS sub category should be in the returned collection. + * When a user right-clicks on a tree element and looks through the "add" + * menu, which sub category your GUI component shows up in is determined by + * which sub categories are returned by this method. Most GUI's belong to only + * one sub category, but it is possible for a component to exist in multiple + * sub categories. + * + * @return a Collection of Strings, where each element is one of the + * constants defined in MenuFactory + * + * @see org.apache.jmeter.gui.util.MenuFactory + */ + Collection getSubMenuCategories(); } diff --git a/src/core/org/apache/jmeter/gui/tree/JMeterTreeNode.java b/src/core/org/apache/jmeter/gui/tree/JMeterTreeNode.java index 6d8b79a35c6..691d994d9a8 100644 --- a/src/core/org/apache/jmeter/gui/tree/JMeterTreeNode.java +++ b/src/core/org/apache/jmeter/gui/tree/JMeterTreeNode.java @@ -151,6 +151,15 @@ public Collection getMenuCategories() { } } + public Collection getSubMenuCategories() { + try { + return GuiPackage.getInstance().getGui(getTestElement()).getSubMenuCategories(); + } catch (Exception e) { + log.error("Can't get popup sub menu for gui", e); + return null; + } + } + public JPopupMenu createPopupMenu() { try { return GuiPackage.getInstance().getGui(getTestElement()).createPopupMenu(); diff --git a/src/core/org/apache/jmeter/gui/util/MenuFactory.java b/src/core/org/apache/jmeter/gui/util/MenuFactory.java index e735b253b1f..c92e60ea35c 100644 --- a/src/core/org/apache/jmeter/gui/util/MenuFactory.java +++ b/src/core/org/apache/jmeter/gui/util/MenuFactory.java @@ -19,9 +19,11 @@ package org.apache.jmeter.gui.util; import java.awt.Component; +import java.awt.ComponentOrientation; import java.awt.HeadlessException; import java.io.IOException; import java.io.Serializable; +import java.util.ArrayList; import java.util.Collection; import java.util.Collections; import java.util.Comparator; @@ -278,7 +280,7 @@ public static JMenu makeMenus(String[] categories, String label, String actionCo } public static JPopupMenu getDefaultControllerMenu() { - JPopupMenu pop = new JPopupMenu(); + JPopupMenu pop = new JPopupMenu(); pop.add(MenuFactory.makeMenus(MENU_ADD_CONTROLLER, JMeterUtils.getResString("add"),// $NON-NLS-1$ ActionNames.ADD)); @@ -294,7 +296,7 @@ public static JPopupMenu getDefaultControllerMenu() { } public static JPopupMenu getDefaultSamplerMenu() { - JPopupMenu pop = new JPopupMenu(); + JPopupMenu pop = new JPopupMenu(); pop.add(MenuFactory.makeMenus(MENU_ADD_SAMPLER, JMeterUtils.getResString("add"),// $NON-NLS-1$ ActionNames.ADD)); @@ -372,9 +374,25 @@ public static JMenu makeMenu(String category, String actionCommand) { * @return the menu */ public static JMenu makeMenu(Collection menuInfo, String actionCommand, String menuName) { + final Map subMenusList = new HashMap(); JMenu menu = new JMenu(menuName); + for (MenuInfo info : menuInfo) { - menu.add(makeMenuItem(info, actionCommand)); + if (info.getDrawer() == null || info.getDrawer().equals("")) { + menu.add(makeMenuItem(info, actionCommand)); + } else { + JMenu newSubMenu = subMenusList.get(info.getDrawer()); + + if (newSubMenu == null) { + newSubMenu = new JMenu(info.getDrawer()); + } + + newSubMenu.add(makeMenuItem(info, actionCommand)); + menu.add(newSubMenu); + subMenusList.put(info.getDrawer(), newSubMenu); + + GuiUtils.makeScrollableMenu(newSubMenu); + } } GuiUtils.makeScrollableMenu(menu); return menu; @@ -512,50 +530,88 @@ private static void initializeMenus() { } else { elementsToSkip.add(name); // Don't add it again } + Collection categories = item.getMenuCategories(); if (categories == null) { - log.debug(name + " participates in no menus."); - continue; + log.debug(name + " participates in no menus."); + continue; + } + + Collection subMenus = new ArrayList(); + Collection subCategories = item.getSubMenuCategories(); + if (subCategories == null) { + log.debug(name + " participates in no sub menus."); + subMenus.add(new MenuInfo(item, "", name)); + } else { + for (String subCategory: subCategories) { + log.debug(name + " participates in '" + subCategory + "' sub menu."); + subMenus.add(new MenuInfo(item, subCategory, name)); + } } + if (categories.contains(THREADS)) { - threads.add(new MenuInfo(item, name)); + for (MenuInfo submenu: subMenus) { + threads.add(submenu); + } } + if (categories.contains(FRAGMENTS)) { - fragments.add(new MenuInfo(item, name)); + for (MenuInfo submenu: subMenus) { + fragments.add(submenu); + } } + if (categories.contains(TIMERS)) { - timers.add(new MenuInfo(item, name)); + for (MenuInfo submenu: subMenus) { + timers.add(submenu); + } } if (categories.contains(POST_PROCESSORS)) { - postProcessors.add(new MenuInfo(item, name)); + for (MenuInfo submenu: subMenus) { + postProcessors.add(submenu); + } } if (categories.contains(PRE_PROCESSORS)) { - preProcessors.add(new MenuInfo(item, name)); + for (MenuInfo submenu: subMenus) { + preProcessors.add(submenu); + } } if (categories.contains(CONTROLLERS)) { - controllers.add(new MenuInfo(item, name)); + for (MenuInfo submenu: subMenus) { + controllers.add(submenu); + } } if (categories.contains(SAMPLERS)) { - samplers.add(new MenuInfo(item, name)); + for (MenuInfo submenu: subMenus) { + samplers.add(submenu); + } } if (categories.contains(NON_TEST_ELEMENTS)) { - nonTestElements.add(new MenuInfo(item, name)); + for (MenuInfo submenu: subMenus) { + nonTestElements.add(submenu); + } } if (categories.contains(LISTENERS)) { - listeners.add(new MenuInfo(item, name)); + for (MenuInfo submenu: subMenus) { + listeners.add(submenu); + } } if (categories.contains(CONFIG_ELEMENTS)) { - configElements.add(new MenuInfo(item, name)); + for (MenuInfo submenu: subMenus) { + configElements.add(submenu); + } } if (categories.contains(ASSERTIONS)) { - assertions.add(new MenuInfo(item, name)); + for (MenuInfo submenu: subMenus) { + assertions.add(submenu); + } } } @@ -722,8 +778,8 @@ private static class MenuInfoComparator implements Comparator, Seriali } @Override public int compare(MenuInfo o1, MenuInfo o2) { - String lab1 = o1.getLabel(); - String lab2 = o2.getLabel(); + String lab1 = o1.getDrawer() + o1.getLabel(); + String lab2 = o2.getDrawer() + o2.getLabel(); if (caseBlind) { return lab1.toLowerCase(Locale.ENGLISH).compareTo(lab2.toLowerCase(Locale.ENGLISH)); } diff --git a/src/core/org/apache/jmeter/gui/util/MenuInfo.java b/src/core/org/apache/jmeter/gui/util/MenuInfo.java index c9004be3041..114a2c96505 100644 --- a/src/core/org/apache/jmeter/gui/util/MenuInfo.java +++ b/src/core/org/apache/jmeter/gui/util/MenuInfo.java @@ -27,18 +27,22 @@ public class MenuInfo { private final String label; + private final String drawer; + private final String className; private final JMeterGUIComponent guiComp; - public MenuInfo(String displayLabel, String classFullName) { + public MenuInfo(String displayLabel, String displayDrawer, String classFullName) { label = displayLabel; + drawer = displayDrawer; className = classFullName; guiComp = null; } - public MenuInfo(JMeterGUIComponent item, String classFullName) { + public MenuInfo(JMeterGUIComponent item, String displayDrawer, String classFullName) { label = item.getStaticLabel(); + drawer = displayDrawer; className = classFullName; guiComp = item; } @@ -50,6 +54,10 @@ public String getLabel(){ return label; } + public String getDrawer(){ + return drawer; + } + public String getClassName(){ return className; } diff --git a/src/core/org/apache/jmeter/testbeans/BeanInfoSupport.java b/src/core/org/apache/jmeter/testbeans/BeanInfoSupport.java index 51f49487ed4..2dfb2f35ca9 100644 --- a/src/core/org/apache/jmeter/testbeans/BeanInfoSupport.java +++ b/src/core/org/apache/jmeter/testbeans/BeanInfoSupport.java @@ -136,6 +136,17 @@ protected BeanInfoSupport(Class beanClass) { } else { log.debug("Localized display name not available for bean " + beanClass); } + + // Use shortDescription to manage sub menu categories related to the bean + final String sdKey = "shortDescription"; + // Localize the bean description + if (resourceBundle.containsKey(sdKey)) { // $NON-NLS-1$ + getBeanDescriptor().setShortDescription(resourceBundle.getString(sdKey)); // $NON-NLS-1$ + log.debug("Localized short Description for bean " + beanClass + " is " + resourceBundle.getString(sdKey)); + } else { + log.debug("Localized short Description not available for bean " + beanClass); + } + // Localize the property names and descriptions: PropertyDescriptor[] properties = getPropertyDescriptors(); for (PropertyDescriptor property : properties) { diff --git a/src/core/org/apache/jmeter/testbeans/gui/TestBeanGUI.java b/src/core/org/apache/jmeter/testbeans/gui/TestBeanGUI.java index c5b307fa7fa..63bc1713dcb 100644 --- a/src/core/org/apache/jmeter/testbeans/gui/TestBeanGUI.java +++ b/src/core/org/apache/jmeter/testbeans/gui/TestBeanGUI.java @@ -208,7 +208,7 @@ public String getStaticLabel() { * {@inheritDoc} */ @Override -public TestElement createTestElement() { + public TestElement createTestElement() { try { TestElement element = (TestElement) testBeanClass.newInstance(); // In other GUI component, clearGUI resets the value to defaults one as there is one GUI per Element @@ -385,6 +385,28 @@ public Collection getMenuCategories() { return menuCategories; } + /** {@inheritDoc} */ + @Override + public Collection getSubMenuCategories() { + List submenuCategories = new LinkedList(); + BeanDescriptor bd = beanInfo.getBeanDescriptor(); + + // We don't want to show expert beans in the menus unless we're + // in expert mode: + if (bd.isExpert() && !JMeterUtils.isExpertMode()) { + return null; + } + + // Avoid property bean descriptor behavior that uses displayName as description if shortDescription is empty or undefined + if (bd.getShortDescription().equals(bd.getDisplayName())) { + submenuCategories = Arrays.asList(""); + } else { + submenuCategories = Arrays.asList(bd.getShortDescription().split(";")); + } + + return submenuCategories; + } + /** * Setup GUI class * @return number of matches From d47a53eb14785296ba4fb1e4dc3ab4426b532ed1 Mon Sep 17 00:00:00 2001 From: Vincent Herilier Date: Fri, 2 Dec 2016 17:33:29 +0100 Subject: [PATCH 02/10] gather HTTP Protocol related elements --- src/core/org/apache/jmeter/resources/messages.properties | 1 + .../org/apache/jmeter/resources/messages_fr.properties | 1 + .../jmeter/protocol/http/config/gui/HttpDefaultsGui.java | 7 +++++++ .../jmeter/protocol/http/control/gui/AjpSamplerGui.java | 8 ++++++++ .../protocol/http/control/gui/HttpMirrorControlGui.java | 5 +++++ .../protocol/http/control/gui/HttpTestSampleGui.java | 7 +++++++ .../protocol/http/control/gui/RecordController.java | 7 +++++++ .../jmeter/protocol/http/control/gui/SoapSamplerGui.java | 9 +++++++++ .../org/apache/jmeter/protocol/http/gui/AuthPanel.java | 7 +++++++ .../apache/jmeter/protocol/http/gui/CacheManagerGui.java | 7 +++++++ .../org/apache/jmeter/protocol/http/gui/CookiePanel.java | 7 +++++++ .../apache/jmeter/protocol/http/gui/DNSCachePanel.java | 7 +++++++ .../org/apache/jmeter/protocol/http/gui/HeaderPanel.java | 7 +++++++ .../protocol/http/modifier/gui/AnchorModifierGui.java | 8 ++++++++ .../http/modifier/gui/RegExUserParametersGui.java | 7 +++++++ .../http/modifier/gui/URLRewritingModifierGui.java | 7 +++++++ .../jmeter/protocol/http/proxy/gui/ProxyControlGui.java | 6 ++++++ .../http/sampler/AccessLogSamplerResources.properties | 1 + .../http/sampler/AccessLogSamplerResources_fr.properties | 1 + 19 files changed, 110 insertions(+) diff --git a/src/core/org/apache/jmeter/resources/messages.properties b/src/core/org/apache/jmeter/resources/messages.properties index fe1682696ee..c5c3d83afaa 100644 --- a/src/core/org/apache/jmeter/resources/messages.properties +++ b/src/core/org/apache/jmeter/resources/messages.properties @@ -401,6 +401,7 @@ html_assertion_title=HTML Assertion html_extractor_title=CSS/JQuery Extractor html_extractor_type=CSS/JQuery Extractor Implementation http_implementation=Implementation: +http_protocol=HTTP Protocol http_response_code=HTTP response code http_url_rewriting_modifier_title=HTTP URL Re-writing Modifier http_user_parameter_modifier=HTTP User Parameter Modifier diff --git a/src/core/org/apache/jmeter/resources/messages_fr.properties b/src/core/org/apache/jmeter/resources/messages_fr.properties index 17b28c36963..62565f5a497 100644 --- a/src/core/org/apache/jmeter/resources/messages_fr.properties +++ b/src/core/org/apache/jmeter/resources/messages_fr.properties @@ -394,6 +394,7 @@ html_assertion_title=Assertion HTML html_extractor_title=Extracteur CSS/JQuery html_extractor_type=Impl\u00E9mentation de l'extracteur CSS/JQuery http_implementation=Impl\u00E9mentation \: +http_protocol=Protocole HTTP http_response_code=Code de r\u00E9ponse HTTP http_url_rewriting_modifier_title=Transcripteur d'URL HTTP http_user_parameter_modifier=Modificateur de param\u00E8tre utilisateur HTTP diff --git a/src/protocol/http/org/apache/jmeter/protocol/http/config/gui/HttpDefaultsGui.java b/src/protocol/http/org/apache/jmeter/protocol/http/config/gui/HttpDefaultsGui.java index 5f9266a385a..af218831d4b 100644 --- a/src/protocol/http/org/apache/jmeter/protocol/http/config/gui/HttpDefaultsGui.java +++ b/src/protocol/http/org/apache/jmeter/protocol/http/config/gui/HttpDefaultsGui.java @@ -22,6 +22,8 @@ import java.awt.Dimension; import java.awt.event.ItemEvent; import java.awt.event.ItemListener; +import java.util.Arrays; +import java.util.Collection; import javax.swing.BorderFactory; import javax.swing.JCheckBox; @@ -77,6 +79,11 @@ public HttpDefaultsGui() { public String getLabelResource() { return "url_config_title"; // $NON-NLS-1$ } + + @Override + public Collection getSubMenuCategories() { + return Arrays.asList(JMeterUtils.getResString("http_protocol")); // $NON-NLS-1$ + } /** * @see org.apache.jmeter.gui.JMeterGUIComponent#createTestElement() diff --git a/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/AjpSamplerGui.java b/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/AjpSamplerGui.java index 3fb653cafcb..9512b91a18d 100644 --- a/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/AjpSamplerGui.java +++ b/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/AjpSamplerGui.java @@ -17,6 +17,9 @@ package org.apache.jmeter.protocol.http.control.gui; +import java.util.Arrays; +import java.util.Collection; + import org.apache.jmeter.protocol.http.control.gui.HttpTestSampleGui; import org.apache.jmeter.protocol.http.sampler.AjpSampler; import org.apache.jmeter.testelement.TestElement; @@ -42,6 +45,11 @@ public TestElement createTestElement() { public String getStaticLabel() { return JMeterUtils.getResString("ajp_sampler_title"); // $NON-NLS-1$ } + + @Override + public Collection getSubMenuCategories() { + return Arrays.asList(JMeterUtils.getResString("http_protocol")); // $NON-NLS-1$ + } @Override public String getDocAnchor() {// reuse documentation diff --git a/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/HttpMirrorControlGui.java b/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/HttpMirrorControlGui.java index d6091f17baa..dfd4d73c5cd 100644 --- a/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/HttpMirrorControlGui.java +++ b/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/HttpMirrorControlGui.java @@ -103,6 +103,11 @@ public String getLabelResource() { public Collection getMenuCategories() { return Arrays.asList(MenuFactory.NON_TEST_ELEMENTS); } + + @Override + public Collection getSubMenuCategories() { + return Arrays.asList(JMeterUtils.getResString("http_protocol")); // $NON-NLS-1$ + } @Override public void configure(TestElement element) { diff --git a/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/HttpTestSampleGui.java b/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/HttpTestSampleGui.java index d6aede3807f..7eab19cba88 100644 --- a/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/HttpTestSampleGui.java +++ b/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/HttpTestSampleGui.java @@ -22,6 +22,8 @@ import java.awt.Dimension; import java.awt.event.ItemEvent; import java.awt.event.ItemListener; +import java.util.Arrays; +import java.util.Collection; import javax.swing.BorderFactory; import javax.swing.JCheckBox; @@ -138,6 +140,11 @@ public void modifyTestElement(TestElement sampler) { public String getLabelResource() { return "web_testing_title"; // $NON-NLS-1$ } + + @Override + public Collection getSubMenuCategories() { + return Arrays.asList(JMeterUtils.getResString("http_protocol")); // $NON-NLS-1$ + } private void init() {// called from ctor, so must not be overridable setLayout(new BorderLayout(0, 5)); diff --git a/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/RecordController.java b/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/RecordController.java index 7bfc21dd390..75b3371a8b0 100644 --- a/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/RecordController.java +++ b/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/RecordController.java @@ -21,6 +21,8 @@ import java.awt.Toolkit; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; +import java.util.Arrays; +import java.util.Collection; import javax.swing.BoxLayout; import javax.swing.JButton; @@ -55,6 +57,11 @@ public RecordController() { public String getLabelResource() { return "record_controller_title"; // $NON-NLS-1$ } + + @Override + public Collection getSubMenuCategories() { + return Arrays.asList(JMeterUtils.getResString("http_protocol")); // $NON-NLS-1$ + } @Override public TestElement createTestElement() { diff --git a/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/SoapSamplerGui.java b/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/SoapSamplerGui.java index edf98c3310c..02534a32c34 100644 --- a/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/SoapSamplerGui.java +++ b/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/SoapSamplerGui.java @@ -24,6 +24,8 @@ import java.awt.GridBagConstraints; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; +import java.util.Arrays; +import java.util.Collection; import javax.swing.JCheckBox; import javax.swing.JPanel; @@ -65,6 +67,13 @@ public TestElement createTestElement() { modifyTestElement(sampler); return sampler; } + + @Override + public Collection getSubMenuCategories() { + return Arrays.asList(JMeterUtils.getResString("http_protocol")); // $NON-NLS-1$ + } + + /** * Modifies a given TestElement to mirror the data in the gui components. diff --git a/src/protocol/http/org/apache/jmeter/protocol/http/gui/AuthPanel.java b/src/protocol/http/org/apache/jmeter/protocol/http/gui/AuthPanel.java index 18997f668e6..839cba36941 100644 --- a/src/protocol/http/org/apache/jmeter/protocol/http/gui/AuthPanel.java +++ b/src/protocol/http/org/apache/jmeter/protocol/http/gui/AuthPanel.java @@ -24,6 +24,8 @@ import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.io.IOException; +import java.util.Arrays; +import java.util.Collection; import javax.swing.BorderFactory; import javax.swing.DefaultCellEditor; @@ -147,6 +149,11 @@ public void configure(TestElement el) { public String getLabelResource() { return "auth_manager_title"; //$NON-NLS-1$ } + + @Override + public Collection getSubMenuCategories() { + return Arrays.asList(JMeterUtils.getResString("http_protocol")); // $NON-NLS-1$ + } /** * Shows the main authentication panel for this object. diff --git a/src/protocol/http/org/apache/jmeter/protocol/http/gui/CacheManagerGui.java b/src/protocol/http/org/apache/jmeter/protocol/http/gui/CacheManagerGui.java index ae9027713bb..cc66cca6ba1 100644 --- a/src/protocol/http/org/apache/jmeter/protocol/http/gui/CacheManagerGui.java +++ b/src/protocol/http/org/apache/jmeter/protocol/http/gui/CacheManagerGui.java @@ -19,6 +19,8 @@ package org.apache.jmeter.protocol.http.gui; import java.awt.BorderLayout; +import java.util.Arrays; +import java.util.Collection; import javax.swing.JCheckBox; import javax.swing.JLabel; @@ -56,6 +58,11 @@ public CacheManagerGui() { public String getLabelResource() { return "cache_manager_title"; // $NON-NLS-1$ } + + @Override + public Collection getSubMenuCategories() { + return Arrays.asList(JMeterUtils.getResString("http_protocol")); // $NON-NLS-1$ + } /** * A newly created component can be initialized with the contents of a Test diff --git a/src/protocol/http/org/apache/jmeter/protocol/http/gui/CookiePanel.java b/src/protocol/http/org/apache/jmeter/protocol/http/gui/CookiePanel.java index 744951b2653..f2c410001f6 100644 --- a/src/protocol/http/org/apache/jmeter/protocol/http/gui/CookiePanel.java +++ b/src/protocol/http/org/apache/jmeter/protocol/http/gui/CookiePanel.java @@ -24,6 +24,8 @@ import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.io.IOException; +import java.util.Arrays; +import java.util.Collection; import java.util.Collections; import java.util.HashMap; import java.util.List; @@ -140,6 +142,11 @@ public CookiePanel() { public String getLabelResource() { return "cookie_manager_title"; //$NON-NLS-1$ } + + @Override + public Collection getSubMenuCategories() { + return Arrays.asList(JMeterUtils.getResString("http_protocol")); // $NON-NLS-1$ + } @Override public void actionPerformed(ActionEvent e) { diff --git a/src/protocol/http/org/apache/jmeter/protocol/http/gui/DNSCachePanel.java b/src/protocol/http/org/apache/jmeter/protocol/http/gui/DNSCachePanel.java index 45891ef6a41..b3de518b120 100644 --- a/src/protocol/http/org/apache/jmeter/protocol/http/gui/DNSCachePanel.java +++ b/src/protocol/http/org/apache/jmeter/protocol/http/gui/DNSCachePanel.java @@ -22,6 +22,8 @@ import java.awt.Dimension; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; +import java.util.Arrays; +import java.util.Collection; import javax.swing.BorderFactory; import javax.swing.ButtonGroup; @@ -104,6 +106,11 @@ public DNSCachePanel() { public String getLabelResource() { return "dns_cache_manager_title"; } + + @Override + public Collection getSubMenuCategories() { + return Arrays.asList(JMeterUtils.getResString("http_protocol")); // $NON-NLS-1$ + } /** * Modifies a given TestElement to mirror the data in the gui components. diff --git a/src/protocol/http/org/apache/jmeter/protocol/http/gui/HeaderPanel.java b/src/protocol/http/org/apache/jmeter/protocol/http/gui/HeaderPanel.java index 46e1612d094..4bc46dd9db9 100644 --- a/src/protocol/http/org/apache/jmeter/protocol/http/gui/HeaderPanel.java +++ b/src/protocol/http/org/apache/jmeter/protocol/http/gui/HeaderPanel.java @@ -25,6 +25,8 @@ import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.io.IOException; +import java.util.Arrays; +import java.util.Collection; import javax.swing.BorderFactory; import javax.swing.JButton; @@ -128,6 +130,11 @@ public void configure(TestElement el) { public String getLabelResource() { return "header_manager_title"; // $NON-NLS-1$ } + + @Override + public Collection getSubMenuCategories() { + return Arrays.asList(JMeterUtils.getResString("http_protocol")); // $NON-NLS-1$ + } private void init() {// called from ctor, so must not be overridable setLayout(new BorderLayout()); diff --git a/src/protocol/http/org/apache/jmeter/protocol/http/modifier/gui/AnchorModifierGui.java b/src/protocol/http/org/apache/jmeter/protocol/http/modifier/gui/AnchorModifierGui.java index a48ee4c97b2..b6a22ffbadf 100644 --- a/src/protocol/http/org/apache/jmeter/protocol/http/modifier/gui/AnchorModifierGui.java +++ b/src/protocol/http/org/apache/jmeter/protocol/http/modifier/gui/AnchorModifierGui.java @@ -19,10 +19,13 @@ package org.apache.jmeter.protocol.http.modifier.gui; import java.awt.BorderLayout; +import java.util.Arrays; +import java.util.Collection; import org.apache.jmeter.processor.gui.AbstractPreProcessorGui; import org.apache.jmeter.protocol.http.modifier.AnchorModifier; import org.apache.jmeter.testelement.TestElement; +import org.apache.jmeter.util.JMeterUtils; public class AnchorModifierGui extends AbstractPreProcessorGui { private static final long serialVersionUID = 240L; @@ -35,6 +38,11 @@ public AnchorModifierGui() { public String getLabelResource() { return "anchor_modifier_title"; //$NON-NLS-1$ } + + @Override + public Collection getSubMenuCategories() { + return Arrays.asList(JMeterUtils.getResString("http_protocol")); // $NON-NLS-1$ + } @Override public TestElement createTestElement() { diff --git a/src/protocol/http/org/apache/jmeter/protocol/http/modifier/gui/RegExUserParametersGui.java b/src/protocol/http/org/apache/jmeter/protocol/http/modifier/gui/RegExUserParametersGui.java index aa3ffbd2cfa..c9a5a483532 100644 --- a/src/protocol/http/org/apache/jmeter/protocol/http/modifier/gui/RegExUserParametersGui.java +++ b/src/protocol/http/org/apache/jmeter/protocol/http/modifier/gui/RegExUserParametersGui.java @@ -21,6 +21,8 @@ import java.awt.BorderLayout; import java.awt.GridBagConstraints; import java.awt.GridBagLayout; +import java.util.Arrays; +import java.util.Collection; import java.util.List; import javax.swing.Box; @@ -58,6 +60,11 @@ public RegExUserParametersGui() { public String getLabelResource() { return "regex_params_title"; //$NON-NLS-1$ } + + @Override + public Collection getSubMenuCategories() { + return Arrays.asList(JMeterUtils.getResString("http_protocol")); // $NON-NLS-1$ + } @Override public void configure(TestElement el) { diff --git a/src/protocol/http/org/apache/jmeter/protocol/http/modifier/gui/URLRewritingModifierGui.java b/src/protocol/http/org/apache/jmeter/protocol/http/modifier/gui/URLRewritingModifierGui.java index 52d8f498c10..4b35f34d6d8 100644 --- a/src/protocol/http/org/apache/jmeter/protocol/http/modifier/gui/URLRewritingModifierGui.java +++ b/src/protocol/http/org/apache/jmeter/protocol/http/modifier/gui/URLRewritingModifierGui.java @@ -19,6 +19,8 @@ package org.apache.jmeter.protocol.http.modifier.gui; import java.awt.BorderLayout; +import java.util.Arrays; +import java.util.Collection; import javax.swing.JCheckBox; @@ -48,6 +50,11 @@ public class URLRewritingModifierGui extends AbstractPreProcessorGui { public String getLabelResource() { return "http_url_rewriting_modifier_title"; // $NON-NLS-1$ } + + @Override + public Collection getSubMenuCategories() { + return Arrays.asList(JMeterUtils.getResString("http_protocol")); // $NON-NLS-1$ + } public URLRewritingModifierGui() { init(); diff --git a/src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java b/src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java index 905e73a550c..d275431f129 100644 --- a/src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java +++ b/src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java @@ -314,6 +314,12 @@ public String getLabelResource() { public Collection getMenuCategories() { return Arrays.asList(MenuFactory.NON_TEST_ELEMENTS); } + + /** {@inheritDoc} */ + @Override + public Collection getSubMenuCategories() { + return Arrays.asList(JMeterUtils.getResString("http_protocol")); // $NON-NLS-1$ + } /** {@inheritDoc} */ @Override diff --git a/src/protocol/http/org/apache/jmeter/protocol/http/sampler/AccessLogSamplerResources.properties b/src/protocol/http/org/apache/jmeter/protocol/http/sampler/AccessLogSamplerResources.properties index 29594e8a2f0..e960076648d 100644 --- a/src/protocol/http/org/apache/jmeter/protocol/http/sampler/AccessLogSamplerResources.properties +++ b/src/protocol/http/org/apache/jmeter/protocol/http/sampler/AccessLogSamplerResources.properties @@ -14,6 +14,7 @@ # limitations under the License. displayName=Access Log Sampler +shortDescription=HTTP Protocol plugins.displayName=Plugin Classes accesslogfile.displayName=Log File Location defaults.displayName=Default Test Values diff --git a/src/protocol/http/org/apache/jmeter/protocol/http/sampler/AccessLogSamplerResources_fr.properties b/src/protocol/http/org/apache/jmeter/protocol/http/sampler/AccessLogSamplerResources_fr.properties index 452872c4c7c..478cdf06049 100644 --- a/src/protocol/http/org/apache/jmeter/protocol/http/sampler/AccessLogSamplerResources_fr.properties +++ b/src/protocol/http/org/apache/jmeter/protocol/http/sampler/AccessLogSamplerResources_fr.properties @@ -32,3 +32,4 @@ protocol.shortDescription=Protocole du serveur de test (http or https) plugins.displayName=Extension de Classes portString.displayName=Port portString.shortDescription=Num\u00E9ro de port de test +shortDescription=Protocole HTTP From e81ff6b992bae3a616e7133492d638133390813f Mon Sep 17 00:00:00 2001 From: Vincent Herilier Date: Fri, 2 Dec 2016 17:34:51 +0100 Subject: [PATCH 03/10] Gather FTP Protocol related elements --- src/core/org/apache/jmeter/resources/messages.properties | 1 + .../org/apache/jmeter/resources/messages_fr.properties | 1 + .../jmeter/protocol/ftp/config/gui/FtpConfigGui.java | 7 +++++++ .../jmeter/protocol/ftp/control/gui/FtpTestSamplerGui.java | 7 +++++++ 4 files changed, 16 insertions(+) diff --git a/src/core/org/apache/jmeter/resources/messages.properties b/src/core/org/apache/jmeter/resources/messages.properties index c5c3d83afaa..888af73540b 100644 --- a/src/core/org/apache/jmeter/resources/messages.properties +++ b/src/core/org/apache/jmeter/resources/messages.properties @@ -334,6 +334,7 @@ ftp_binary_mode=Use Binary mode ? ftp_get=get(RETR) ftp_local_file=Local File: ftp_local_file_contents=Local File Contents: +ftp_protocol=FTP Protocol ftp_put=put(STOR) ftp_remote_file=Remote File: ftp_sample_title=FTP Request Defaults diff --git a/src/core/org/apache/jmeter/resources/messages_fr.properties b/src/core/org/apache/jmeter/resources/messages_fr.properties index 62565f5a497..1d66c3c3b95 100644 --- a/src/core/org/apache/jmeter/resources/messages_fr.properties +++ b/src/core/org/apache/jmeter/resources/messages_fr.properties @@ -327,6 +327,7 @@ ftp_binary_mode=Utiliser le mode binaire ? ftp_get=R\u00E9cup\u00E9rer (get) ftp_local_file=Fichier local \: ftp_local_file_contents=Contenus fichier local \: +ftp_protocol=Protocole FTP ftp_put=D\u00E9poser (put) ftp_remote_file=Fichier distant \: ftp_sample_title=Param\u00E8tres FTP par d\u00E9faut diff --git a/src/protocol/ftp/org/apache/jmeter/protocol/ftp/config/gui/FtpConfigGui.java b/src/protocol/ftp/org/apache/jmeter/protocol/ftp/config/gui/FtpConfigGui.java index d7a6a789651..583de2a2729 100644 --- a/src/protocol/ftp/org/apache/jmeter/protocol/ftp/config/gui/FtpConfigGui.java +++ b/src/protocol/ftp/org/apache/jmeter/protocol/ftp/config/gui/FtpConfigGui.java @@ -19,6 +19,8 @@ package org.apache.jmeter.protocol.ftp.config.gui; import java.awt.BorderLayout; +import java.util.Arrays; +import java.util.Collection; import javax.swing.ButtonGroup; import javax.swing.JCheckBox; @@ -73,6 +75,11 @@ public FtpConfigGui(boolean displayName) { public String getLabelResource() { return "ftp_sample_title"; // $NON-NLS-1$ } + + @Override + public Collection getSubMenuCategories() { + return Arrays.asList(JMeterUtils.getResString("ftp_protocol")); // $NON-NLS-1$ + } @Override public void configure(TestElement element) { diff --git a/src/protocol/ftp/org/apache/jmeter/protocol/ftp/control/gui/FtpTestSamplerGui.java b/src/protocol/ftp/org/apache/jmeter/protocol/ftp/control/gui/FtpTestSamplerGui.java index b237daf3688..b9aaef2c66f 100644 --- a/src/protocol/ftp/org/apache/jmeter/protocol/ftp/control/gui/FtpTestSamplerGui.java +++ b/src/protocol/ftp/org/apache/jmeter/protocol/ftp/control/gui/FtpTestSamplerGui.java @@ -19,6 +19,8 @@ package org.apache.jmeter.protocol.ftp.control.gui; import java.awt.BorderLayout; +import java.util.Arrays; +import java.util.Collection; import javax.swing.BorderFactory; @@ -83,6 +85,11 @@ public void clearGui() { public String getLabelResource() { return "ftp_testing_title"; // $NON-NLS-1$ } + + @Override + public Collection getSubMenuCategories() { + return Arrays.asList(JMeterUtils.getResString("ftp_protocol")); // $NON-NLS-1$ + } private void init() { // WARNING: called from ctor so must not be overridden (i.e. must be private or final) setLayout(new BorderLayout(0, 5)); From c6de2317fe459de99d7d0425c29fa1c540ca2073 Mon Sep 17 00:00:00 2001 From: Vincent Herilier Date: Fri, 2 Dec 2016 17:36:39 +0100 Subject: [PATCH 04/10] Gather JDBC elements into "Databases" --- .../protocol/jdbc/config/DataSourceElementResources.properties | 1 + .../jdbc/config/DataSourceElementResources_fr.properties | 1 + .../jdbc/processor/JDBCPostProcessorResources.properties | 1 + .../jdbc/processor/JDBCPostProcessorResources_fr.properties | 1 + .../protocol/jdbc/processor/JDBCPreProcessorResources.properties | 1 + .../jdbc/processor/JDBCPreProcessorResources_fr.properties | 1 + .../jmeter/protocol/jdbc/sampler/JDBCSamplerResources.properties | 1 + .../protocol/jdbc/sampler/JDBCSamplerResources_fr.properties | 1 + 8 files changed, 8 insertions(+) diff --git a/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/config/DataSourceElementResources.properties b/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/config/DataSourceElementResources.properties index b5ae1715926..d09345e1de5 100644 --- a/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/config/DataSourceElementResources.properties +++ b/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/config/DataSourceElementResources.properties @@ -14,6 +14,7 @@ # limitations under the License. displayName=JDBC Connection Configuration +shortDescription=Databases pool.displayName=Connection Pool Configuration varName.displayName=Variable Name Bound to Pool keep-alive.displayName=Connection Validation by Pool diff --git a/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/config/DataSourceElementResources_fr.properties b/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/config/DataSourceElementResources_fr.properties index e5a92eb72dc..896f7ab189f 100644 --- a/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/config/DataSourceElementResources_fr.properties +++ b/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/config/DataSourceElementResources_fr.properties @@ -36,6 +36,7 @@ password.shortDescription=Mot de passe \u00E0 utiliser pour se connecter \u00E0 pool.displayName=Configuration du pool de connexions poolMax.displayName=Nombre maximum de connexions poolMax.shortDescription=Nombre maximum de connexions que le pool peut ouvrir en m\u00EAme temps +shortDescription=Base de donn\u00E9es timeout.displayName=Expiration du pool (ms) timeout.shortDescription=D\u00E9lai d'attente maximum pour obtenir une connexion du pool si ce dernier n'a plus de connexion disponible. A l'expiration, une exception est retourn\u00E9e. trimInterval.displayName=Intervalle de nettoyage des connexions disponibles (ms) diff --git a/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/processor/JDBCPostProcessorResources.properties b/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/processor/JDBCPostProcessorResources.properties index 8807c57a9f5..934f46580f4 100644 --- a/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/processor/JDBCPostProcessorResources.properties +++ b/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/processor/JDBCPostProcessorResources.properties @@ -14,6 +14,7 @@ # limitations under the License. displayName=JDBC PostProcessor +shortDescription=Databases varName.displayName=Variable Name Bound to Pool sql.displayName=SQL Query query.displayName=Query diff --git a/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/processor/JDBCPostProcessorResources_fr.properties b/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/processor/JDBCPostProcessorResources_fr.properties index 6b046e0c767..b65365a7c37 100644 --- a/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/processor/JDBCPostProcessorResources_fr.properties +++ b/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/processor/JDBCPostProcessorResources_fr.properties @@ -29,6 +29,7 @@ resultSetHandler.displayName=Gestion ResultSet resultSetHandler.shortDescription=Comment les valeurs de type ResultSet sont renvoy\u00E9es resultVariable.displayName=Nom de la variable des R\u00E9sultats resultVariable.shortDescription=Nom de la variable JMeter qui stocke les r\u00E9sultats sous forme d'objets dans une liste de type 'maps' permettant la recherche des r\u00E9sultats par nom de colonne. +shortDescription=Base de donn\u00E9es sql.displayName=Requ\u00EAte SQL varName.displayName=Nom de liaison avec le pool variableNames.displayName=Noms des variables diff --git a/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/processor/JDBCPreProcessorResources.properties b/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/processor/JDBCPreProcessorResources.properties index b9833e9315f..061e06b6f5b 100644 --- a/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/processor/JDBCPreProcessorResources.properties +++ b/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/processor/JDBCPreProcessorResources.properties @@ -14,6 +14,7 @@ # limitations under the License. displayName=JDBC PreProcessor +shortDescription=Databases varName.displayName=Variable Name Bound to Pool sql.displayName=SQL Query query.displayName=Query diff --git a/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/processor/JDBCPreProcessorResources_fr.properties b/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/processor/JDBCPreProcessorResources_fr.properties index 693169b43ea..acd229deff3 100644 --- a/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/processor/JDBCPreProcessorResources_fr.properties +++ b/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/processor/JDBCPreProcessorResources_fr.properties @@ -29,6 +29,7 @@ resultSetHandler.displayName=Gestion ResultSet resultSetHandler.shortDescription=Comment les valeurs de type ResultSet sont renvoy\u00E9es resultVariable.displayName=Nom de la variable des R\u00E9sultats resultVariable.shortDescription=Nom de la variable JMeter qui stocke les r\u00E9sultats sous forme d'objets dans une liste de type 'maps' permettant la recherche des r\u00E9sultats par nom de colonne. +shortDescription=Base de donn\u00E9es sql.displayName=Requ\u00EAte SQL varName.displayName=Nom de liaison avec le pool variableNames.displayName=Noms des variables diff --git a/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/sampler/JDBCSamplerResources.properties b/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/sampler/JDBCSamplerResources.properties index 181cc730307..400668ca593 100644 --- a/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/sampler/JDBCSamplerResources.properties +++ b/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/sampler/JDBCSamplerResources.properties @@ -14,6 +14,7 @@ # limitations under the License. displayName=JDBC Request +shortDescription=Databases varName.displayName=Variable Name Bound to Pool sql.displayName=SQL Query query.displayName=Query diff --git a/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/sampler/JDBCSamplerResources_fr.properties b/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/sampler/JDBCSamplerResources_fr.properties index af3d7f00979..64774c8d6b2 100644 --- a/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/sampler/JDBCSamplerResources_fr.properties +++ b/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/sampler/JDBCSamplerResources_fr.properties @@ -29,6 +29,7 @@ resultSetHandler.displayName=Gestion ResultSet resultSetHandler.shortDescription=Comment les valeurs de type ResultSet sont renvoy\u00E9es resultVariable.displayName=Nom de la variable des R\u00E9sultats resultVariable.shortDescription=Nom de la variable JMeter qui stocke les r\u00E9sultats sous forme d'objets dans une liste de type 'maps' permettant la recherche des r\u00E9sultats par nom de colonne. +shortDescription=Base de donn\u00E9es sql.displayName=Requ\u00EAte SQL varName.displayName=Nom de liaison avec le pool variableNames.displayName=Noms des variables From df1c3c23c44b44566a97a546a8a94fef91f7717b Mon Sep 17 00:00:00 2001 From: Vincent Herilier Date: Fri, 2 Dec 2016 17:38:11 +0100 Subject: [PATCH 05/10] Gathers LDAP Protocol related elements --- src/core/org/apache/jmeter/resources/messages.properties | 1 + .../org/apache/jmeter/resources/messages_fr.properties | 1 + .../protocol/ldap/config/gui/LDAPArgumentsPanel.java | 6 ++++++ .../jmeter/protocol/ldap/config/gui/LdapConfigGui.java | 7 +++++++ .../jmeter/protocol/ldap/config/gui/LdapExtConfigGui.java | 7 +++++++ .../protocol/ldap/control/gui/LdapExtTestSamplerGui.java | 8 ++++++++ .../protocol/ldap/control/gui/LdapTestSamplerGui.java | 7 +++++++ 7 files changed, 37 insertions(+) diff --git a/src/core/org/apache/jmeter/resources/messages.properties b/src/core/org/apache/jmeter/resources/messages.properties index 888af73540b..45784aee1fa 100644 --- a/src/core/org/apache/jmeter/resources/messages.properties +++ b/src/core/org/apache/jmeter/resources/messages.properties @@ -566,6 +566,7 @@ action_check_title=Test Running ldap_argument_list=LDAPArgument List ldap_connto=Connection timeout (in milliseconds) ldap_parse_results=Parse the search results ? +ldap_protocol=LDAP Protocol ldap_sample_title=LDAP Request Defaults ldap_search_baseobject=Perform baseobject search ldap_search_onelevel=Perform onelevel search diff --git a/src/core/org/apache/jmeter/resources/messages_fr.properties b/src/core/org/apache/jmeter/resources/messages_fr.properties index 1d66c3c3b95..d67ab0ca7d4 100644 --- a/src/core/org/apache/jmeter/resources/messages_fr.properties +++ b/src/core/org/apache/jmeter/resources/messages_fr.properties @@ -555,6 +555,7 @@ action_check_message=Un test est en cours, arr\u00EAtez le avant d''utiliser cet action_check_title=Test en cours ldap_argument_list=Liste d'arguments LDAP ldap_connto=D\u00E9lai d'attente de connexion (millisecondes) +ldap_protocol=Protocole LDAP ldap_parse_results=Examiner les r\u00E9sultats de recherche ? ldap_sample_title=Requ\u00EAte LDAP par d\u00E9faut ldap_search_baseobject=Effectuer une recherche 'baseobject' diff --git a/src/protocol/ldap/org/apache/jmeter/protocol/ldap/config/gui/LDAPArgumentsPanel.java b/src/protocol/ldap/org/apache/jmeter/protocol/ldap/config/gui/LDAPArgumentsPanel.java index b7b98beb1b1..ec73d0245af 100644 --- a/src/protocol/ldap/org/apache/jmeter/protocol/ldap/config/gui/LDAPArgumentsPanel.java +++ b/src/protocol/ldap/org/apache/jmeter/protocol/ldap/config/gui/LDAPArgumentsPanel.java @@ -23,6 +23,7 @@ import java.awt.FlowLayout; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; +import java.util.Arrays; import java.util.Collection; import java.util.Iterator; @@ -108,6 +109,11 @@ public LDAPArgumentsPanel(String label) { public Collection getMenuCategories() { return null; } + + @Override + public Collection getSubMenuCategories() { + return Arrays.asList(JMeterUtils.getResString("ldap_protocol")); // $NON-NLS-1$ + } @Override public String getLabelResource() { diff --git a/src/protocol/ldap/org/apache/jmeter/protocol/ldap/config/gui/LdapConfigGui.java b/src/protocol/ldap/org/apache/jmeter/protocol/ldap/config/gui/LdapConfigGui.java index b19425df25e..e24daf350be 100644 --- a/src/protocol/ldap/org/apache/jmeter/protocol/ldap/config/gui/LdapConfigGui.java +++ b/src/protocol/ldap/org/apache/jmeter/protocol/ldap/config/gui/LdapConfigGui.java @@ -22,6 +22,8 @@ import java.awt.CardLayout; import java.awt.event.ItemEvent; import java.awt.event.ItemListener; +import java.util.Arrays; +import java.util.Collection; import javax.swing.BorderFactory; import javax.swing.ButtonGroup; @@ -110,6 +112,11 @@ public LdapConfigGui(boolean displayName) { public String getLabelResource() { return "ldap_sample_title"; // $NON-NLS-1$ } + + @Override + public Collection getSubMenuCategories() { + return Arrays.asList(JMeterUtils.getResString("ldap_protocol")); // $NON-NLS-1$ + } /** * A newly created component can be initialized with the contents of a Test diff --git a/src/protocol/ldap/org/apache/jmeter/protocol/ldap/config/gui/LdapExtConfigGui.java b/src/protocol/ldap/org/apache/jmeter/protocol/ldap/config/gui/LdapExtConfigGui.java index b805b9498d0..0a864767921 100644 --- a/src/protocol/ldap/org/apache/jmeter/protocol/ldap/config/gui/LdapExtConfigGui.java +++ b/src/protocol/ldap/org/apache/jmeter/protocol/ldap/config/gui/LdapExtConfigGui.java @@ -22,6 +22,8 @@ import java.awt.CardLayout; import java.awt.event.ItemEvent; import java.awt.event.ItemListener; +import java.util.Arrays; +import java.util.Collection; import javax.swing.BorderFactory; import javax.swing.ButtonGroup; @@ -184,6 +186,11 @@ public LdapExtConfigGui(boolean displayName) { public String getLabelResource() { return "ldapext_sample_title"; // $NON-NLS-1$ } + + @Override + public Collection getSubMenuCategories() { + return Arrays.asList(JMeterUtils.getResString("ldap_protocol")); // $NON-NLS-1$ + } /** * A newly created component can be initialized with the contents of a Test diff --git a/src/protocol/ldap/org/apache/jmeter/protocol/ldap/control/gui/LdapExtTestSamplerGui.java b/src/protocol/ldap/org/apache/jmeter/protocol/ldap/control/gui/LdapExtTestSamplerGui.java index 0b8a44d5394..455f99ff9c2 100644 --- a/src/protocol/ldap/org/apache/jmeter/protocol/ldap/control/gui/LdapExtTestSamplerGui.java +++ b/src/protocol/ldap/org/apache/jmeter/protocol/ldap/control/gui/LdapExtTestSamplerGui.java @@ -19,6 +19,8 @@ package org.apache.jmeter.protocol.ldap.control.gui; import java.awt.BorderLayout; +import java.util.Arrays; +import java.util.Collection; import javax.swing.JPanel; @@ -26,6 +28,7 @@ import org.apache.jmeter.protocol.ldap.sampler.LDAPExtSampler; import org.apache.jmeter.samplers.gui.AbstractSamplerGui; import org.apache.jmeter.testelement.TestElement; +import org.apache.jmeter.util.JMeterUtils; /******************************************************************************* * @@ -96,6 +99,11 @@ public void clearGui() { public String getLabelResource() { return "ldapext_testing_title"; // $NON-NLS-1$ } + + @Override + public Collection getSubMenuCategories() { + return Arrays.asList(JMeterUtils.getResString("ldap_protocol")); // $NON-NLS-1$ + } private void init() { // WARNING: called from ctor so must not be overridden (i.e. must be private or final) setLayout(new BorderLayout(0, 5)); diff --git a/src/protocol/ldap/org/apache/jmeter/protocol/ldap/control/gui/LdapTestSamplerGui.java b/src/protocol/ldap/org/apache/jmeter/protocol/ldap/control/gui/LdapTestSamplerGui.java index 712e0c1f248..3549623a6f6 100644 --- a/src/protocol/ldap/org/apache/jmeter/protocol/ldap/control/gui/LdapTestSamplerGui.java +++ b/src/protocol/ldap/org/apache/jmeter/protocol/ldap/control/gui/LdapTestSamplerGui.java @@ -19,6 +19,8 @@ package org.apache.jmeter.protocol.ldap.control.gui; import java.awt.BorderLayout; +import java.util.Arrays; +import java.util.Collection; import javax.swing.BorderFactory; @@ -92,6 +94,11 @@ public void clearGui() { public String getLabelResource() { return "ldap_testing_title"; // $NON-NLS-1$ } + + @Override + public Collection getSubMenuCategories() { + return Arrays.asList(JMeterUtils.getResString("ldap_protocol")); // $NON-NLS-1$ + } private void init() { // WARNING: called from ctor so must not be overridden (i.e. must be private or final) setLayout(new BorderLayout(0, 5)); From e3d4da9c10cfa74fa2fed5860782ac5412a52b10 Mon Sep 17 00:00:00 2001 From: Vincent Herilier Date: Fri, 2 Dec 2016 17:39:00 +0100 Subject: [PATCH 06/10] Gathers 'MongoDB' related elements into "Databases" too --- .../mongodb/config/MongoSourceElementResources.properties | 1 + .../mongodb/config/MongoSourceElementResources_fr.properties | 1 + .../mongodb/sampler/MongoScriptSamplerResources.properties | 3 ++- .../mongodb/sampler/MongoScriptSamplerResources_fr.properties | 1 + 4 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/protocol/mongodb/org/apache/jmeter/protocol/mongodb/config/MongoSourceElementResources.properties b/src/protocol/mongodb/org/apache/jmeter/protocol/mongodb/config/MongoSourceElementResources.properties index 81922f6876e..ee74487229e 100644 --- a/src/protocol/mongodb/org/apache/jmeter/protocol/mongodb/config/MongoSourceElementResources.properties +++ b/src/protocol/mongodb/org/apache/jmeter/protocol/mongodb/config/MongoSourceElementResources.properties @@ -35,6 +35,7 @@ mongodb.displayName=MongoDB Connection mongodb.shortDescription=Configure the connection options.displayName=MongoDB Options options.shortDescription=Various settings for the driver +shortDescription=Databases safe.displayName=Safe safe.shortDescription=If true the driver will use a WriteConcern of WriteConcern.SAFE for all operations.

If w, wtimeout, fsync or j are specified, this setting is ignored.

Default is false. socketKeepAlive.displayName=Socket keep alive diff --git a/src/protocol/mongodb/org/apache/jmeter/protocol/mongodb/config/MongoSourceElementResources_fr.properties b/src/protocol/mongodb/org/apache/jmeter/protocol/mongodb/config/MongoSourceElementResources_fr.properties index f1c6da1f4db..61f2fbfefa7 100644 --- a/src/protocol/mongodb/org/apache/jmeter/protocol/mongodb/config/MongoSourceElementResources_fr.properties +++ b/src/protocol/mongodb/org/apache/jmeter/protocol/mongodb/config/MongoSourceElementResources_fr.properties @@ -37,6 +37,7 @@ options.displayName=Options MongoDB options.shortDescription=Divers param\u00E8tres pour le gestionnaire safe.displayName=S\u00FBret\u00E9 (Safe) safe.shortDescription=Si positionn\u00E9 \u00E0 True, le gestionnaire utilisera un WriteConcern de WriteConcern.SAFE pour toutes les op\u00E9rations.

Si w, wtimeout, fsync or j sont sp\u00E9cifi\u00E9s, ce param\u00E8tre est ignor\u00E9.

La valeur par d\u00E9faut est False. +shortDescription=Base de donn\u00E9es socketKeepAlive.displayName=Socket persistante socketKeepAlive.shortDescription=Cet indicateur contr\u00F4le la fonctionnalit\u00E9 de garder la socket persistante \u00E0 travers un pare-feu Socket.setKeepAlive(boolean)

La valeur par d\u00E9faut est false. socketTimeout.displayName=D\u00E9lai d'expiration Socket diff --git a/src/protocol/mongodb/org/apache/jmeter/protocol/mongodb/sampler/MongoScriptSamplerResources.properties b/src/protocol/mongodb/org/apache/jmeter/protocol/mongodb/sampler/MongoScriptSamplerResources.properties index a30574decb8..7fedfcbe3cd 100644 --- a/src/protocol/mongodb/org/apache/jmeter/protocol/mongodb/sampler/MongoScriptSamplerResources.properties +++ b/src/protocol/mongodb/org/apache/jmeter/protocol/mongodb/sampler/MongoScriptSamplerResources.properties @@ -21,7 +21,8 @@ mongodb.shortDescription=Configure the connection password.displayName=Password sampler.displayName=Script script.displayName=The script to run -script.shortDescription=Add your mongo shell script as you would via the mongo shell. +script.shortDescription=Add your mongo shell script as you would via the mongo shell. +shortDescription=Databases source.displayName=MongoDB Source source.shortDescription=Configure the Source username.displayName=Username diff --git a/src/protocol/mongodb/org/apache/jmeter/protocol/mongodb/sampler/MongoScriptSamplerResources_fr.properties b/src/protocol/mongodb/org/apache/jmeter/protocol/mongodb/sampler/MongoScriptSamplerResources_fr.properties index 025868c1873..96a4872f598 100644 --- a/src/protocol/mongodb/org/apache/jmeter/protocol/mongodb/sampler/MongoScriptSamplerResources_fr.properties +++ b/src/protocol/mongodb/org/apache/jmeter/protocol/mongodb/sampler/MongoScriptSamplerResources_fr.properties @@ -22,6 +22,7 @@ password.displayName=Mot de passe sampler.displayName=Script script.displayName=Le script \u00E0 ex\u00E9cuter script.shortDescription=Ajouter votre script shell mongo comme vous le feriez dans le shell mongo. +shortDescription=Base de donn\u00E9es source.displayName=Source MongoDB source.shortDescription=Configurer la Source username.displayName=Utilisateur From 16198d0e587d773f0c9cac7bd5684d3c4c1ffa68 Mon Sep 17 00:00:00 2001 From: Vincent Herilier Date: Mon, 5 Dec 2016 10:15:33 +0100 Subject: [PATCH 07/10] align remaining JMeter elements to fit submenu mechanism --- .../jmeter/visualizers/PropertyControlGui.java | 7 ++++++- .../jmeter/assertions/gui/AbstractAssertionGui.java | 5 +++++ .../apache/jmeter/config/gui/AbstractConfigGui.java | 5 +++++ .../apache/jmeter/config/gui/ArgumentsPanel.java | 8 ++++++++ .../org/apache/jmeter/config/gui/ObsoleteGui.java | 5 +++++ .../jmeter/control/gui/AbstractControllerGui.java | 5 +++++ .../control/gui/TestFragmentControllerGui.java | 4 ++++ .../org/apache/jmeter/control/gui/TestPlanGui.java | 5 +++++ .../org/apache/jmeter/control/gui/WorkBenchGui.java | 13 +++++++++++++ src/core/org/apache/jmeter/gui/NamePanel.java | 6 ++++++ .../processor/gui/AbstractPostProcessorGui.java | 5 +++++ .../processor/gui/AbstractPreProcessorGui.java | 5 +++++ .../jmeter/samplers/gui/AbstractSamplerGui.java | 5 +++++ .../jmeter/threads/gui/AbstractThreadGroupGui.java | 5 +++++ .../apache/jmeter/timers/gui/AbstractTimerGui.java | 5 +++++ .../jmeter/visualizers/gui/AbstractListenerGui.java | 5 +++++ .../apache/jmeter/visualizers/GenerateTreeGui.java | 5 +++++ 17 files changed, 97 insertions(+), 1 deletion(-) diff --git a/src/components/org/apache/jmeter/visualizers/PropertyControlGui.java b/src/components/org/apache/jmeter/visualizers/PropertyControlGui.java index 486955f8969..931963498a5 100644 --- a/src/components/org/apache/jmeter/visualizers/PropertyControlGui.java +++ b/src/components/org/apache/jmeter/visualizers/PropertyControlGui.java @@ -93,6 +93,11 @@ public Collection getMenuCategories() { return Arrays.asList(MenuFactory.NON_TEST_ELEMENTS); } + @Override + public Collection getSubMenuCategories() { + return null; + } + @Override public void actionPerformed(ActionEvent action) { String command = action.getActionCommand(); @@ -114,7 +119,7 @@ public TestElement createTestElement() { modifyTestElement(el); return el; } - + @Override public void configure(TestElement element) { super.configure(element); diff --git a/src/core/org/apache/jmeter/assertions/gui/AbstractAssertionGui.java b/src/core/org/apache/jmeter/assertions/gui/AbstractAssertionGui.java index 107a6ffab3d..ca0ce9abb05 100644 --- a/src/core/org/apache/jmeter/assertions/gui/AbstractAssertionGui.java +++ b/src/core/org/apache/jmeter/assertions/gui/AbstractAssertionGui.java @@ -51,4 +51,9 @@ public abstract class AbstractAssertionGui extends AbstractScopedJMeterGuiCompon public Collection getMenuCategories() { return Arrays.asList(MenuFactory.ASSERTIONS); } + + @Override + public Collection getSubMenuCategories() { + return null; + } } diff --git a/src/core/org/apache/jmeter/config/gui/AbstractConfigGui.java b/src/core/org/apache/jmeter/config/gui/AbstractConfigGui.java index 7e4754c0cd8..5d4f61d5ef1 100644 --- a/src/core/org/apache/jmeter/config/gui/AbstractConfigGui.java +++ b/src/core/org/apache/jmeter/config/gui/AbstractConfigGui.java @@ -63,4 +63,9 @@ public JPopupMenu createPopupMenu() { public Collection getMenuCategories() { return Arrays.asList(MenuFactory.CONFIG_ELEMENTS); } + + @Override + public Collection getSubMenuCategories() { + return null; + } } diff --git a/src/core/org/apache/jmeter/config/gui/ArgumentsPanel.java b/src/core/org/apache/jmeter/config/gui/ArgumentsPanel.java index 26f640f4dfb..b7c5e29e0aa 100644 --- a/src/core/org/apache/jmeter/config/gui/ArgumentsPanel.java +++ b/src/core/org/apache/jmeter/config/gui/ArgumentsPanel.java @@ -204,6 +204,14 @@ public Collection getMenuCategories() { } return null; } + + @Override + public Collection getSubMenuCategories() { + if (standalone) { + return super.getSubMenuCategories(); + } + return null; + } @Override public String getLabelResource() { diff --git a/src/core/org/apache/jmeter/config/gui/ObsoleteGui.java b/src/core/org/apache/jmeter/config/gui/ObsoleteGui.java index 439eccf5656..4455f343fe5 100644 --- a/src/core/org/apache/jmeter/config/gui/ObsoleteGui.java +++ b/src/core/org/apache/jmeter/config/gui/ObsoleteGui.java @@ -73,5 +73,10 @@ public JPopupMenu createPopupMenu() { public Collection getMenuCategories() { return null; } + + @Override + public Collection getSubMenuCategories() { + return null; + } } diff --git a/src/core/org/apache/jmeter/control/gui/AbstractControllerGui.java b/src/core/org/apache/jmeter/control/gui/AbstractControllerGui.java index e8697590b3f..9a4fca9e10e 100644 --- a/src/core/org/apache/jmeter/control/gui/AbstractControllerGui.java +++ b/src/core/org/apache/jmeter/control/gui/AbstractControllerGui.java @@ -62,4 +62,9 @@ public JPopupMenu createPopupMenu() { public Collection getMenuCategories() { return Arrays.asList(MenuFactory.CONTROLLERS); } + + @Override + public Collection getSubMenuCategories() { + return null; + } } diff --git a/src/core/org/apache/jmeter/control/gui/TestFragmentControllerGui.java b/src/core/org/apache/jmeter/control/gui/TestFragmentControllerGui.java index 252e5bd9648..d706d020ce1 100644 --- a/src/core/org/apache/jmeter/control/gui/TestFragmentControllerGui.java +++ b/src/core/org/apache/jmeter/control/gui/TestFragmentControllerGui.java @@ -81,5 +81,9 @@ public Collection getMenuCategories() { return Arrays.asList(MenuFactory.FRAGMENTS); } + @Override + public Collection getSubMenuCategories() { + return null; + } } diff --git a/src/core/org/apache/jmeter/control/gui/TestPlanGui.java b/src/core/org/apache/jmeter/control/gui/TestPlanGui.java index a1de92936a6..95f7ff5246c 100644 --- a/src/core/org/apache/jmeter/control/gui/TestPlanGui.java +++ b/src/core/org/apache/jmeter/control/gui/TestPlanGui.java @@ -144,6 +144,11 @@ public Collection getMenuCategories() { return null; } + @Override + public Collection getSubMenuCategories() { + return null; + } + /** * A newly created component can be initialized with the contents of a Test * Element object by calling this method. The component is responsible for diff --git a/src/core/org/apache/jmeter/control/gui/WorkBenchGui.java b/src/core/org/apache/jmeter/control/gui/WorkBenchGui.java index 3db1a540b33..651d57305ef 100644 --- a/src/core/org/apache/jmeter/control/gui/WorkBenchGui.java +++ b/src/core/org/apache/jmeter/control/gui/WorkBenchGui.java @@ -64,6 +64,19 @@ public Collection getMenuCategories() { return null; } + /** + * This is the list of sub menu categories this gui component will be available + * under. This implementation returns null, since the WorkBench appears at + * the top level of the tree and cannot be added elsewhere. + * + * @return a Collection of Strings, where each element is one of the + * constants defined in MenuFactory + */ + @Override + public Collection getSubMenuCategories() { + return null; + } + /* Implements JMeterGUIComponent.createTestElement() */ @Override public TestElement createTestElement() { diff --git a/src/core/org/apache/jmeter/gui/NamePanel.java b/src/core/org/apache/jmeter/gui/NamePanel.java index 5dd22e9870a..f84f710ff1a 100644 --- a/src/core/org/apache/jmeter/gui/NamePanel.java +++ b/src/core/org/apache/jmeter/gui/NamePanel.java @@ -115,6 +115,12 @@ public Collection getMenuCategories() { return null; } + /** {@inheritDoc} */ + @Override + public Collection getSubMenuCategories() { + return null; + } + /** {@inheritDoc} */ @Override public TestElement createTestElement() { diff --git a/src/core/org/apache/jmeter/processor/gui/AbstractPostProcessorGui.java b/src/core/org/apache/jmeter/processor/gui/AbstractPostProcessorGui.java index bfd1ec2476e..a25cddee8e8 100644 --- a/src/core/org/apache/jmeter/processor/gui/AbstractPostProcessorGui.java +++ b/src/core/org/apache/jmeter/processor/gui/AbstractPostProcessorGui.java @@ -42,4 +42,9 @@ public Collection getMenuCategories() { return Arrays.asList(MenuFactory.POST_PROCESSORS); } + @Override + public Collection getSubMenuCategories() { + return null; + } + } diff --git a/src/core/org/apache/jmeter/processor/gui/AbstractPreProcessorGui.java b/src/core/org/apache/jmeter/processor/gui/AbstractPreProcessorGui.java index 087163ad355..8f03d6511c3 100644 --- a/src/core/org/apache/jmeter/processor/gui/AbstractPreProcessorGui.java +++ b/src/core/org/apache/jmeter/processor/gui/AbstractPreProcessorGui.java @@ -40,4 +40,9 @@ public Collection getMenuCategories() { return Arrays.asList(MenuFactory.PRE_PROCESSORS); } + @Override + public Collection getSubMenuCategories() { + return null; + } + } diff --git a/src/core/org/apache/jmeter/samplers/gui/AbstractSamplerGui.java b/src/core/org/apache/jmeter/samplers/gui/AbstractSamplerGui.java index 9ebb3f18a90..9a76ed159c9 100644 --- a/src/core/org/apache/jmeter/samplers/gui/AbstractSamplerGui.java +++ b/src/core/org/apache/jmeter/samplers/gui/AbstractSamplerGui.java @@ -62,4 +62,9 @@ public JPopupMenu createPopupMenu() { public Collection getMenuCategories() { return Arrays.asList(MenuFactory.SAMPLERS); } + + @Override + public Collection getSubMenuCategories() { + return null; + } } diff --git a/src/core/org/apache/jmeter/threads/gui/AbstractThreadGroupGui.java b/src/core/org/apache/jmeter/threads/gui/AbstractThreadGroupGui.java index b946108a96b..0de94f80ec1 100644 --- a/src/core/org/apache/jmeter/threads/gui/AbstractThreadGroupGui.java +++ b/src/core/org/apache/jmeter/threads/gui/AbstractThreadGroupGui.java @@ -66,6 +66,11 @@ public Collection getMenuCategories() { return Arrays.asList(MenuFactory.THREADS); } + @Override + public Collection getSubMenuCategories() { + return null; + } + @Override public JPopupMenu createPopupMenu() { JPopupMenu pop = new JPopupMenu(); diff --git a/src/core/org/apache/jmeter/timers/gui/AbstractTimerGui.java b/src/core/org/apache/jmeter/timers/gui/AbstractTimerGui.java index 1f240f09a65..e5acbeefca6 100644 --- a/src/core/org/apache/jmeter/timers/gui/AbstractTimerGui.java +++ b/src/core/org/apache/jmeter/timers/gui/AbstractTimerGui.java @@ -63,4 +63,9 @@ public JPopupMenu createPopupMenu() { public Collection getMenuCategories() { return Arrays.asList(MenuFactory.TIMERS); } + + @Override + public Collection getSubMenuCategories() { + return null; + } } diff --git a/src/core/org/apache/jmeter/visualizers/gui/AbstractListenerGui.java b/src/core/org/apache/jmeter/visualizers/gui/AbstractListenerGui.java index 8c15487e694..0043d2a9b5d 100644 --- a/src/core/org/apache/jmeter/visualizers/gui/AbstractListenerGui.java +++ b/src/core/org/apache/jmeter/visualizers/gui/AbstractListenerGui.java @@ -63,4 +63,9 @@ public Collection getMenuCategories() { return Arrays.asList(MenuFactory.LISTENERS); } + @Override + public Collection getSubMenuCategories() { + return null; + } + } diff --git a/test/src/org/apache/jmeter/visualizers/GenerateTreeGui.java b/test/src/org/apache/jmeter/visualizers/GenerateTreeGui.java index 4a6dbdee96c..51755b35ce4 100644 --- a/test/src/org/apache/jmeter/visualizers/GenerateTreeGui.java +++ b/test/src/org/apache/jmeter/visualizers/GenerateTreeGui.java @@ -91,6 +91,11 @@ public Collection getMenuCategories() { return Arrays.asList(new String[] { MenuFactory.NON_TEST_ELEMENTS }); } + @Override + public Collection getSubMenuCategories() { + return null; + } + @Override public void actionPerformed(ActionEvent action) { GuiPackage guiPackage = GuiPackage.getInstance(); From b14fe404ce44f8bf01e0b6e204f5734811d1ac36 Mon Sep 17 00:00:00 2001 From: Vincent Herilier Date: Mon, 5 Dec 2016 10:17:56 +0100 Subject: [PATCH 08/10] tab police --- .../apache/jmeter/gui/util/MenuFactory.java | 43 +++++++++---------- .../org/apache/jmeter/gui/util/MenuInfo.java | 2 +- .../jmeter/testbeans/gui/TestBeanGUI.java | 4 +- .../protocol/ftp/config/gui/FtpConfigGui.java | 2 +- .../ftp/control/gui/FtpTestSamplerGui.java | 2 +- .../http/config/gui/HttpDefaultsGui.java | 2 +- .../http/control/gui/AjpSamplerGui.java | 2 +- .../control/gui/HttpMirrorControlGui.java | 2 +- .../http/control/gui/HttpTestSampleGui.java | 2 +- .../http/control/gui/RecordController.java | 2 +- .../http/control/gui/SoapSamplerGui.java | 2 +- .../jmeter/protocol/http/gui/AuthPanel.java | 2 +- .../protocol/http/gui/CacheManagerGui.java | 2 +- .../jmeter/protocol/http/gui/CookiePanel.java | 2 +- .../protocol/http/gui/DNSCachePanel.java | 2 +- .../jmeter/protocol/http/gui/HeaderPanel.java | 2 +- .../http/modifier/gui/AnchorModifierGui.java | 2 +- .../modifier/gui/RegExUserParametersGui.java | 2 +- .../modifier/gui/URLRewritingModifierGui.java | 2 +- .../http/proxy/gui/ProxyControlGui.java | 2 +- .../ldap/config/gui/LDAPArgumentsPanel.java | 2 +- .../ldap/config/gui/LdapConfigGui.java | 2 +- .../ldap/config/gui/LdapExtConfigGui.java | 2 +- .../control/gui/LdapExtTestSamplerGui.java | 2 +- .../ldap/control/gui/LdapTestSamplerGui.java | 2 +- 25 files changed, 46 insertions(+), 47 deletions(-) diff --git a/src/core/org/apache/jmeter/gui/util/MenuFactory.java b/src/core/org/apache/jmeter/gui/util/MenuFactory.java index c92e60ea35c..1c239b3a0c9 100644 --- a/src/core/org/apache/jmeter/gui/util/MenuFactory.java +++ b/src/core/org/apache/jmeter/gui/util/MenuFactory.java @@ -19,7 +19,6 @@ package org.apache.jmeter.gui.util; import java.awt.Component; -import java.awt.ComponentOrientation; import java.awt.HeadlessException; import java.io.IOException; import java.io.Serializable; @@ -280,7 +279,7 @@ public static JMenu makeMenus(String[] categories, String label, String actionCo } public static JPopupMenu getDefaultControllerMenu() { - JPopupMenu pop = new JPopupMenu(); + JPopupMenu pop = new JPopupMenu(); pop.add(MenuFactory.makeMenus(MENU_ADD_CONTROLLER, JMeterUtils.getResString("add"),// $NON-NLS-1$ ActionNames.ADD)); @@ -296,7 +295,7 @@ public static JPopupMenu getDefaultControllerMenu() { } public static JPopupMenu getDefaultSamplerMenu() { - JPopupMenu pop = new JPopupMenu(); + JPopupMenu pop = new JPopupMenu(); pop.add(MenuFactory.makeMenus(MENU_ADD_SAMPLER, JMeterUtils.getResString("add"),// $NON-NLS-1$ ActionNames.ADD)); @@ -374,24 +373,24 @@ public static JMenu makeMenu(String category, String actionCommand) { * @return the menu */ public static JMenu makeMenu(Collection menuInfo, String actionCommand, String menuName) { - final Map subMenusList = new HashMap(); + final Map subMenusList = new HashMap(); JMenu menu = new JMenu(menuName); for (MenuInfo info : menuInfo) { - if (info.getDrawer() == null || info.getDrawer().equals("")) { - menu.add(makeMenuItem(info, actionCommand)); + if (info.getDrawer() == null || info.getDrawer().equals("")) { + menu.add(makeMenuItem(info, actionCommand)); } else { - JMenu newSubMenu = subMenusList.get(info.getDrawer()); - - if (newSubMenu == null) { - newSubMenu = new JMenu(info.getDrawer()); - } - - newSubMenu.add(makeMenuItem(info, actionCommand)); - menu.add(newSubMenu); - subMenusList.put(info.getDrawer(), newSubMenu); - - GuiUtils.makeScrollableMenu(newSubMenu); + JMenu newSubMenu = subMenusList.get(info.getDrawer()); + + if (newSubMenu == null) { + newSubMenu = new JMenu(info.getDrawer()); + } + + newSubMenu.add(makeMenuItem(info, actionCommand)); + menu.add(newSubMenu); + subMenusList.put(info.getDrawer(), newSubMenu); + + GuiUtils.makeScrollableMenu(newSubMenu); } } GuiUtils.makeScrollableMenu(menu); @@ -533,8 +532,8 @@ private static void initializeMenus() { Collection categories = item.getMenuCategories(); if (categories == null) { - log.debug(name + " participates in no menus."); - continue; + log.debug(name + " participates in no menus."); + continue; } Collection subMenus = new ArrayList(); @@ -544,7 +543,7 @@ private static void initializeMenus() { subMenus.add(new MenuInfo(item, "", name)); } else { for (String subCategory: subCategories) { - log.debug(name + " participates in '" + subCategory + "' sub menu."); + log.debug(name + " participates in '" + subCategory + "' sub menu."); subMenus.add(new MenuInfo(item, subCategory, name)); } } @@ -581,13 +580,13 @@ private static void initializeMenus() { if (categories.contains(CONTROLLERS)) { for (MenuInfo submenu: subMenus) { - controllers.add(submenu); + controllers.add(submenu); } } if (categories.contains(SAMPLERS)) { for (MenuInfo submenu: subMenus) { - samplers.add(submenu); + samplers.add(submenu); } } diff --git a/src/core/org/apache/jmeter/gui/util/MenuInfo.java b/src/core/org/apache/jmeter/gui/util/MenuInfo.java index 114a2c96505..3443973d125 100644 --- a/src/core/org/apache/jmeter/gui/util/MenuInfo.java +++ b/src/core/org/apache/jmeter/gui/util/MenuInfo.java @@ -55,7 +55,7 @@ public String getLabel(){ } public String getDrawer(){ - return drawer; + return drawer; } public String getClassName(){ diff --git a/src/core/org/apache/jmeter/testbeans/gui/TestBeanGUI.java b/src/core/org/apache/jmeter/testbeans/gui/TestBeanGUI.java index 63bc1713dcb..452a66d4dac 100644 --- a/src/core/org/apache/jmeter/testbeans/gui/TestBeanGUI.java +++ b/src/core/org/apache/jmeter/testbeans/gui/TestBeanGUI.java @@ -399,9 +399,9 @@ public Collection getSubMenuCategories() { // Avoid property bean descriptor behavior that uses displayName as description if shortDescription is empty or undefined if (bd.getShortDescription().equals(bd.getDisplayName())) { - submenuCategories = Arrays.asList(""); + submenuCategories = Arrays.asList(""); } else { - submenuCategories = Arrays.asList(bd.getShortDescription().split(";")); + submenuCategories = Arrays.asList(bd.getShortDescription().split(";")); } return submenuCategories; diff --git a/src/protocol/ftp/org/apache/jmeter/protocol/ftp/config/gui/FtpConfigGui.java b/src/protocol/ftp/org/apache/jmeter/protocol/ftp/config/gui/FtpConfigGui.java index 583de2a2729..2a7b6b8c23f 100644 --- a/src/protocol/ftp/org/apache/jmeter/protocol/ftp/config/gui/FtpConfigGui.java +++ b/src/protocol/ftp/org/apache/jmeter/protocol/ftp/config/gui/FtpConfigGui.java @@ -78,7 +78,7 @@ public String getLabelResource() { @Override public Collection getSubMenuCategories() { - return Arrays.asList(JMeterUtils.getResString("ftp_protocol")); // $NON-NLS-1$ + return Arrays.asList(JMeterUtils.getResString("ftp_protocol")); // $NON-NLS-1$ } @Override diff --git a/src/protocol/ftp/org/apache/jmeter/protocol/ftp/control/gui/FtpTestSamplerGui.java b/src/protocol/ftp/org/apache/jmeter/protocol/ftp/control/gui/FtpTestSamplerGui.java index b9aaef2c66f..65a8ab067ff 100644 --- a/src/protocol/ftp/org/apache/jmeter/protocol/ftp/control/gui/FtpTestSamplerGui.java +++ b/src/protocol/ftp/org/apache/jmeter/protocol/ftp/control/gui/FtpTestSamplerGui.java @@ -88,7 +88,7 @@ public String getLabelResource() { @Override public Collection getSubMenuCategories() { - return Arrays.asList(JMeterUtils.getResString("ftp_protocol")); // $NON-NLS-1$ + return Arrays.asList(JMeterUtils.getResString("ftp_protocol")); // $NON-NLS-1$ } private void init() { // WARNING: called from ctor so must not be overridden (i.e. must be private or final) diff --git a/src/protocol/http/org/apache/jmeter/protocol/http/config/gui/HttpDefaultsGui.java b/src/protocol/http/org/apache/jmeter/protocol/http/config/gui/HttpDefaultsGui.java index af218831d4b..01709ca49ab 100644 --- a/src/protocol/http/org/apache/jmeter/protocol/http/config/gui/HttpDefaultsGui.java +++ b/src/protocol/http/org/apache/jmeter/protocol/http/config/gui/HttpDefaultsGui.java @@ -82,7 +82,7 @@ public String getLabelResource() { @Override public Collection getSubMenuCategories() { - return Arrays.asList(JMeterUtils.getResString("http_protocol")); // $NON-NLS-1$ + return Arrays.asList(JMeterUtils.getResString("http_protocol")); // $NON-NLS-1$ } /** diff --git a/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/AjpSamplerGui.java b/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/AjpSamplerGui.java index 9512b91a18d..1da13a9eee8 100644 --- a/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/AjpSamplerGui.java +++ b/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/AjpSamplerGui.java @@ -48,7 +48,7 @@ public String getStaticLabel() { @Override public Collection getSubMenuCategories() { - return Arrays.asList(JMeterUtils.getResString("http_protocol")); // $NON-NLS-1$ + return Arrays.asList(JMeterUtils.getResString("http_protocol")); // $NON-NLS-1$ } @Override diff --git a/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/HttpMirrorControlGui.java b/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/HttpMirrorControlGui.java index dfd4d73c5cd..2ed6aa66962 100644 --- a/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/HttpMirrorControlGui.java +++ b/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/HttpMirrorControlGui.java @@ -106,7 +106,7 @@ public Collection getMenuCategories() { @Override public Collection getSubMenuCategories() { - return Arrays.asList(JMeterUtils.getResString("http_protocol")); // $NON-NLS-1$ + return Arrays.asList(JMeterUtils.getResString("http_protocol")); // $NON-NLS-1$ } @Override diff --git a/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/HttpTestSampleGui.java b/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/HttpTestSampleGui.java index 7eab19cba88..efccb3c0363 100644 --- a/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/HttpTestSampleGui.java +++ b/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/HttpTestSampleGui.java @@ -143,7 +143,7 @@ public String getLabelResource() { @Override public Collection getSubMenuCategories() { - return Arrays.asList(JMeterUtils.getResString("http_protocol")); // $NON-NLS-1$ + return Arrays.asList(JMeterUtils.getResString("http_protocol")); // $NON-NLS-1$ } private void init() {// called from ctor, so must not be overridable diff --git a/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/RecordController.java b/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/RecordController.java index 75b3371a8b0..e53d1a40d08 100644 --- a/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/RecordController.java +++ b/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/RecordController.java @@ -60,7 +60,7 @@ public String getLabelResource() { @Override public Collection getSubMenuCategories() { - return Arrays.asList(JMeterUtils.getResString("http_protocol")); // $NON-NLS-1$ + return Arrays.asList(JMeterUtils.getResString("http_protocol")); // $NON-NLS-1$ } @Override diff --git a/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/SoapSamplerGui.java b/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/SoapSamplerGui.java index 02534a32c34..084be0a905d 100644 --- a/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/SoapSamplerGui.java +++ b/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/SoapSamplerGui.java @@ -70,7 +70,7 @@ public TestElement createTestElement() { @Override public Collection getSubMenuCategories() { - return Arrays.asList(JMeterUtils.getResString("http_protocol")); // $NON-NLS-1$ + return Arrays.asList(JMeterUtils.getResString("http_protocol")); // $NON-NLS-1$ } diff --git a/src/protocol/http/org/apache/jmeter/protocol/http/gui/AuthPanel.java b/src/protocol/http/org/apache/jmeter/protocol/http/gui/AuthPanel.java index 839cba36941..7221355f2cb 100644 --- a/src/protocol/http/org/apache/jmeter/protocol/http/gui/AuthPanel.java +++ b/src/protocol/http/org/apache/jmeter/protocol/http/gui/AuthPanel.java @@ -152,7 +152,7 @@ public String getLabelResource() { @Override public Collection getSubMenuCategories() { - return Arrays.asList(JMeterUtils.getResString("http_protocol")); // $NON-NLS-1$ + return Arrays.asList(JMeterUtils.getResString("http_protocol")); // $NON-NLS-1$ } /** diff --git a/src/protocol/http/org/apache/jmeter/protocol/http/gui/CacheManagerGui.java b/src/protocol/http/org/apache/jmeter/protocol/http/gui/CacheManagerGui.java index cc66cca6ba1..9495f2b3c97 100644 --- a/src/protocol/http/org/apache/jmeter/protocol/http/gui/CacheManagerGui.java +++ b/src/protocol/http/org/apache/jmeter/protocol/http/gui/CacheManagerGui.java @@ -61,7 +61,7 @@ public String getLabelResource() { @Override public Collection getSubMenuCategories() { - return Arrays.asList(JMeterUtils.getResString("http_protocol")); // $NON-NLS-1$ + return Arrays.asList(JMeterUtils.getResString("http_protocol")); // $NON-NLS-1$ } /** diff --git a/src/protocol/http/org/apache/jmeter/protocol/http/gui/CookiePanel.java b/src/protocol/http/org/apache/jmeter/protocol/http/gui/CookiePanel.java index f2c410001f6..908dc6a47b4 100644 --- a/src/protocol/http/org/apache/jmeter/protocol/http/gui/CookiePanel.java +++ b/src/protocol/http/org/apache/jmeter/protocol/http/gui/CookiePanel.java @@ -145,7 +145,7 @@ public String getLabelResource() { @Override public Collection getSubMenuCategories() { - return Arrays.asList(JMeterUtils.getResString("http_protocol")); // $NON-NLS-1$ + return Arrays.asList(JMeterUtils.getResString("http_protocol")); // $NON-NLS-1$ } @Override diff --git a/src/protocol/http/org/apache/jmeter/protocol/http/gui/DNSCachePanel.java b/src/protocol/http/org/apache/jmeter/protocol/http/gui/DNSCachePanel.java index b3de518b120..a18674b32ed 100644 --- a/src/protocol/http/org/apache/jmeter/protocol/http/gui/DNSCachePanel.java +++ b/src/protocol/http/org/apache/jmeter/protocol/http/gui/DNSCachePanel.java @@ -109,7 +109,7 @@ public String getLabelResource() { @Override public Collection getSubMenuCategories() { - return Arrays.asList(JMeterUtils.getResString("http_protocol")); // $NON-NLS-1$ + return Arrays.asList(JMeterUtils.getResString("http_protocol")); // $NON-NLS-1$ } /** diff --git a/src/protocol/http/org/apache/jmeter/protocol/http/gui/HeaderPanel.java b/src/protocol/http/org/apache/jmeter/protocol/http/gui/HeaderPanel.java index 4bc46dd9db9..f37e93f50e1 100644 --- a/src/protocol/http/org/apache/jmeter/protocol/http/gui/HeaderPanel.java +++ b/src/protocol/http/org/apache/jmeter/protocol/http/gui/HeaderPanel.java @@ -133,7 +133,7 @@ public String getLabelResource() { @Override public Collection getSubMenuCategories() { - return Arrays.asList(JMeterUtils.getResString("http_protocol")); // $NON-NLS-1$ + return Arrays.asList(JMeterUtils.getResString("http_protocol")); // $NON-NLS-1$ } private void init() {// called from ctor, so must not be overridable diff --git a/src/protocol/http/org/apache/jmeter/protocol/http/modifier/gui/AnchorModifierGui.java b/src/protocol/http/org/apache/jmeter/protocol/http/modifier/gui/AnchorModifierGui.java index b6a22ffbadf..9436762add3 100644 --- a/src/protocol/http/org/apache/jmeter/protocol/http/modifier/gui/AnchorModifierGui.java +++ b/src/protocol/http/org/apache/jmeter/protocol/http/modifier/gui/AnchorModifierGui.java @@ -41,7 +41,7 @@ public String getLabelResource() { @Override public Collection getSubMenuCategories() { - return Arrays.asList(JMeterUtils.getResString("http_protocol")); // $NON-NLS-1$ + return Arrays.asList(JMeterUtils.getResString("http_protocol")); // $NON-NLS-1$ } @Override diff --git a/src/protocol/http/org/apache/jmeter/protocol/http/modifier/gui/RegExUserParametersGui.java b/src/protocol/http/org/apache/jmeter/protocol/http/modifier/gui/RegExUserParametersGui.java index c9a5a483532..4401d612c00 100644 --- a/src/protocol/http/org/apache/jmeter/protocol/http/modifier/gui/RegExUserParametersGui.java +++ b/src/protocol/http/org/apache/jmeter/protocol/http/modifier/gui/RegExUserParametersGui.java @@ -63,7 +63,7 @@ public String getLabelResource() { @Override public Collection getSubMenuCategories() { - return Arrays.asList(JMeterUtils.getResString("http_protocol")); // $NON-NLS-1$ + return Arrays.asList(JMeterUtils.getResString("http_protocol")); // $NON-NLS-1$ } @Override diff --git a/src/protocol/http/org/apache/jmeter/protocol/http/modifier/gui/URLRewritingModifierGui.java b/src/protocol/http/org/apache/jmeter/protocol/http/modifier/gui/URLRewritingModifierGui.java index 4b35f34d6d8..c0d5a6d1d9d 100644 --- a/src/protocol/http/org/apache/jmeter/protocol/http/modifier/gui/URLRewritingModifierGui.java +++ b/src/protocol/http/org/apache/jmeter/protocol/http/modifier/gui/URLRewritingModifierGui.java @@ -53,7 +53,7 @@ public String getLabelResource() { @Override public Collection getSubMenuCategories() { - return Arrays.asList(JMeterUtils.getResString("http_protocol")); // $NON-NLS-1$ + return Arrays.asList(JMeterUtils.getResString("http_protocol")); // $NON-NLS-1$ } public URLRewritingModifierGui() { diff --git a/src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java b/src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java index d275431f129..10063f49718 100644 --- a/src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java +++ b/src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java @@ -318,7 +318,7 @@ public Collection getMenuCategories() { /** {@inheritDoc} */ @Override public Collection getSubMenuCategories() { - return Arrays.asList(JMeterUtils.getResString("http_protocol")); // $NON-NLS-1$ + return Arrays.asList(JMeterUtils.getResString("http_protocol")); // $NON-NLS-1$ } /** {@inheritDoc} */ diff --git a/src/protocol/ldap/org/apache/jmeter/protocol/ldap/config/gui/LDAPArgumentsPanel.java b/src/protocol/ldap/org/apache/jmeter/protocol/ldap/config/gui/LDAPArgumentsPanel.java index ec73d0245af..707886eb5bc 100644 --- a/src/protocol/ldap/org/apache/jmeter/protocol/ldap/config/gui/LDAPArgumentsPanel.java +++ b/src/protocol/ldap/org/apache/jmeter/protocol/ldap/config/gui/LDAPArgumentsPanel.java @@ -112,7 +112,7 @@ public Collection getMenuCategories() { @Override public Collection getSubMenuCategories() { - return Arrays.asList(JMeterUtils.getResString("ldap_protocol")); // $NON-NLS-1$ + return Arrays.asList(JMeterUtils.getResString("ldap_protocol")); // $NON-NLS-1$ } @Override diff --git a/src/protocol/ldap/org/apache/jmeter/protocol/ldap/config/gui/LdapConfigGui.java b/src/protocol/ldap/org/apache/jmeter/protocol/ldap/config/gui/LdapConfigGui.java index e24daf350be..84032cb83a7 100644 --- a/src/protocol/ldap/org/apache/jmeter/protocol/ldap/config/gui/LdapConfigGui.java +++ b/src/protocol/ldap/org/apache/jmeter/protocol/ldap/config/gui/LdapConfigGui.java @@ -115,7 +115,7 @@ public String getLabelResource() { @Override public Collection getSubMenuCategories() { - return Arrays.asList(JMeterUtils.getResString("ldap_protocol")); // $NON-NLS-1$ + return Arrays.asList(JMeterUtils.getResString("ldap_protocol")); // $NON-NLS-1$ } /** diff --git a/src/protocol/ldap/org/apache/jmeter/protocol/ldap/config/gui/LdapExtConfigGui.java b/src/protocol/ldap/org/apache/jmeter/protocol/ldap/config/gui/LdapExtConfigGui.java index 0a864767921..5742272e4a0 100644 --- a/src/protocol/ldap/org/apache/jmeter/protocol/ldap/config/gui/LdapExtConfigGui.java +++ b/src/protocol/ldap/org/apache/jmeter/protocol/ldap/config/gui/LdapExtConfigGui.java @@ -189,7 +189,7 @@ public String getLabelResource() { @Override public Collection getSubMenuCategories() { - return Arrays.asList(JMeterUtils.getResString("ldap_protocol")); // $NON-NLS-1$ + return Arrays.asList(JMeterUtils.getResString("ldap_protocol")); // $NON-NLS-1$ } /** diff --git a/src/protocol/ldap/org/apache/jmeter/protocol/ldap/control/gui/LdapExtTestSamplerGui.java b/src/protocol/ldap/org/apache/jmeter/protocol/ldap/control/gui/LdapExtTestSamplerGui.java index 455f99ff9c2..de8d974cc68 100644 --- a/src/protocol/ldap/org/apache/jmeter/protocol/ldap/control/gui/LdapExtTestSamplerGui.java +++ b/src/protocol/ldap/org/apache/jmeter/protocol/ldap/control/gui/LdapExtTestSamplerGui.java @@ -102,7 +102,7 @@ public String getLabelResource() { @Override public Collection getSubMenuCategories() { - return Arrays.asList(JMeterUtils.getResString("ldap_protocol")); // $NON-NLS-1$ + return Arrays.asList(JMeterUtils.getResString("ldap_protocol")); // $NON-NLS-1$ } private void init() { // WARNING: called from ctor so must not be overridden (i.e. must be private or final) diff --git a/src/protocol/ldap/org/apache/jmeter/protocol/ldap/control/gui/LdapTestSamplerGui.java b/src/protocol/ldap/org/apache/jmeter/protocol/ldap/control/gui/LdapTestSamplerGui.java index 3549623a6f6..82940fd13bb 100644 --- a/src/protocol/ldap/org/apache/jmeter/protocol/ldap/control/gui/LdapTestSamplerGui.java +++ b/src/protocol/ldap/org/apache/jmeter/protocol/ldap/control/gui/LdapTestSamplerGui.java @@ -97,7 +97,7 @@ public String getLabelResource() { @Override public Collection getSubMenuCategories() { - return Arrays.asList(JMeterUtils.getResString("ldap_protocol")); // $NON-NLS-1$ + return Arrays.asList(JMeterUtils.getResString("ldap_protocol")); // $NON-NLS-1$ } private void init() { // WARNING: called from ctor so must not be overridden (i.e. must be private or final) From 292ffdb14997e76da868579eccef9e7ebf2bac30 Mon Sep 17 00:00:00 2001 From: Vincent Herilier Date: Wed, 14 Dec 2016 10:24:04 +0100 Subject: [PATCH 09/10] Gather JMS Protocol related elements --- src/core/org/apache/jmeter/resources/messages.properties | 1 + .../org/apache/jmeter/resources/messages_fr.properties | 1 + .../jmeter/protocol/jms/control/gui/JMSPublisherGui.java | 7 +++++++ .../jmeter/protocol/jms/control/gui/JMSSamplerGui.java | 7 +++++++ .../jmeter/protocol/jms/control/gui/JMSSubscriberGui.java | 7 +++++++ 5 files changed, 23 insertions(+) diff --git a/src/core/org/apache/jmeter/resources/messages.properties b/src/core/org/apache/jmeter/resources/messages.properties index 45784aee1fa..d50d376f151 100644 --- a/src/core/org/apache/jmeter/resources/messages.properties +++ b/src/core/org/apache/jmeter/resources/messages.properties @@ -478,6 +478,7 @@ jms_properties_title=JMS Properties jms_properties_type=Class of value jms_properties_value=Value jms_props=JMS Properties +jms_protocol=JMS Protocol jms_provider_url=Provider URL jms_publisher=JMS Publisher jms_pwd=Password diff --git a/src/core/org/apache/jmeter/resources/messages_fr.properties b/src/core/org/apache/jmeter/resources/messages_fr.properties index d67ab0ca7d4..e105e580d29 100644 --- a/src/core/org/apache/jmeter/resources/messages_fr.properties +++ b/src/core/org/apache/jmeter/resources/messages_fr.properties @@ -471,6 +471,7 @@ jms_properties_title=Propri\u00E9t\u00E9s JMS jms_properties_type=Classe de la Valeur jms_properties_value=Valeur jms_props=Propri\u00E9t\u00E9s JMS +jms_protocol=Protocole JMS jms_provider_url=URL du fournisseur jms_publisher=Requ\u00EAte JMS Publication jms_pwd=Mot de passe diff --git a/src/protocol/jms/org/apache/jmeter/protocol/jms/control/gui/JMSPublisherGui.java b/src/protocol/jms/org/apache/jmeter/protocol/jms/control/gui/JMSPublisherGui.java index 9e28e2e9c88..c842fd47089 100644 --- a/src/protocol/jms/org/apache/jmeter/protocol/jms/control/gui/JMSPublisherGui.java +++ b/src/protocol/jms/org/apache/jmeter/protocol/jms/control/gui/JMSPublisherGui.java @@ -19,6 +19,8 @@ package org.apache.jmeter.protocol.jms.control.gui; import java.awt.BorderLayout; +import java.util.Arrays; +import java.util.Collection; import javax.swing.Box; import javax.swing.BoxLayout; @@ -133,6 +135,11 @@ public JMSPublisherGui() { public String getLabelResource() { return "jms_publisher"; //$NON-NLS-1$ } + + @Override + public Collection getSubMenuCategories() { + return Arrays.asList(JMeterUtils.getResString("jms_protocol")); // $NON-NLS-1$ + } /** * @see org.apache.jmeter.gui.JMeterGUIComponent#createTestElement() diff --git a/src/protocol/jms/org/apache/jmeter/protocol/jms/control/gui/JMSSamplerGui.java b/src/protocol/jms/org/apache/jmeter/protocol/jms/control/gui/JMSSamplerGui.java index 7be28dceaa6..17dc058d2b7 100644 --- a/src/protocol/jms/org/apache/jmeter/protocol/jms/control/gui/JMSSamplerGui.java +++ b/src/protocol/jms/org/apache/jmeter/protocol/jms/control/gui/JMSSamplerGui.java @@ -19,6 +19,8 @@ package org.apache.jmeter.protocol.jms.control.gui; import java.awt.BorderLayout; +import java.util.Arrays; +import java.util.Collection; import javax.swing.BorderFactory; import javax.swing.Box; @@ -299,5 +301,10 @@ private JPanel createJNDIPanel() { public String getLabelResource() { return "jms_point_to_point"; //$NON-NLS-1$ // TODO - probably wrong } + + @Override + public Collection getSubMenuCategories() { + return Arrays.asList(JMeterUtils.getResString("jms_protocol")); // $NON-NLS-1$ + } } diff --git a/src/protocol/jms/org/apache/jmeter/protocol/jms/control/gui/JMSSubscriberGui.java b/src/protocol/jms/org/apache/jmeter/protocol/jms/control/gui/JMSSubscriberGui.java index a86ad212d06..95233e5bb67 100644 --- a/src/protocol/jms/org/apache/jmeter/protocol/jms/control/gui/JMSSubscriberGui.java +++ b/src/protocol/jms/org/apache/jmeter/protocol/jms/control/gui/JMSSubscriberGui.java @@ -19,6 +19,8 @@ package org.apache.jmeter.protocol.jms.control.gui; import java.awt.BorderLayout; +import java.util.Arrays; +import java.util.Collection; import javax.naming.Context; import javax.swing.BoxLayout; @@ -123,6 +125,11 @@ public JMSSubscriberGui() { public String getLabelResource() { return "jms_subscriber_title"; // $NON-NLS-1$ } + + @Override + public Collection getSubMenuCategories() { + return Arrays.asList(JMeterUtils.getResString("jms_protocol")); // $NON-NLS-1$ + } /** * @see org.apache.jmeter.gui.JMeterGUIComponent#createTestElement() From 6e3dc4eaff2c535824a5dbcb0d7339168272a574 Mon Sep 17 00:00:00 2001 From: Vincent Herilier Date: Wed, 14 Dec 2016 10:42:14 +0100 Subject: [PATCH 10/10] Gather Mail Protocol related elements --- src/core/org/apache/jmeter/resources/messages.properties | 1 + .../org/apache/jmeter/resources/messages_fr.properties | 1 + .../protocol/mail/sampler/gui/MailReaderSamplerGui.java | 7 +++++++ .../jmeter/protocol/smtp/sampler/gui/SmtpSamplerGui.java | 8 ++++++++ 4 files changed, 17 insertions(+) diff --git a/src/core/org/apache/jmeter/resources/messages.properties b/src/core/org/apache/jmeter/resources/messages.properties index d50d376f151..5f3443219b1 100644 --- a/src/core/org/apache/jmeter/resources/messages.properties +++ b/src/core/org/apache/jmeter/resources/messages.properties @@ -600,6 +600,7 @@ longsum_param_2=Second long to add - further longs can be summed by adding furth loop_controller_title=Loop Controller looping_control=Looping Control lower_bound=Lower Bound +mail_protocol=Mail Protocol mail_reader_account=Username: mail_reader_all_messages=All mail_reader_delete=Delete messages from the server diff --git a/src/core/org/apache/jmeter/resources/messages_fr.properties b/src/core/org/apache/jmeter/resources/messages_fr.properties index e105e580d29..e7d043c506b 100644 --- a/src/core/org/apache/jmeter/resources/messages_fr.properties +++ b/src/core/org/apache/jmeter/resources/messages_fr.properties @@ -590,6 +590,7 @@ longsum_param_2=Second long \u221A\u2020 ajouter - les autres longs pourront \u2 loop_controller_title=Contr\u00F4leur Boucle looping_control=Contr\u00F4le de boucle lower_bound=Borne Inf\u00E9rieure +mail_protocol=Protocole Mail mail_reader_account=Nom utilisateur \: mail_reader_all_messages=Tous mail_reader_delete=Supprimer les messages du serveur diff --git a/src/protocol/mail/org/apache/jmeter/protocol/mail/sampler/gui/MailReaderSamplerGui.java b/src/protocol/mail/org/apache/jmeter/protocol/mail/sampler/gui/MailReaderSamplerGui.java index dfd21c56396..c0c4924f8b0 100644 --- a/src/protocol/mail/org/apache/jmeter/protocol/mail/sampler/gui/MailReaderSamplerGui.java +++ b/src/protocol/mail/org/apache/jmeter/protocol/mail/sampler/gui/MailReaderSamplerGui.java @@ -24,6 +24,8 @@ import java.awt.event.ActionListener; import java.awt.event.FocusEvent; import java.awt.event.FocusListener; +import java.util.Arrays; +import java.util.Collection; import javax.swing.Box; import javax.swing.ButtonGroup; @@ -113,6 +115,11 @@ public MailReaderSamplerGui() { public String getLabelResource() { return "mail_reader_title"; // $NON-NLS-1$ } + + @Override + public Collection getSubMenuCategories() { + return Arrays.asList(JMeterUtils.getResString("mail_protocol")); // $NON-NLS-1$ + } /** * {@inheritDoc} diff --git a/src/protocol/mail/org/apache/jmeter/protocol/smtp/sampler/gui/SmtpSamplerGui.java b/src/protocol/mail/org/apache/jmeter/protocol/smtp/sampler/gui/SmtpSamplerGui.java index b775fd9089f..ff21f3fd62a 100644 --- a/src/protocol/mail/org/apache/jmeter/protocol/smtp/sampler/gui/SmtpSamplerGui.java +++ b/src/protocol/mail/org/apache/jmeter/protocol/smtp/sampler/gui/SmtpSamplerGui.java @@ -21,12 +21,15 @@ import java.awt.BorderLayout; import java.awt.Component; +import java.util.Arrays; +import java.util.Collection; import org.apache.jmeter.protocol.smtp.sampler.SmtpSampler; import org.apache.jmeter.samplers.gui.AbstractSamplerGui; import org.apache.jmeter.testelement.TestElement; import org.apache.jmeter.testelement.property.CollectionProperty; import org.apache.jmeter.testelement.property.JMeterProperty; +import org.apache.jmeter.util.JMeterUtils; /** * Class to build superstructure-gui for SMTP-panel, sets/gets value for a JMeter's testElement-object (i.e. also for save/load-purposes). @@ -56,6 +59,11 @@ public SmtpSamplerGui() { public String getLabelResource() { return "smtp_sampler_title"; } + + @Override + public Collection getSubMenuCategories() { + return Arrays.asList(JMeterUtils.getResString("mail_protocol")); // $NON-NLS-1$ + } /** * Copy the data from the test element to the GUI, method has to be implemented by interface