Author: pmouawad
Date: Sun Mar 27 19:50:48 2016
New Revision: 1736812
URL: http://svn.apache.org/viewvc?rev=1736812&view=rev
Log:
Bug 59236 - JMeter Properties : Make some cleanup
Remove ability to disable toolbar in menu
Bugzilla Id: 59236
Removed:
jmeter/trunk/src/core/org/apache/jmeter/gui/action/ToolBar.java
Modified:
jmeter/trunk/src/core/org/apache/jmeter/gui/GuiPackage.java
jmeter/trunk/src/core/org/apache/jmeter/gui/MainFrame.java
jmeter/trunk/src/core/org/apache/jmeter/gui/util/JMeterMenuBar.java
Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/GuiPackage.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/GuiPackage.java?rev=1736812&r1=1736811&r2=1736812&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/GuiPackage.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/GuiPackage.java Sun Mar 27
19:50:48 2016
@@ -113,9 +113,6 @@ public final class GuiPackage implements
/** The main JMeter toolbar. */
private JToolBar toolbar;
- /** The menu item toolbar. */
- private JCheckBoxMenuItem menuToolBar;
-
/**
* The LoggerPanel menu item
*/
@@ -578,24 +575,6 @@ public final class GuiPackage implements
return toolbar;
}
- /**
- * Set the menu item toolbar.
- *
- * @param newMenuToolBar
- * the new menu item toolbar
- */
- public void setMenuItemToolbar(JCheckBoxMenuItem newMenuToolBar) {
- menuToolBar = newMenuToolBar;
- }
-
- /**
- * Get the menu item toolbar.
- *
- * @return the menu item toolbar
- */
- public JCheckBoxMenuItem getMenuItemToolbar() {
- return menuToolBar;
- }
/**
* Display the specified popup menu with the source component and location
Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/MainFrame.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/MainFrame.java?rev=1736812&r1=1736811&r2=1736812&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/MainFrame.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/MainFrame.java Sun Mar 27
19:50:48 2016
@@ -571,7 +571,6 @@ public class MainFrame extends JFrame im
this.toolbar = JMeterToolBar.createToolbar(true);
GuiPackage guiInstance = GuiPackage.getInstance();
guiInstance.setMainToolbar(toolbar);
- guiInstance.getMenuItemToolbar().getModel().setSelected(true);
toolPanel.add(toolbar);
toolPanel.add(Box.createRigidArea(new Dimension(10, 15)));
Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/util/JMeterMenuBar.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/util/JMeterMenuBar.java?rev=1736812&r1=1736811&r2=1736812&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/util/JMeterMenuBar.java
(original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/util/JMeterMenuBar.java Sun Mar
27 19:50:48 2016
@@ -327,14 +327,11 @@ public class JMeterMenuBar extends JMenu
optionsMenu.add(functionHelper);
optionsMenu.add(lafMenu);
- JCheckBoxMenuItem menuToolBar =
makeCheckBoxMenuItemRes("menu_toolbar", ActionNames.TOOLBAR); //$NON-NLS-1$
JCheckBoxMenuItem menuLoggerPanel =
makeCheckBoxMenuItemRes("menu_logger_panel",
ActionNames.LOGGER_PANEL_ENABLE_DISABLE); //$NON-NLS-1$
GuiPackage guiInstance = GuiPackage.getInstance();
if (guiInstance != null) { //avoid error in ant task tests (good way?)
- guiInstance.setMenuItemToolbar(menuToolBar);
guiInstance.setMenuItemLoggerPanel(menuLoggerPanel);
}
- optionsMenu.add(menuToolBar);
optionsMenu.add(menuLoggerPanel);
if (SSLManager.isSSLSupported()) {
