Author: sebb
Date: Tue Jul 6 14:48:43 2010
New Revision: 960908
URL: http://svn.apache.org/viewvc?rev=960908&view=rev
Log:
user.dir is a System property
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/SSLManagerCommand.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/util/FileDialoger.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/util/FileListPanel.java
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/HttpRequestHdr.java
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/gui/util/DirectoryDialoger.java
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/gui/util/ReportFileDialoger.java
jakarta/jmeter/trunk/test/src/org/apache/jmeter/services/TestFileServer.java
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/SSLManagerCommand.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/SSLManagerCommand.java?rev=960908&r1=960907&r2=960908&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/SSLManagerCommand.java
(original)
+++
jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/SSLManagerCommand.java
Tue Jul 6 14:48:43 2010
@@ -87,7 +87,7 @@ public class SSLManagerCommand implement
private void sslManager() {
SSLManager.reset();
- keyStoreChooser = new
JFileChooser(JMeterUtils.getJMeterProperties().getProperty("user.dir"));
//$NON-NLS-1$
+ keyStoreChooser = new JFileChooser(System.getProperty("user.dir"));
//$NON-NLS-1$
keyStoreChooser.addChoosableFileFilter(new AcceptPKCS12FileFilter());
keyStoreChooser.setFileSelectionMode(JFileChooser.FILES_ONLY);
int retVal =
keyStoreChooser.showOpenDialog(GuiPackage.getInstance().getMainFrame());
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=960908&r1=960907&r2=960908&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
Tue Jul 6 14:48:43 2010
@@ -25,7 +25,6 @@ import javax.swing.filechooser.FileFilte
import org.apache.jmeter.gui.GuiPackage;
import org.apache.jmeter.gui.JMeterFileFilter;
-import org.apache.jmeter.util.JMeterUtils;
/**
* Class implementing a file open dialogue
@@ -59,7 +58,7 @@ public final class FileDialoger {
// JFileChooser jfc = null;
if (lastJFCDirectory == null) {
- String start = JMeterUtils.getPropDefault("user.dir", "");
//$NON-NLS-1$//$NON-NLS-2$
+ String start = System.getProperty("user.dir", "");
//$NON-NLS-1$//$NON-NLS-2$
if (start.length() > 0) {
jfc.setCurrentDirectory(new File(start));
@@ -117,7 +116,7 @@ public final class FileDialoger {
*/
public static JFileChooser promptToSaveFile(String filename, String[]
extensions) {
if (lastJFCDirectory == null) {
- String start = JMeterUtils.getPropDefault("user.dir",
"");//$NON-NLS-1$//$NON-NLS-2$
+ String start = System.getProperty("user.dir",
"");//$NON-NLS-1$//$NON-NLS-2$
if (start.length() > 0) {
jfc = new JFileChooser(new File(start));
}
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/util/FileListPanel.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/util/FileListPanel.java?rev=960908&r1=960907&r2=960908&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/util/FileListPanel.java
(original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/util/FileListPanel.java
Tue Jul 6 14:48:43 2010
@@ -198,7 +198,7 @@ public class FileListPanel extends JPane
this.clearFiles();
} else if (e.getActionCommand().equals(ACTION_BROWSE)) {
JFileChooser chooser = new JFileChooser();
- String start = JMeterUtils.getPropDefault("user.dir", ""); //
$NON-NLS-1$ // $NON-NLS-2$
+ String start = System.getProperty("user.dir", ""); // $NON-NLS-1$
// $NON-NLS-2$
chooser.setCurrentDirectory(new File(start));
chooser.setFileFilter(new JMeterFileFilter(new String[] { filetype
}));
chooser.setFileSelectionMode(JFileChooser.FILES_AND_DIRECTORIES);
Modified:
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/HttpRequestHdr.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/HttpRequestHdr.java?rev=960908&r1=960907&r2=960908&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/HttpRequestHdr.java
(original)
+++
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/HttpRequestHdr.java
Tue Jul 6 14:48:43 2010
@@ -77,7 +77,7 @@ public class HttpRequestHdr {
/** Where to store the temporary binary files */
private static final String binaryDirectory =
JMeterUtils.getPropDefault("proxy.binary.directory",// $NON-NLS-1$
- JMeterUtils.getProperty("user.dir")); // $NON-NLS-1$
proxy.binary.filetype=binary
+ System.getProperty("user.dir")); // $NON-NLS-1$
proxy.binary.filetype=binary
static {
String binaries = JMeterUtils.getPropDefault("proxy.binary.types", //
$NON-NLS-1$
Modified:
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/gui/util/DirectoryDialoger.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/reports/org/apache/jmeter/gui/util/DirectoryDialoger.java?rev=960908&r1=960907&r2=960908&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/gui/util/DirectoryDialoger.java
(original)
+++
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/gui/util/DirectoryDialoger.java
Tue Jul 6 14:48:43 2010
@@ -42,7 +42,7 @@ public final class DirectoryDialoger {
public static JFileChooser promptToOpenFile() {
if (lastJFCDirectory == null) {
- String start = JMeterUtils.getPropDefault("user.dir", "");
+ String start = System.getProperty("user.dir", "");
if (!start.equals("")) {
jfc.setCurrentDirectory(new File(start));
Modified:
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/gui/util/ReportFileDialoger.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/reports/org/apache/jmeter/gui/util/ReportFileDialoger.java?rev=960908&r1=960907&r2=960908&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/gui/util/ReportFileDialoger.java
(original)
+++
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/gui/util/ReportFileDialoger.java
Tue Jul 6 14:48:43 2010
@@ -56,7 +56,7 @@ public final class ReportFileDialoger {
// JFileChooser jfc = null;
if (lastJFCDirectory == null) {
- String start = JMeterUtils.getPropDefault("user.dir", "");
+ String start = System.getProperty("user.dir", "");
if (!start.equals("")) {
jfc.setCurrentDirectory(new File(start));
@@ -110,7 +110,7 @@ public final class ReportFileDialoger {
*/
public static JFileChooser promptToSaveFile(String filename, String[]
extensions) {
if (lastJFCDirectory == null) {
- String start = JMeterUtils.getPropDefault("user.dir", "");
+ String start = System.getProperty("user.dir", "");
if (!start.equals("")) {
jfc = new JFileChooser(new File(start));
}
Modified:
jakarta/jmeter/trunk/test/src/org/apache/jmeter/services/TestFileServer.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/test/src/org/apache/jmeter/services/TestFileServer.java?rev=960908&r1=960907&r2=960908&view=diff
==============================================================================
---
jakarta/jmeter/trunk/test/src/org/apache/jmeter/services/TestFileServer.java
(original)
+++
jakarta/jmeter/trunk/test/src/org/apache/jmeter/services/TestFileServer.java
Tue Jul 6 14:48:43 2010
@@ -25,7 +25,6 @@ package org.apache.jmeter.services;
import java.io.IOException;
import org.apache.jmeter.junit.JMeterTestCase;
-import org.apache.jmeter.util.JMeterUtils;
public class TestFileServer extends JMeterTestCase {
@@ -98,6 +97,6 @@ public class TestFileServer extends JMet
FS.closeFile(infile);
FS.setBasedir("y");
FS.closeFiles();
- FS.setBasedir(JMeterUtils.getProperty("user.dir"));
+ FS.setBasedir(System.getProperty("user.dir"));
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
