mstover1 2003/07/28 17:24:56
Modified: src/core/org/apache/jmeter/gui/action ActionRouter.java
Command.java New.java Save.java
Log:
Adding error message when illegal file chosen as save file
Fixed bug that could erase previous test plan files when "New" is selected.
Revision Changes Path
1.16 +6 -1
jakarta-jmeter/src/core/org/apache/jmeter/gui/action/ActionRouter.java
Index: ActionRouter.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/gui/action/ActionRouter.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- ActionRouter.java 27 Jun 2003 19:12:54 -0000 1.15
+++ ActionRouter.java 29 Jul 2003 00:24:56 -0000 1.16
@@ -66,6 +66,7 @@
import javax.swing.SwingUtilities;
+import org.apache.jmeter.exceptions.IllegalUserActionException;
import org.apache.jmeter.gui.GuiPackage;
import org.apache.jmeter.util.JMeterUtils;
import org.apache.jorphan.logging.LoggingManager;
@@ -116,6 +117,10 @@
preActionPerformed(c.getClass(), e);
c.doAction(e);
postActionPerformed(c.getClass(), e);
+ }
+ catch(IllegalUserActionException err)
+ {
+ JMeterUtils.reportErrorToUser(err.toString());
}
catch (Exception err)
{
1.4 +4 -2
jakarta-jmeter/src/core/org/apache/jmeter/gui/action/Command.java
Index: Command.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/gui/action/Command.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Command.java 27 Jun 2003 19:12:54 -0000 1.3
+++ Command.java 29 Jul 2003 00:24:56 -0000 1.4
@@ -57,6 +57,8 @@
import java.awt.event.ActionEvent;
import java.util.Set;
+import org.apache.jmeter.exceptions.IllegalUserActionException;
+
/**
* @author Michael Stover
* @version $Revision$
@@ -64,7 +66,7 @@
public interface Command
{
- public void doAction(ActionEvent e);
+ public void doAction(ActionEvent e) throws IllegalUserActionException;
public Set getActionNames();
}
1.5 +2 -2 jakarta-jmeter/src/core/org/apache/jmeter/gui/action/New.java
Index: New.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/gui/action/New.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- New.java 27 Jun 2003 19:12:54 -0000 1.4
+++ New.java 29 Jul 2003 00:24:56 -0000 1.5
@@ -116,7 +116,7 @@
JOptionPane.YES_NO_OPTION,
JOptionPane.QUESTION_MESSAGE)
== JOptionPane.YES_OPTION)
- ActionRouter.getInstance().actionPerformed(
+ ActionRouter.getInstance().doActionNow(
new ActionEvent(
e.getSource(),
e.getID(),
1.14 +5 -2 jakarta-jmeter/src/core/org/apache/jmeter/gui/action/Save.java
Index: Save.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/gui/action/Save.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- Save.java 27 Jun 2003 19:12:54 -0000 1.13
+++ Save.java 29 Jul 2003 00:24:56 -0000 1.14
@@ -65,6 +65,7 @@
import javax.swing.JFileChooser;
import org.apache.jmeter.config.Arguments;
+import org.apache.jmeter.exceptions.IllegalUserActionException;
import org.apache.jmeter.gui.GuiPackage;
import org.apache.jmeter.gui.tree.JMeterTreeNode;
import org.apache.jmeter.gui.util.FileDialoger;
@@ -119,7 +120,7 @@
testPlanFile = f;
}
- public void doAction(ActionEvent e)
+ public void doAction(ActionEvent e) throws IllegalUserActionException
{
HashTree subTree = null;
if (e.getActionCommand().equals(SAVE))
@@ -181,7 +182,9 @@
}
catch (Throwable ex)
{
+ testPlanFile = null;
log.error("", ex);
+ throw new IllegalUserActionException("Couldn't save test plan to file:
" + chosenFile);
}
finally
{
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
