Author: sebb
Date: Fri Jun 25 19:16:32 2010
New Revision: 958091
URL: http://svn.apache.org/viewvc?rev=958091&view=rev
Log:
Bug 49506 - Add .csv File Extension in open dialog box from "read from file"
functionality of listeners
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/util/FilePanel.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/visualizers/gui/AbstractVisualizer.java
jakarta/jmeter/trunk/xdocs/changes.xml
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/util/FilePanel.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/util/FilePanel.java?rev=958091&r1=958090&r2=958091&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/util/FilePanel.java
(original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/util/FilePanel.java Fri
Jun 25 19:16:32 2010
@@ -53,22 +53,26 @@ public class FilePanel extends Horizonta
private final String title;
- private final String filetype;
+ private final String[] filetypes;
/**
* Constructor for the FilePanel object.
*/
public FilePanel() {
- this("", null);
+ this("", (String) null);
}
public FilePanel(String title) {
- this(title, null);
+ this(title, (String) null);
}
public FilePanel(String title, String filetype) {
this.title = title;
- this.filetype = filetype;
+ if (filetype == null){
+ this.filetypes = null;
+ } else {
+ this.filetypes = new String[]{ filetype };
+ }
init();
}
@@ -76,10 +80,17 @@ public class FilePanel extends Horizonta
* Constructor for the FilePanel object.
*/
public FilePanel(ChangeListener l, String title) {
- this(title, null);
+ this(title, (String) null);
listeners.add(l);
}
+ public FilePanel(String resString, String[] exts) {
+ title = resString;
+ this.filetypes = new String[exts.length];
+ System.arraycopy(exts, 0, this.filetypes, 0, exts.length);
+ init();
+ }
+
public void addChangeListener(ChangeListener l) {
listeners.add(l);
}
@@ -140,10 +151,10 @@ public class FilePanel extends Horizonta
public void actionPerformed(ActionEvent e) {
if (e.getActionCommand().equals(ACTION_BROWSE)) {
JFileChooser chooser;
- if(filetype == null){
+ if(filetypes == null || filetypes.length == 0){
chooser = FileDialoger.promptToOpenFile();
} else {
- chooser = FileDialoger.promptToOpenFile(new String[] {
filetype });
+ chooser = FileDialoger.promptToOpenFile(filetypes);
}
if (chooser != null && chooser.getSelectedFile() != null) {
filename.setText(chooser.getSelectedFile().getPath());
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/visualizers/gui/AbstractVisualizer.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/visualizers/gui/AbstractVisualizer.java?rev=958091&r1=958090&r2=958091&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/core/org/apache/jmeter/visualizers/gui/AbstractVisualizer.java
(original)
+++
jakarta/jmeter/trunk/src/core/org/apache/jmeter/visualizers/gui/AbstractVisualizer.java
Fri Jun 25 19:16:32 2010
@@ -108,6 +108,9 @@ public abstract class AbstractVisualizer
/** Logging. */
private static final Logger log = LoggingManager.getLoggerForClass();
+
+ /** File Extensions */
+ private static final String[] EXTS = { ".jtl", ".csv" }; // $NON-NLS-1$
$NON-NLS-2$
/** A panel allowing results to be saved. */
private FilePanel filePanel;
@@ -157,7 +160,7 @@ public abstract class AbstractVisualizer
}
});
- filePanel = new
FilePanel(JMeterUtils.getResString("file_visualizer_output_file"), ".jtl"); //
$NON-NLS-1$ $NON-NLS-2$
+ filePanel = new
FilePanel(JMeterUtils.getResString("file_visualizer_output_file"), EXTS); //
$NON-NLS-1$
filePanel.addChangeListener(this);
filePanel.add(new JLabel(JMeterUtils.getResString("log_only"))); //
$NON-NLS-1$
filePanel.add(errorLogging);
Modified: jakarta/jmeter/trunk/xdocs/changes.xml
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/xdocs/changes.xml?rev=958091&r1=958090&r2=958091&view=diff
==============================================================================
--- jakarta/jmeter/trunk/xdocs/changes.xml (original)
+++ jakarta/jmeter/trunk/xdocs/changes.xml Fri Jun 25 19:16:32 2010
@@ -203,6 +203,7 @@ as the Sample cache has been moved to th
In particular, Aggregate Report can now handle large numbers of samples.
</li>
<li>Aggregate Report and Summary Report now allow column headers to be
optionally excluded</li>
+<li>Bug 49506 - Add .csv File Extension in open dialog box from "read from
file" functionality of listeners</li>
</ul>
<h3>Timers, Assertions, Config, Pre- & Post-Processors</h3>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
