View | Details | Raw Unified | Return to bug 49506
Collapse All | Expand All

(-)src/core/org/apache/jmeter/gui/util/FilePanel.java (-3 / +3 lines)
Lines 53-59 Link Here
53
53
54
    private final String title;
54
    private final String title;
55
55
56
    private final String filetype;
56
    private final String[] filetype;
57
57
58
    /**
58
    /**
59
     * Constructor for the FilePanel object.
59
     * Constructor for the FilePanel object.
Lines 66-72 Link Here
66
        this(title, null);
66
        this(title, null);
67
    }
67
    }
68
68
69
    public FilePanel(String title, String filetype) {
69
    public FilePanel(String title, String[] filetype) {
70
        this.title = title;
70
        this.title = title;
71
        this.filetype = filetype;
71
        this.filetype = filetype;
72
        init();
72
        init();
Lines 143-149 Link Here
143
            if(filetype == null){
143
            if(filetype == null){
144
                chooser = FileDialoger.promptToOpenFile();
144
                chooser = FileDialoger.promptToOpenFile();
145
            } else {
145
            } else {
146
                chooser = FileDialoger.promptToOpenFile(new String[] { filetype });
146
                chooser = FileDialoger.promptToOpenFile(filetype);
147
            }
147
            }
148
            if (chooser != null && chooser.getSelectedFile() != null) {
148
            if (chooser != null && chooser.getSelectedFile() != null) {
149
                filename.setText(chooser.getSelectedFile().getPath());
149
                filename.setText(chooser.getSelectedFile().getPath());
(-)src/core/org/apache/jmeter/visualizers/gui/AbstractVisualizer.java (-1 / +4 lines)
Lines 108-113 Link Here
108
108
109
    /** Logging. */
109
    /** Logging. */
110
    private static final Logger log = LoggingManager.getLoggerForClass();
110
    private static final Logger log = LoggingManager.getLoggerForClass();
111
    
112
    /** File Extensions */
113
    private static final String[] EXTS = { ".jtl", ".csv" }; // $NON-NLS-1$ $NON-NLS-2$
111
114
112
    /** A panel allowing results to be saved. */
115
    /** A panel allowing results to be saved. */
113
    private FilePanel filePanel;
116
    private FilePanel filePanel;
Lines 157-163 Link Here
157
            }
160
            }
158
        });
161
        });
159
162
160
        filePanel = new FilePanel(JMeterUtils.getResString("file_visualizer_output_file"), ".jtl"); // $NON-NLS-1$ $NON-NLS-2$
163
        filePanel = new FilePanel(JMeterUtils.getResString("file_visualizer_output_file"), EXTS); // $NON-NLS-1$
161
        filePanel.addChangeListener(this);
164
        filePanel.addChangeListener(this);
162
        filePanel.add(new JLabel(JMeterUtils.getResString("log_only"))); // $NON-NLS-1$
165
        filePanel.add(new JLabel(JMeterUtils.getResString("log_only"))); // $NON-NLS-1$
163
        filePanel.add(errorLogging);
166
        filePanel.add(errorLogging);
(-)src/protocol/jms/org/apache/jmeter/protocol/jms/control/gui/JMSPublisherGui.java (-1 / +1 lines)
Lines 46-52 Link Here
46
46
47
    private static final long serialVersionUID = 240L;
47
    private static final long serialVersionUID = 240L;
48
48
49
    private static final String ALL_FILES = "*.*"; //$NON-NLS-1$
49
    private static final String[] ALL_FILES = { "*.*" }; //$NON-NLS-1$
50
50
51
    //++ These names are used in the JMX files, and must not be changed
51
    //++ These names are used in the JMX files, and must not be changed
52
    /** Take source from the named file */
52
    /** Take source from the named file */
