Author: sebb
Date: Mon Jun 23 05:41:56 2008
New Revision: 670548
URL: http://svn.apache.org/viewvc?rev=670548&view=rev
Log:
Prompt to overwrite an existing file when saving a new test plan
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Save.java
jakarta/jmeter/trunk/xdocs/changes.xml
Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Save.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Save.java?rev=670548&r1=670547&r2=670548&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Save.java
(original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Save.java Mon
Jun 23 05:41:56 2008
@@ -109,17 +109,15 @@
updateFile = updateFile + JMX_FILE_EXTENSION;
}
// Check if the user is trying to save to an existing
file
- if(!e.getActionCommand().equals(ActionNames.SAVE))
{//so it must be a SAVE_AS action
- File f = new File(updateFile);
- if(f.exists()) {
- int response =
JOptionPane.showConfirmDialog(GuiPackage.getInstance().getMainFrame(),
-
JMeterUtils.getResString("save_overwrite_existing_file"), // $NON-NLS-1$
-
JMeterUtils.getResString("save?"), // $NON-NLS-1$
-
JOptionPane.YES_NO_OPTION,
-
JOptionPane.QUESTION_MESSAGE);
- if (response ==
JOptionPane.CLOSED_OPTION || response == JOptionPane.NO_OPTION) {
- return ; // Do not save, user
does not want to overwrite
- }
+ File f = new File(updateFile);
+ if(f.exists()) {
+ int response =
JOptionPane.showConfirmDialog(GuiPackage.getInstance().getMainFrame(),
+
JMeterUtils.getResString("save_overwrite_existing_file"), // $NON-NLS-1$
+
JMeterUtils.getResString("save?"), // $NON-NLS-1$
+ JOptionPane.YES_NO_OPTION,
+ JOptionPane.QUESTION_MESSAGE);
+ if (response == JOptionPane.CLOSED_OPTION ||
response == JOptionPane.NO_OPTION) {
+ return ; // Do not save, user does not
want to overwrite
}
}
Modified: jakarta/jmeter/trunk/xdocs/changes.xml
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/xdocs/changes.xml?rev=670548&r1=670547&r2=670548&view=diff
==============================================================================
--- jakarta/jmeter/trunk/xdocs/changes.xml (original)
+++ jakarta/jmeter/trunk/xdocs/changes.xml Mon Jun 23 05:41:56 2008
@@ -37,6 +37,9 @@
<h4>Bug fixes</h4>
<p>
+<ul>
+<li>Prompt to overwrite existing file when saving a new test plan</li>
+</ul>
</p>
<h4>Improvements</h4>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
