Author: pmouawad
Date: Tue Oct 31 13:54:14 2017
New Revision: 1813882
URL: http://svn.apache.org/viewvc?rev=1813882&view=rev
Log:
Bug 61704 - Toolbar : Improve a bit the right part
Bugzilla Id: 61704
Modified:
jmeter/trunk/src/core/org/apache/jmeter/gui/MainFrame.java
jmeter/trunk/src/core/org/apache/jmeter/images/toolbar/icons-toolbar.properties
jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties
jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties
jmeter/trunk/xdocs/changes.xml
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=1813882&r1=1813881&r2=1813882&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/MainFrame.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/MainFrame.java Tue Oct 31
13:54:14 2017
@@ -163,8 +163,7 @@ public class MainFrame extends JFrame im
/** A message dialog shown while JMeter threads are stopping. */
private JDialog stoppingMessage;
- private JLabel totalThreads;
- private JLabel activeThreads;
+ private JLabel activeAndTotalThreads;
private JMeterToolBar toolbar;
@@ -177,10 +176,7 @@ public class MainFrame extends JFrame im
* Indicator for Log errors and Fatals
*/
private JButton warnIndicator;
- /**
- * Counter
- */
- private JLabel errorsOrFatalsLabel;
+
/**
* LogTarget that receives ERROR or FATAL
*/
@@ -203,8 +199,6 @@ public class MainFrame extends JFrame im
* the listener for the test tree
*/
public MainFrame(TreeModel treeModel, JMeterTreeListener treeListener) {
-
- // TODO: Make the running indicator its own class instead of a JButton
runningIndicator = new JButton(stoppedIcon);
runningIndicator.setFocusable(false);
runningIndicator.setBorderPainted(false);
@@ -215,11 +209,8 @@ public class MainFrame extends JFrame im
testTimeDuration.setToolTipText(JMeterUtils.getResString("duration_tooltip"));
//$NON-NLS-1$
testTimeDuration.setBorder(javax.swing.BorderFactory.createBevelBorder(javax.swing.border.BevelBorder.LOWERED));
- totalThreads = new JLabel("0"); // $NON-NLS-1$
-
totalThreads.setToolTipText(JMeterUtils.getResString("total_threads_tooltip"));
// $NON-NLS-1$
-
- activeThreads = new JLabel("0"); // $NON-NLS-1$
-
activeThreads.setToolTipText(JMeterUtils.getResString("active_threads_tooltip"));
// $NON-NLS-1$
+ activeAndTotalThreads = new JLabel("0/0"); // $NON-NLS-1$
+
activeAndTotalThreads.setToolTipText(JMeterUtils.getResString("active_total_threads_tooltip"));
// $NON-NLS-1$
warnIndicator = new JButton(warningIcon);
warnIndicator.setMargin(new Insets(0, 0, 0, 0));
@@ -231,9 +222,6 @@ public class MainFrame extends JFrame im
warnIndicator.setToolTipText(JMeterUtils.getResString("error_indicator_tooltip"));
// $NON-NLS-1$
warnIndicator.addActionListener(this);
- errorsOrFatalsLabel = new JLabel("0"); // $NON-NLS-1$
-
errorsOrFatalsLabel.setToolTipText(JMeterUtils.getResString("error_indicator_tooltip"));
// $NON-NLS-1$
-
tree = makeTree(treeModel, treeListener);
GuiPackage.getInstance().setMainFrame(this);
@@ -261,8 +249,8 @@ public class MainFrame extends JFrame im
*/
private void refreshErrors(ActionEvent evt) {
if(errorOrFatal.get()>0) {
- errorsOrFatalsLabel.setForeground(Color.RED);
- errorsOrFatalsLabel.setText(Long.toString(errorOrFatal.get()));
+ warnIndicator.setForeground(Color.RED);
+ warnIndicator.setText(Integer.toString(errorOrFatal.get()));
}
}
@@ -408,7 +396,7 @@ public class MainFrame extends JFrame im
stoppingMessage.pack();
ComponentUtil.centerComponentInComponent(this, stoppingMessage);
SwingUtilities.invokeLater(() -> {
- if (stoppingMessage != null) { // TODO - how can this be null?
+ if (stoppingMessage != null) {
stoppingMessage.setVisible(true);
}
});
@@ -416,8 +404,8 @@ public class MainFrame extends JFrame im
public void updateCounts() {
SwingUtilities.invokeLater(() -> {
-
activeThreads.setText(Integer.toString(JMeterContextService.getNumberOfThreads()));
-
totalThreads.setText(Integer.toString(JMeterContextService.getTotalThreads()));
+ activeAndTotalThreads.setText(String.format("%d/%d",
JMeterContextService.getNumberOfThreads(),
+ JMeterContextService.getTotalThreads()));
});
}
@@ -455,8 +443,7 @@ public class MainFrame extends JFrame im
hosts.add(host);
computeTestDurationTimer.start();
runningIndicator.setIcon(runningIcon);
- activeThreads.setText("0"); // $NON-NLS-1$
- totalThreads.setText("0"); // $NON-NLS-1$
+ activeAndTotalThreads.setText("0/0"); // $NON-NLS-1$
menuBar.setRunning(true, host);
if (LOCAL.equals(host)) {
toolbar.setLocalTestStarted(true);
@@ -589,20 +576,18 @@ public class MainFrame extends JFrame im
guiInstance.setMainToolbar(toolbar);
toolPanel.add(toolbar);
- toolPanel.add(Box.createRigidArea(new Dimension(10, 15)));
+ toolPanel.add(Box.createRigidArea(new Dimension(5, 15)));
toolPanel.add(Box.createGlue());
toolPanel.add(testTimeDuration);
- toolPanel.add(Box.createRigidArea(new Dimension(20, 15)));
+ toolPanel.add(Box.createRigidArea(new Dimension(5, 15)));
- toolPanel.add(errorsOrFatalsLabel);
toolPanel.add(warnIndicator);
- toolPanel.add(Box.createRigidArea(new Dimension(20, 15)));
+ warnIndicator.setText("0");
+ toolPanel.add(Box.createRigidArea(new Dimension(5, 15)));
- toolPanel.add(activeThreads);
- toolPanel.add(new JLabel(" / "));
- toolPanel.add(totalThreads);
- toolPanel.add(Box.createRigidArea(new Dimension(10, 15)));
+ toolPanel.add(activeAndTotalThreads);
+ toolPanel.add(Box.createRigidArea(new Dimension(5, 15)));
toolPanel.add(runningIndicator);
return toolPanel;
}
@@ -852,8 +837,8 @@ public class MainFrame extends JFrame im
public void clearData() {
errorOrFatal.set(0);
SwingUtilities.invokeLater(() -> {
- errorsOrFatalsLabel.setForeground(Color.BLACK);
-
errorsOrFatalsLabel.setText(Integer.toString(errorOrFatal.get()));
+ warnIndicator.setForeground(null);
+
warnIndicator.setText(Integer.toString(errorOrFatal.get()));
});
}
Modified:
jmeter/trunk/src/core/org/apache/jmeter/images/toolbar/icons-toolbar.properties
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/images/toolbar/icons-toolbar.properties?rev=1813882&r1=1813881&r2=1813882&view=diff
==============================================================================
---
jmeter/trunk/src/core/org/apache/jmeter/images/toolbar/icons-toolbar.properties
(original)
+++
jmeter/trunk/src/core/org/apache/jmeter/images/toolbar/icons-toolbar.properties
Tue Oct 31 13:54:14 2017
@@ -14,7 +14,7 @@
# limitations under the License.
# Icons order. Keys separate by comma. Use a pipe | to have a space between
two icons.
-toolbar=new,templates,open,save,save_as_testplan,|,undo,redo,cut,copy,paste,|,expand,collapse,toggle,|,test_start,test_start_notimers,test_stop,test_shutdown,|,test_start_remote_all,test_stop_remote_all,test_shutdown_remote_all,|,test_clear,test_clear_all,|,search,search_reset,|,function_helper,help
+toolbar=new,templates,open,save,|,undo,redo,cut,copy,paste,|,expand,collapse,toggle,|,test_start,test_start_notimers,test_stop,test_shutdown,|,test_clear,test_clear_all,|,search,search_reset,|,function_helper,help
# Icon / action definition file.
# Key: button names
Modified: jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties?rev=1813882&r1=1813881&r2=1813882&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties
(original)
+++ jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties Tue
Oct 31 13:54:14 2017
@@ -21,7 +21,7 @@
# Please add new entries in alphabetical order
about=About Apache JMeter
-active_threads_tooltip=Running threads
+active_total_threads_tooltip=Running threads / Total number of threads to run
add=Add
add_host=Add static host
add_as_child=Add as Child
@@ -1206,7 +1206,6 @@ timeout_config_box_title=Timeout configu
timeout_title=Timeout (ms)
toggle=Toggle
toolbar_icon_set_not_found=The file description of toolbar icon set is not
found. See logs.
-total_threads_tooltip=Total number of threads to run
tr=Turkish
transaction_controller_include_timers=Include duration of timer and pre-post
processors in generated sample
transaction_controller_parent=Generate parent sample
Modified:
jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties?rev=1813882&r1=1813881&r2=1813882&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties
(original)
+++ jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties
Tue Oct 31 13:54:14 2017
@@ -17,7 +17,7 @@
about=A propos de JMeter
action_check_message=Un test est en cours, arr\u00EAtez le avant d''utiliser
cette commande
action_check_title=Test en cours
-active_threads_tooltip=Unit\u00E9s actives
+active_total_threads_tooltip=Unit\u00E9s actives / Nombre total d'Unit\u00E9s
\u00E0 lancer
add=Ajouter
add_as_child=Ajouter en tant qu'enfant
add_from_clipboard=Ajouter depuis Presse-papier
@@ -1195,8 +1195,7 @@ timelim=Limiter le temps de r\u00E9ponse
timeout_config_box_title=Configuration du d\u00E9lai d'expiration
timeout_title=D\u00E9lai expiration (ms)
toggle=Permuter
-toolbar_icon_set_not_found=Le fichier de description des ic\u00F4nes de la
barre d'outils n'est pas trouv\u00E9. Voir les journaux.
-total_threads_tooltip=Nombre total d'Unit\u00E9s \u00E0 lancer
+toolbar_icon_set_not_found=Le fichier de description des ic\u00F4nes de la
barre d'outils n'est pas trouv\u00E9. Voir les journaux.
tr=Turc
transaction_controller_include_timers=Inclure la dur\u00E9e des compteurs de
temps et pre/post processeurs dans le calcul du temps
transaction_controller_parent=G\u00E9n\u00E9rer en \u00E9chantillon parent
Modified: jmeter/trunk/xdocs/changes.xml
URL:
http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1813882&r1=1813881&r2=1813882&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml [utf-8] (original)
+++ jmeter/trunk/xdocs/changes.xml [utf-8] Tue Oct 31 13:54:14 2017
@@ -143,6 +143,7 @@ Summary
<li><bug>61693</bug>JMeter aware of Docker
(-XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap)</li>
<li><bug>61694</bug>Add -server option in jmeter.bat</li>
<li><bug>61697</bug>Introduce Darcula Look And Feel to make JMeter UI more
attractive</li>
+ <li><bug>61704</bug>Toolbar : Improve a bit the right part</li>
</ul>
<ch_section>Non-functional changes</ch_section>
