sebb 2003/12/21 16:35:14
Modified: src/core/org/apache/jmeter/gui/action Load.java
Log:
Rationalise Open/Merge by combining them
Revision Changes Path
1.21 +15 -5 jakarta-jmeter/src/core/org/apache/jmeter/gui/action/Load.java
Index: Load.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/gui/action/Load.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- Load.java 20 Dec 2003 03:25:20 -0000 1.20
+++ Load.java 22 Dec 2003 00:35:14 -0000 1.21
@@ -93,6 +93,7 @@
private static Set commands = new HashSet();
static {
commands.add("open");
+ commands.add("merge");
}
public Load()
@@ -106,8 +107,13 @@
public void doAction(ActionEvent e)
{
- ActionRouter.getInstance().doActionNow(
- new ActionEvent(e.getSource(),e.getID(),"close"));
+ boolean merging = e.getActionCommand().equals("merge");
+
+ if (!merging)
+ {
+ ActionRouter.getInstance().doActionNow(
+ new ActionEvent(e.getSource(),e.getID(),"close"));
+ }
JFileChooser chooser =
FileDialoger.promptToOpenFile(new String[] { ".jmx" });
@@ -123,7 +129,11 @@
f = chooser.getSelectedFile();
if (f != null)
{
- log.info("Loading file: " + f);
+ if (merging){
+ log.info("Merging file: " + f);
+ } else {
+ log.info("Loading file: " + f);
+ }
reader = new FileInputStream(f);
HashTree tree = SaveService.loadSubTree(reader);
isTestPlan = insertLoadedTree(e.getID(), tree);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