(-)src/protocol/http/org/apache/jmeter/protocol/http/control/gui/WebServiceSamplerGui.java (-1 / +4 lines)
Lines 56-61 Link Here
56
public class WebServiceSamplerGui extends AbstractSamplerGui implements java.awt.event.ActionListener {
56
public class WebServiceSamplerGui extends AbstractSamplerGui implements java.awt.event.ActionListener {
57
57
58
    private static final long serialVersionUID = 240L;
58
    private static final long serialVersionUID = 240L;
59
    
60
    /** File Extensions */
61
    private static final String[] EXTS = { ".xml" }; // $NON-NLS-1$
59
62
60
    private final JLabeledTextField domain = new JLabeledTextField(JMeterUtils.getResString("web_server_domain")); // $NON-NLS-1$
63
    private final JLabeledTextField domain = new JLabeledTextField(JMeterUtils.getResString("web_server_domain")); // $NON-NLS-1$
61
64
Lines 79-85 Link Here
79
82
80
    private transient WSDLHelper HELPER = null;
83
    private transient WSDLHelper HELPER = null;
81
84
82
    private final FilePanel soapXmlFile = new FilePanel(JMeterUtils.getResString("get_xml_from_file"), ".xml"); // $NON-NLS-1$
85
    private final FilePanel soapXmlFile = new FilePanel(JMeterUtils.getResString("get_xml_from_file"), EXTS); // $NON-NLS-1$
83
86
84
    private final JLabeledTextField randomXmlFile = new JLabeledTextField(JMeterUtils.getResString("get_xml_from_random")); // $NON-NLS-1$
87
    private final JLabeledTextField randomXmlFile = new JLabeledTextField(JMeterUtils.getResString("get_xml_from_random")); // $NON-NLS-1$
85
88
(-)src/components/org/apache/jmeter/control/gui/IncludeControllerGui.java (-1 / +4 lines)
Lines 34-42 Link Here
34
{
34
{
35
35
36
    private static final long serialVersionUID = 240L;
36
    private static final long serialVersionUID = 240L;
37
    
38
    /** File Extensions */
39
    private static final String[] EXTS = { ".jmx" }; // $NON-NLS-1$ $NON-NLS-2$
37
40
38
    private FilePanel includePanel =
41
    private FilePanel includePanel =
39
        new FilePanel(JMeterUtils.getResString("include_path"), ".jmx"); //$NON-NLS-1$ //$NON-NLS-2$
42
        new FilePanel(JMeterUtils.getResString("include_path"), EXTS); //$NON-NLS-1$
40
43
41
    /**
44
    /**
42
     * Initializes the gui panel for the ModuleController instance.
45
     * Initializes the gui panel for the ModuleController instance.
(-)src/components/org/apache/jmeter/assertions/gui/HTMLAssertionGui.java (-1 / +4 lines)
Lines 57-62 Link Here
57
    private static final String WARNING_THRESHOLD_FIELD = "warningThresholdField"; // $NON-NLS-1$
57
    private static final String WARNING_THRESHOLD_FIELD = "warningThresholdField"; // $NON-NLS-1$
58
58
59
    private static final String ERROR_THRESHOLD_FIELD = "errorThresholdField"; // $NON-NLS-1$
59
    private static final String ERROR_THRESHOLD_FIELD = "errorThresholdField"; // $NON-NLS-1$
60
    
61
    /** File Extensions */
62
    private static final String[] EXTS = { ".txt" }; // $NON-NLS-1$
60
63
61
    // instance attributes
64
    // instance attributes
62
    private JTextField errorThresholdField = null;
65
    private JTextField errorThresholdField = null;
Lines 252-258 Link Here
252
        assertionPanel.add(thresholdPanel);
255
        assertionPanel.add(thresholdPanel);
253
256
254
        // file panel
257
        // file panel
255
        filePanel = new FilePanel(JMeterUtils.getResString("html_assertion_file"), ".txt"); //$NON-NLS-1$ //$NON-NLS-2$
258
        filePanel = new FilePanel(JMeterUtils.getResString("html_assertion_file"), EXTS); //$NON-NLS-1$
256
        assertionPanel.add(filePanel);
259
        assertionPanel.add(filePanel);
257
260
258
        mainPanel.add(assertionPanel, BorderLayout.NORTH);
261
        mainPanel.add(assertionPanel, BorderLayout.NORTH);

Return to bug 49506