You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by ag...@apache.org on 2017/09/15 19:03:49 UTC
svn commit: r1808479 - in /jmeter/trunk:
src/protocol/native/org/apache/jmeter/protocol/system/gui/SystemSamplerGui.java
xdocs/changes.xml xdocs/images/screenshots/os_process_sampler.png
Author: agomes
Date: Fri Sep 15 19:03:49 2017
New Revision: 1808479
URL: http://svn.apache.org/viewvc?rev=1808479&view=rev
Log:
This closes #307 : OS Process Sampler : Add browser button to Command and Working directory fields
Modified:
jmeter/trunk/src/protocol/native/org/apache/jmeter/protocol/system/gui/SystemSamplerGui.java
jmeter/trunk/xdocs/changes.xml
jmeter/trunk/xdocs/images/screenshots/os_process_sampler.png
Modified: jmeter/trunk/src/protocol/native/org/apache/jmeter/protocol/system/gui/SystemSamplerGui.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/native/org/apache/jmeter/protocol/system/gui/SystemSamplerGui.java?rev=1808479&r1=1808478&r2=1808479&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/native/org/apache/jmeter/protocol/system/gui/SystemSamplerGui.java (original)
+++ jmeter/trunk/src/protocol/native/org/apache/jmeter/protocol/system/gui/SystemSamplerGui.java Fri Sep 15 19:03:49 2017
@@ -60,8 +60,8 @@ public class SystemSamplerGui extends Ab
private final FilePanelEntry stdin = new FilePanelEntry(JMeterUtils.getResString("system_sampler_stdin")); // $NON-NLS-1$
private final FilePanelEntry stdout = new FilePanelEntry(JMeterUtils.getResString("system_sampler_stdout")); // $NON-NLS-1$
private final FilePanelEntry stderr = new FilePanelEntry(JMeterUtils.getResString("system_sampler_stderr")); // $NON-NLS-1$
- private JLabeledTextField directory;
- private JLabeledTextField command;
+ private final FilePanelEntry directory = new FilePanelEntry(JMeterUtils.getResString("directory_field_title"), true); // $NON-NLS-1$
+ private final FilePanelEntry command = new FilePanelEntry(JMeterUtils.getResString("command_field_title")); // $NON-NLS-1$
private JLabeledTextField timeout;
private ArgumentsPanel argsPanel;
private ArgumentsPanel envPanel;
@@ -123,10 +123,10 @@ public class SystemSamplerGui extends Ab
} else {
systemSampler.setExpectedReturnCode(SystemSampler.DEFAULT_RETURN_CODE);
}
- systemSampler.setCommand(command.getText());
+ systemSampler.setCommand(command.getFilename());
systemSampler.setArguments((Arguments)argsPanel.createTestElement());
systemSampler.setEnvironmentVariables((Arguments)envPanel.createTestElement());
- systemSampler.setDirectory(directory.getText());
+ systemSampler.setDirectory(directory.getFilename());
systemSampler.setStdin(stdin.getFilename());
systemSampler.setStdout(stdout.getFilename());
systemSampler.setStderr(stderr.getFilename());
@@ -147,10 +147,10 @@ public class SystemSamplerGui extends Ab
checkReturnCode.setSelected(systemSampler.getCheckReturnCode());
desiredReturnCode.setText(Integer.toString(systemSampler.getExpectedReturnCode()));
desiredReturnCode.setEnabled(checkReturnCode.isSelected());
- command.setText(systemSampler.getCommand());
+ command.setFilename(systemSampler.getCommand());
argsPanel.configure(systemSampler.getArguments());
envPanel.configure(systemSampler.getEnvironmentVariables());
- directory.setText(systemSampler.getDirectory());
+ directory.setFilename(systemSampler.getDirectory());
stdin.setFilename(systemSampler.getStdin());
stdout.setFilename(systemSampler.getStdout());
stderr.setFilename(systemSampler.getStderr());
@@ -201,12 +201,10 @@ public class SystemSamplerGui extends Ab
cmdPanel.setLayout(new BoxLayout(cmdPanel, BoxLayout.X_AXIS));
JPanel cmdWkDirPane = new JPanel(new BorderLayout());
- command = new JLabeledTextField(JMeterUtils.getResString("command_field_title")); // $NON-NLS-1$
- cmdWkDirPane.add(command, BorderLayout.CENTER);
- directory = new JLabeledTextField(JMeterUtils.getResString("directory_field_title")); // $NON-NLS-1$
- cmdWkDirPane.add(directory, BorderLayout.EAST);
+ cmdWkDirPane.add(command, BorderLayout.NORTH);
+ cmdWkDirPane.add(directory, BorderLayout.SOUTH);
cmdPanel.add(cmdWkDirPane);
-
+
JPanel panel = new VerticalPanel();
panel.setBorder(BorderFactory.createTitledBorder(
BorderFactory.createEtchedBorder(),
@@ -216,6 +214,7 @@ public class SystemSamplerGui extends Ab
panel.add(makeEnvironmentPanel(), BorderLayout.SOUTH);
return panel;
}
+
/**
* @return JPanel Arguments Panel
@@ -260,8 +259,8 @@ public class SystemSamplerGui extends Ab
@Override
public void clearGui() {
super.clearGui();
- directory.setText(""); // $NON-NLS-1$
- command.setText(""); // $NON-NLS-1$
+ directory.clearGui();
+ command.clearGui();
argsPanel.clearGui();
envPanel.clearGui();
desiredReturnCode.setText(""); // $NON-NLS-1$
Modified: jmeter/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1808479&r1=1808478&r2=1808479&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml [utf-8] (original)
+++ jmeter/trunk/xdocs/changes.xml [utf-8] Fri Sep 15 19:03:49 2017
@@ -111,6 +111,7 @@ Incorporated feed back about unclear doc
<li><bug>61505</bug>JDBC Connection Configuration : Set "Validation Query" to <code>empty</code> by default to use isValid method of JDBC driver</li>
<li><bug>61506</bug>JDBC Connection Configuration : Add a list for main databases validation queries for "Validation Query" attribute</li>
<li><bug>61507</bug>JDBC Connection Configuration : Add a list for main databases JDBC driver class name for "JDBC Driver class" attribute</li>
+ <li><bug>61525</bug>OS Process Sampler : Add browser button to Command and Working directory fields</li>
<li><bug>60156</bug> - TCPSampler : Latency is not measured for TCP Sampler. Contributed by Ubik Load Pack (support at ubikloadpack.com)</li>
</ul>
Modified: jmeter/trunk/xdocs/images/screenshots/os_process_sampler.png
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/images/screenshots/os_process_sampler.png?rev=1808479&r1=1808478&r2=1808479&view=diff
==============================================================================
Binary files - no diff available.