Author: pmouawad Date: Tue Aug 28 21:07:52 2018 New Revision: 1839505 URL: http://svn.apache.org/viewvc?rev=1839505&view=rev Log: Reuse
Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/action/ExitCommand.java Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/action/ExitCommand.java URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/action/ExitCommand.java?rev=1839505&r1=1839504&r2=1839505&view=diff ============================================================================== --- jmeter/trunk/src/core/org/apache/jmeter/gui/action/ExitCommand.java (original) +++ jmeter/trunk/src/core/org/apache/jmeter/gui/action/ExitCommand.java Tue Aug 28 21:07:52 2018 @@ -60,8 +60,9 @@ public class ExitCommand extends Abstrac @Override public void doActionAfterCheck(ActionEvent e) { ActionRouter.getInstance().doActionNow(new ActionEvent(e.getSource(), e.getID(), ActionNames.CHECK_DIRTY)); - if (GuiPackage.getInstance().isDirty()) { - int chosenOption = JOptionPane.showConfirmDialog(GuiPackage.getInstance().getMainFrame(), JMeterUtils + GuiPackage guiPackage = GuiPackage.getInstance(); + if (guiPackage.isDirty()) { + int chosenOption = JOptionPane.showConfirmDialog(guiPackage.getMainFrame(), JMeterUtils .getResString("cancel_exit_to_save"), // $NON-NLS-1$ JMeterUtils.getResString("save?"), // $NON-NLS-1$ JOptionPane.YES_NO_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE); @@ -69,7 +70,7 @@ public class ExitCommand extends Abstrac System.exit(0); } else if (chosenOption == JOptionPane.YES_OPTION) { ActionRouter.getInstance().doActionNow(new ActionEvent(e.getSource(), e.getID(), ActionNames.SAVE)); - if (!GuiPackage.getInstance().isDirty()) { + if (!guiPackage.isDirty()) { System.exit(0); } }