jmeter-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From milam...@apache.org
Subject svn commit: r1339996 - in /jmeter/trunk/src/core/org/apache/jmeter: gui/MainFrame.java resources/messages.properties resources/messages_fr.properties
Date Fri, 18 May 2012 06:45:29 GMT
Author: milamber
Date: Fri May 18 06:45:29 2012
New Revision: 1339996

URL: http://svn.apache.org/viewvc?rev=1339996&view=rev
Log:
Use a JLabel instead of JButton to display warning icon
Increase space between error indicator and running indicator
Add a tooltip text on warning icon
Add one space before If parenthesis

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=1339996&r1=1339995&r2=1339996&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/MainFrame.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/MainFrame.java Fri May 18 06:45:29 2012
@@ -166,7 +166,7 @@ public class MainFrame extends JFrame im
     /**
      * Indicator for Log errors and Fatals
      */
-    private JButton warnIndicator;
+    private JLabel warnIndicator;
     /**
      * Counter
      */
@@ -198,10 +198,10 @@ public class MainFrame extends JFrame im
         totalThreads = new JLabel("0"); // $NON-NLS-1$
         activeThreads = new JLabel("0"); // $NON-NLS-1$
 
-        warnIndicator = new JButton(warningIcon);
-        warnIndicator.setMargin(new Insets(0, 0, 0, 0));
-        warnIndicator.setBorder(BorderFactory.createEmptyBorder());
+        warnIndicator = new JLabel(warningIcon);
+        warnIndicator.setToolTipText(JMeterUtils.getResString("error_indicator_tooltip"));
// $NON-NLS-1$
         errorsOrFatalsLabel = new JLabel("0"); // $NON-NLS-1$
+        errorsOrFatalsLabel.setToolTipText(JMeterUtils.getResString("error_indicator_tooltip"));
// $NON-NLS-1$
 
         tree = makeTree(treeModel, treeListener);
 
@@ -450,13 +450,13 @@ public class MainFrame extends JFrame im
         topAndDown.setResizeWeight(.8);
         topAndDown.setContinuousLayout(true);
         topAndDown.setBorder(null); // see bug jdk 4131528
-        if(!DISPLAY_LOGGER_PANEL) {
+        if (!DISPLAY_LOGGER_PANEL) {
             topAndDown.setDividerSize(0);
         }
         mainPanel = createMainPanel();
 
         logPanel = createLoggerPanel();
-        if(DISPLAY_ERROR_FATAL_COUNTER) {
+        if (DISPLAY_ERROR_FATAL_COUNTER) {
             errorsAndFatalsCounterLogTarget = new ErrorsAndFatalsCounterLogTarget();
             LoggingManager.addLogTargetToRootLogger(new LogTarget[]{
                 logPanel,
@@ -525,10 +525,10 @@ public class MainFrame extends JFrame im
         toolPanel.add(Box.createRigidArea(new Dimension(10, 15)));
         toolPanel.add(Box.createGlue());
         
-        if(DISPLAY_ERROR_FATAL_COUNTER) {
+        if (DISPLAY_ERROR_FATAL_COUNTER) {
             toolPanel.add(errorsOrFatalsLabel);
             toolPanel.add(warnIndicator);
-            toolPanel.add(Box.createRigidArea(new Dimension(10, 15)));
+            toolPanel.add(Box.createRigidArea(new Dimension(20, 15)));
         }
         toolPanel.add(activeThreads);
         toolPanel.add(new JLabel(" / "));

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=1339996&r1=1339995&r2=1339996&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties Fri May 18 06:45:29
2012
@@ -245,6 +245,7 @@ endtime=End Time  
 entry_dn=Entry DN
 entrydn=Entry DN
 environment_panel_title=Environment Variables
+error_indicator_tooltip=Show the number of errors in log
 error_loading_help=Error loading help page
 error_occurred=Error Occurred
 error_title=Error

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=1339996&r1=1339995&r2=1339996&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 Fri May 18 06:45:29
2012
@@ -239,6 +239,7 @@ endtime=Date et heure de fin \:
 entry_dn=Entr\u00E9e DN \:
 entrydn=Entr\u00E9e DN
 environment_panel_title=Variables d'environnement
+error_indicator_tooltip=Affiche le nombre d'erreurs dans le journal
 error_loading_help=Erreur au chargement de la page d'aide
 error_occurred=Une erreur est survenue
 error_title=Erreur



Mime
View raw message