Author: pmouawad
Date: Fri Mar 25 07:56:27 2016
New Revision: 1736537
URL: http://svn.apache.org/viewvc?rev=1736537&view=rev
Log:
Bug 59236 - JMeter Properties : Make some cleanup
Bugzilla Id: 59236
Modified:
jmeter/trunk/bin/jmeter.properties
jmeter/trunk/src/core/org/apache/jmeter/gui/MainFrame.java
jmeter/trunk/xdocs/changes.xml
Modified: jmeter/trunk/bin/jmeter.properties
URL:
http://svn.apache.org/viewvc/jmeter/trunk/bin/jmeter.properties?rev=1736537&r1=1736536&r2=1736537&view=diff
==============================================================================
--- jmeter/trunk/bin/jmeter.properties (original)
+++ jmeter/trunk/bin/jmeter.properties Fri Mar 25 07:56:27 2016
@@ -134,17 +134,11 @@ jmeter.laf.mac=System
# not be used for Load Test it is acceptable
#jmeter.loggerpanel.enable_when_closed=true
-# Error/Fatal Log count display
-# defaults to true
-#jmeter.errorscounter.display=true
-
# Max characters kept in LoggerPanel, default to 80000 chars
# O means no limit
#jmeter.loggerpanel.maxlength=80000
# Toolbar display
-# default:
-#jmeter.toolbar.display=true
# Toolbar icon definitions
#jmeter.toolbar.icons=org/apache/jmeter/images/toolbar/icons-toolbar.properties
# Toolbar list
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=1736537&r1=1736536&r2=1736537&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/MainFrame.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/MainFrame.java Fri Mar 25
07:56:27 2016
@@ -123,18 +123,10 @@ public class MainFrame extends JFrame im
private static final String DEFAULT_TITLE = DEFAULT_APP_NAME +
" (" + JMeterUtils.getJMeterVersion() + ")"; // $NON-NLS-1$
$NON-NLS-2$
- // Allow display/hide toolbar
- private static final boolean DISPLAY_TOOLBAR =
- JMeterUtils.getPropDefault("jmeter.toolbar.display", true); //
$NON-NLS-1$
-
// Allow display/hide LoggerPanel
private static final boolean DISPLAY_LOGGER_PANEL =
JMeterUtils.getPropDefault("jmeter.loggerpanel.display", false);
// $NON-NLS-1$
- // Allow display/hide Log Error/Fatal counter
- private static final boolean DISPLAY_ERROR_FATAL_COUNTER =
- JMeterUtils.getPropDefault("jmeter.errorscounter.display", true);
// $NON-NLS-1$
-
private static final Logger log = LoggingManager.getLoggerForClass();
/** The menu bar. */
@@ -520,17 +512,11 @@ public class MainFrame extends JFrame im
mainPanel = createMainPanel();
logPanel = createLoggerPanel();
- if (DISPLAY_ERROR_FATAL_COUNTER) {
- errorsAndFatalsCounterLogTarget = new
ErrorsAndFatalsCounterLogTarget();
- LoggingManager.addLogTargetToRootLogger(new LogTarget[]{
+ errorsAndFatalsCounterLogTarget = new
ErrorsAndFatalsCounterLogTarget();
+ LoggingManager.addLogTargetToRootLogger(new LogTarget[]{
logPanel,
errorsAndFatalsCounterLogTarget
- });
- } else {
- LoggingManager.addLogTargetToRootLogger(new LogTarget[]{
- logPanel
- });
- }
+ });
topAndDown.setTopComponent(mainPanel);
topAndDown.setBottomComponent(logPanel);
@@ -582,10 +568,10 @@ public class MainFrame extends JFrame im
private Component createToolBar() {
Box toolPanel = new Box(BoxLayout.X_AXIS);
// add the toolbar
- this.toolbar = JMeterToolBar.createToolbar(DISPLAY_TOOLBAR);
+ this.toolbar = JMeterToolBar.createToolbar(true);
GuiPackage guiInstance = GuiPackage.getInstance();
guiInstance.setMainToolbar(toolbar);
-
guiInstance.getMenuItemToolbar().getModel().setSelected(DISPLAY_TOOLBAR);
+ guiInstance.getMenuItemToolbar().getModel().setSelected(true);
toolPanel.add(toolbar);
toolPanel.add(Box.createRigidArea(new Dimension(10, 15)));
@@ -594,11 +580,10 @@ public class MainFrame extends JFrame im
toolPanel.add(testTimeDuration);
toolPanel.add(Box.createRigidArea(new Dimension(20, 15)));
- if (DISPLAY_ERROR_FATAL_COUNTER) {
- toolPanel.add(errorsOrFatalsLabel);
- toolPanel.add(warnIndicator);
- toolPanel.add(Box.createRigidArea(new Dimension(20, 15)));
- }
+ toolPanel.add(errorsOrFatalsLabel);
+ toolPanel.add(warnIndicator);
+ toolPanel.add(Box.createRigidArea(new Dimension(20, 15)));
+
toolPanel.add(activeThreads);
toolPanel.add(new JLabel(" / "));
toolPanel.add(totalThreads);
@@ -872,9 +857,7 @@ public class MainFrame extends JFrame im
@Override
public void clearData() {
logPanel.clear();
- if (DISPLAY_ERROR_FATAL_COUNTER) {
- errorsAndFatalsCounterLogTarget.clearData();
- }
+ errorsAndFatalsCounterLogTarget.clearData();
}
/**
Modified: jmeter/trunk/xdocs/changes.xml
URL:
http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1736537&r1=1736536&r2=1736537&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml (original)
+++ jmeter/trunk/xdocs/changes.xml Fri Mar 25 07:56:27 2016
@@ -85,7 +85,9 @@ Summary
<li>org.apache.jmeter.gui.util.ButtonPanel has been removed, if you use it
in your 3rd party plugin or custom development ensure you update your code. See
<bugzilla>58687</bugzilla></li>
<li>Property <code>jmeterthread.startearlier</code> has been removed. See
<bugzilla>58726</bugzilla></li>
<li>Property <code>jmeterengine.startlistenerslater</code> has been
removed. See <bugzilla>58728</bugzilla></li>
- <li>Property <code>jmeterthread.reversePostProcessors</code> has been
removed. See <bugzilla>58728</bugzilla></li>
+ <li>Property <code>jmeterthread.reversePostProcessors</code> has been
removed. See <bugzilla>58728</bugzilla></li>
+ <li>Property <code>jmeter.toolbar.display</code> has been removed, toolbar
is now always displayed. See <bugzilla>59236</bugzilla></li>
+ <li>Property <code>jmeter.errorscounter.display</code> has been removed,
errors/warnings counter is now always displayed. See
<bugzilla>59236</bugzilla></li>
<li>MongoDB elements (MongoDB Source Config, MongoDB Script) have been
deprecated and will be removed in next version of jmeter. They do not appear
anymore in the menu, if you need them modify <code>not_in_menu</code> property.
JMeter team advises not to use them anymore. See <bugzilla>58772</bugzilla></li>
<li>Summariser listener now outputs a formated duration in HH:mm:ss
(Hour:Minute:Second), it previously outputed seconds. See
<bugzilla>58776</bugzilla></li>
<li>WebService(SOAP) Request and HTML Parameter Mask which were deprecated
in 2.13 version, have now been removed following our <a
href="./usermanual/best-practices.html#deprecation">deprecation strategy</a>.
@@ -280,6 +282,7 @@ Summary
<li><bug>59197</bug>Thread Group : it should be possible to only run a single
threadgroup or a selection of threadgroups with a popup menu. Contributed by
Benoit Wiart (benoit dot wiart at gmail.com)</li>
<li><bug>59207</bug>Change the font color of errorsOrFatalsLabel to red when
an error occurs. Contributed by Antonio Gomes Rodrigues (ra0077 at
gmail.com)</li>
<li><bug>58941</bug>Create a new Starter that runs thread groups in validation
mode (1 thread only, 1 iteration, no pause all customizable)</li>
+<li><bug>59236</bug>JMeter Properties : Make some cleanup</li>
</ul>
<ch_section>Non-functional changes</ch_section>
<ul>
