jmeter-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pmoua...@apache.org
Subject svn commit: r1532697 - in /jmeter/trunk/src/core/org/apache/jmeter: gui/MainFrame.java resources/messages.properties resources/messages_fr.properties
Date Wed, 16 Oct 2013 09:15:20 GMT
Author: pmouawad
Date: Wed Oct 16 09:15:20 2013
New Revision: 1532697

URL: http://svn.apache.org/r1532697
Log:
Clarify where to look for information when Stop/shutdown takes more time.
Have a cleaner message

Modified:
    jmeter/trunk/src/core/org/apache/jmeter/gui/MainFrame.java
    jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties
    jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties

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=1532697&r1=1532696&r2=1532697&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/MainFrame.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/MainFrame.java Wed Oct 16 09:15:20 2013
@@ -70,6 +70,7 @@ import javax.swing.tree.TreeCellRenderer
 import javax.swing.tree.TreeModel;
 import javax.swing.tree.TreePath;
 
+import org.apache.commons.lang3.StringUtils;
 import org.apache.jmeter.gui.action.ActionNames;
 import org.apache.jmeter.gui.action.ActionRouter;
 import org.apache.jmeter.gui.action.LoadDraggedFile;
@@ -341,7 +342,11 @@ public class MainFrame extends JFrame im
             stoppingMessage.dispose();
         }
         stoppingMessage = new EscapeDialog(this, JMeterUtils.getResString("stopping_test_title"),
true); //$NON-NLS-1$
-        JLabel stopLabel = new JLabel(JMeterUtils.getResString("stopping_test") + ": " +
host); //$NON-NLS-1$$NON-NLS-2$
+        String label = JMeterUtils.getResString("stopping_test"); //$NON-NLS-1
+        if(!StringUtils.isEmpty(host)) {
+            label = label + JMeterUtils.getResString("stopping_test_host")+ ": " + host;
+        }
+        JLabel stopLabel = new JLabel(label); //$NON-NLS-1$$NON-NLS-2$
         stopLabel.setBorder(BorderFactory.createEmptyBorder(20, 20, 20, 20));
         stoppingMessage.getContentPane().add(stopLabel);
         stoppingMessage.pack();

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=1532697&r1=1532696&r2=1532697&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties Wed Oct 16 09:15:20
2013
@@ -1025,8 +1025,9 @@ start=Start
 start_no_timers=Start no pauses
 starttime=Start Time
 stop=Stop
-stopping_test=Shutting down all test threads.  Please be patient.
+stopping_test=Shutting down all test threads. You can see number of active threads in the
upper right corner of GUI. Please be patient. 
 stopping_test_failed=One or more test threads won't exit; see log file.
+stopping_test_host=Host
 stopping_test_title=Stopping Test
 string_from_file_encoding=File encoding if not the platform default (opt)
 string_from_file_file_name=Enter path (absolute or relative) to file

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=1532697&r1=1532696&r2=1532697&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 Wed Oct 16 09:15:20
2013
@@ -1018,8 +1018,9 @@ start=Lancer
 start_no_timers=Lancer sans pauses
 starttime=Date et heure de d\u00E9marrage \:
 stop=Arr\u00EAter
-stopping_test=En train d'\u00E9teindre toutes les unit\u00E9s de tests. Soyez patient, merci.
+stopping_test=Arr\u00EAt de toutes les unit\u00E9s de tests en cours. Le nombre d'unit\u00E9s
actives est visible dans le coin haut droit de l'interface. Soyez patient, merci. 
 stopping_test_failed=Au moins une unit\u00E9 non arr\u00EAt\u00E9e; voir le journal.
+stopping_test_host=H\u00F4te
 stopping_test_title=En train d'arr\u00EAter le test
 string_from_file_encoding=Encodage du fichier (optionnel)
 string_from_file_file_name=Entrer le chemin (absolu ou relatif) du fichier



Mime
View raw message