jmeter-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pmoua...@apache.org
Subject svn commit: r1843877 - in /jmeter/trunk: src/core/org/apache/jmeter/gui/action/ActionNames.java src/core/org/apache/jmeter/gui/action/LookAndFeelCommand.java src/core/org/apache/jmeter/gui/action/Restart.java xdocs/changes.xml
Date Mon, 15 Oct 2018 06:40:11 GMT
Author: pmouawad
Date: Mon Oct 15 06:40:11 2018
New Revision: 1843877

URL: http://svn.apache.org/viewvc?rev=1843877&view=rev
Log:
Bug 62826 - When changing LAF, make JMeter restart if user clicks yes to popup
Bugzilla Id: 62826

Modified:
    jmeter/trunk/src/core/org/apache/jmeter/gui/action/ActionNames.java
    jmeter/trunk/src/core/org/apache/jmeter/gui/action/LookAndFeelCommand.java
    jmeter/trunk/src/core/org/apache/jmeter/gui/action/Restart.java
    jmeter/trunk/xdocs/changes.xml

Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/action/ActionNames.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/action/ActionNames.java?rev=1843877&r1=1843876&r2=1843877&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/action/ActionNames.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/action/ActionNames.java Mon Oct 15 06:40:11
2018
@@ -81,6 +81,7 @@ public final class ActionNames {
     public static final String REMOTE_STOP      = "remote_stop"; // $NON-NLS-1$
     public static final String REMOTE_STOP_ALL  = "remote_stop_all"; // $NON-NLS-1$
     public static final String REMOVE           = "remove"; // $NON-NLS-1$
+    public static final String RESTART          = "restart"; // $NON-NLS-1$
     public static final String REVERT_PROJECT   = "revert_project"; // $NON-NLS-1$
     public static final String SAVE             = "save"; // $NON-NLS-1$
     public static final String SAVE_ALL_AS      = "save_all_as";  // $NON-NLS-1$

Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/action/LookAndFeelCommand.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/action/LookAndFeelCommand.java?rev=1843877&r1=1843876&r2=1843877&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/action/LookAndFeelCommand.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/action/LookAndFeelCommand.java Mon Oct 15
06:40:11 2018
@@ -133,7 +133,7 @@ public class LookAndFeelCommand extends
                     JMeterUtils.getResString("exit"), // $NON-NLS-1$
                     JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE);
             if (chosenOption == JOptionPane.YES_OPTION) {
-                ActionRouter.getInstance().doActionNow(new ActionEvent(ev.getSource(), ev.getID(),
ActionNames.EXIT));
+                ActionRouter.getInstance().doActionNow(new ActionEvent(ev.getSource(), ev.getID(),
ActionNames.RESTART));
             }
         } catch (UnsupportedLookAndFeelException
                 | InstantiationException

Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/action/Restart.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Restart.java?rev=1843877&r1=1843876&r2=1843877&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/action/Restart.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/action/Restart.java Mon Oct 15 06:40:11 2018
@@ -46,7 +46,6 @@ import org.slf4j.LoggerFactory;
 public class Restart extends AbstractActionWithNoRunningTest implements MenuCreator {
     private static final Logger log = LoggerFactory.getLogger(Restart.class);
 
-    private static final String RESTART = "restart";
     /** 
      * Sun property pointing the main class and its arguments. 
      * Might not be defined on non Hotspot VM implementations.
@@ -56,7 +55,7 @@ public class Restart extends AbstractAct
     private static final Set<String> commands = new HashSet<>();
 
     static {
-        commands.add(RESTART);
+        commands.add(ActionNames.RESTART);
     }
 
     /**
@@ -173,9 +172,9 @@ public class Restart extends AbstractAct
         if(location == MENU_LOCATION.FILE) {
             
             JMenuItem menuItemIC = new JMenuItem(
-                    JMeterUtils.getResString(RESTART), KeyEvent.VK_UNDEFINED);
-            menuItemIC.setName(RESTART);
-            menuItemIC.setActionCommand(RESTART);
+                    JMeterUtils.getResString(ActionNames.RESTART), KeyEvent.VK_UNDEFINED);
+            menuItemIC.setName(ActionNames.RESTART);
+            menuItemIC.setActionCommand(ActionNames.RESTART);
             menuItemIC.setAccelerator(null);
             menuItemIC.addActionListener(ActionRouter.getInstance());
 

Modified: jmeter/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1843877&r1=1843876&r2=1843877&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml [utf-8] (original)
+++ jmeter/trunk/xdocs/changes.xml [utf-8] Mon Oct 15 06:40:11 2018
@@ -110,6 +110,7 @@ Summary
 <h3>General</h3>
 <ul>
   <li><pr>394</pr>Allow <code>null</code> values in <code>FieldStringEditor</code>.
Based on patch by Mingun (alexander_sergey at mail.ru)</li>
+  <li><bug>62826</bug>When changing LAF, make JMeter restart if user clicks
yes to popup</li>
   <li><bug>62744</bug>Upgrade jquery to version 3.3.1, jquery-ui to 1.12.1,
bootstrap to 3.3.7</li>
 </ul>
 
@@ -118,7 +119,7 @@ Summary
     <li>Updated to tika-core and tika-parsers 1.19.1 (from 1.18)</li>
     <li><bug>62818</bug>Updated to xercesImpl to 2.12.0 (from 2.11.0).
Reported by Stefan Seide (stefan at trilobyte-se.de)</li>
     <li><bug>62821</bug><pr>405</pr>Use SHA-512 checksums instead
of MD5 to verify jar downloads</li>
-    <li><pr>408</bug>Log an informational message instead of an stack trace,
when JavaFX is not found for the <code>RenderInBrowser</code> component.</li>
+    <li><pr>408</pr>Log an informational message instead of an stack trace,
when JavaFX is not found for the <code>RenderInBrowser</code> component.</li>
 </ul>
 
  <!-- =================== Bug fixes =================== -->



Mime
View raw message