Author: sebb
Date: Mon May 7 08:33:51 2007
New Revision: 535905
URL: http://svn.apache.org/viewvc?view=rev&rev=535905
Log:
Allow user to cancel out of Close dialogue
Modified:
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/gui/action/Close.java
jakarta/jmeter/branches/rel-2-2/xdocs/changes.xml
Modified:
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/gui/action/Close.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/gui/action/Close.java?view=diff&rev=535905&r1=535904&r2=535905
==============================================================================
---
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/gui/action/Close.java
(original)
+++
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/gui/action/Close.java
Mon May 7 08:33:51 2007
@@ -66,12 +66,16 @@
ActionRouter.getInstance().doActionNow(new
ActionEvent(e.getSource(), e.getID(), ActionNames.CHECK_DIRTY));
GuiPackage guiPackage = GuiPackage.getInstance();
if (guiPackage.isDirty()) {
- if
(JOptionPane.showConfirmDialog(GuiPackage.getInstance().getMainFrame(),
JMeterUtils
- .getResString("cancel_new_to_save"), //
$NON-NLS-1$
+ int response;
+ if
((response=JOptionPane.showConfirmDialog(GuiPackage.getInstance().getMainFrame(),
+
JMeterUtils.getResString("cancel_new_to_save"), // $NON-NLS-1$
JMeterUtils.getResString("save?"), //
$NON-NLS-1$
- JOptionPane.YES_NO_OPTION,
- JOptionPane.QUESTION_MESSAGE) ==
JOptionPane.YES_OPTION) {
+ JOptionPane.YES_NO_CANCEL_OPTION,
+ JOptionPane.QUESTION_MESSAGE)) ==
JOptionPane.YES_OPTION) {
ActionRouter.getInstance().doActionNow(new
ActionEvent(e.getSource(), e.getID(), ActionNames.SAVE));
+ }
+ if (response == JOptionPane.CLOSED_OPTION || response
== JOptionPane.CANCEL_OPTION) {
+ return; // Don't clear the plan
}
}
guiPackage.getTreeModel().clearTestPlan();
Modified: jakarta/jmeter/branches/rel-2-2/xdocs/changes.xml
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/xdocs/changes.xml?view=diff&rev=535905&r1=535904&r2=535905
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/xdocs/changes.xml (original)
+++ jakarta/jmeter/branches/rel-2-2/xdocs/changes.xml Mon May 7 08:33:51 2007
@@ -140,6 +140,7 @@
<li>Extend JDBC Sampler: Commit, Rollback, AutoCommit</li>
<li>Bug 42247 - improve HCI</li>
<li>Support "file" protocol in HTTP Samplers</li>
+<li>Allow user to cancel out of Close dialogue</li>
</ul>
<h4>Non-functional improvements:</h4>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
