Author: pmouawad
Date: Thu Oct 27 17:24:44 2011
New Revision: 1189877
URL: http://svn.apache.org/viewvc?rev=1189877&view=rev
Log:
Bug 52097 - Save As should point to same folder that was used to open a file if
MRU list is used
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Save.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/util/FileDialoger.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=1189877&r1=1189876&r2=1189877&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 Thu
Oct 27 17:24:44 2011
@@ -96,9 +96,9 @@ public class Save implements Command {
String updateFile = GuiPackage.getInstance().getTestPlanFile();
if (!ActionNames.SAVE.equals(e.getActionCommand()) || updateFile ==
null) {
- JFileChooser chooser =
FileDialoger.promptToSaveFile(GuiPackage.getInstance().getTreeListener()
+ JFileChooser chooser = FileDialoger.promptToSaveFile(updateFile ==
null ? GuiPackage.getInstance().getTreeListener()
.getCurrentNode().getName()
- + JMX_FILE_EXTENSION);
+ + JMX_FILE_EXTENSION : updateFile);
if (chooser == null) {
return;
}
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/util/FileDialoger.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/util/FileDialoger.java?rev=1189877&r1=1189876&r2=1189877&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/util/FileDialoger.java
(original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/util/FileDialoger.java
Thu Oct 27 17:24:44 2011
@@ -124,7 +124,9 @@ public final class FileDialoger {
}
String ext = ".jmx";//$NON-NLS-1$
if (filename != null) {
- jfc.setSelectedFile(new File(lastJFCDirectory, filename));
+
jfc.setSelectedFile(filename.lastIndexOf(System.getProperty("file.separator"))
> 0 ?
+ new File(filename) :
+ new File(lastJFCDirectory, filename));
int i = -1;
if ((i = filename.lastIndexOf(".")) > -1) {//$NON-NLS-1$
ext = filename.substring(i);
Modified: jakarta/jmeter/trunk/xdocs/changes.xml
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/xdocs/changes.xml?rev=1189877&r1=1189876&r2=1189877&view=diff
==============================================================================
--- jakarta/jmeter/trunk/xdocs/changes.xml (original)
+++ jakarta/jmeter/trunk/xdocs/changes.xml Thu Oct 27 17:24:44 2011
@@ -187,6 +187,7 @@ Mirror server now uses default port 8081
<li>Bug 51816 - Comment Field in User Defined Variables control.</li>
<li>Bug 52052 - Using a delimiter to separate result-messages for JMS
Subscriber</li>
<li>Bug 52103 - Add automatic scrolling option to table visualizer</li>
+<li>Bug 52097 - Save As should point to same folder that was used to open a
file if MRU list is used</li>
</ul>
<h2>Non-functional changes</h2>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
