You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jmeter-dev@jakarta.apache.org by se...@apache.org on 2007/06/03 13:08:01 UTC
svn commit: r543879 - in
/jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/gui/action:
Close.java Load.java
Author: sebb
Date: Sun Jun 3 04:08:01 2007
New Revision: 543879
URL: http://svn.apache.org/viewvc?view=rev&rev=543879
Log:
Bug 25441 - TestPlan changes sometimes detected incorrectly (isDirty) - fix Load/Close problem
Modified:
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/gui/action/Close.java
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/gui/action/Load.java
Modified: jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/gui/action/Close.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/gui/action/Close.java?view=diff&rev=543879&r1=543878&r2=543879
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/gui/action/Close.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/gui/action/Close.java Sun Jun 3 04:08:01 2007
@@ -63,6 +63,16 @@
* the generic UI action event
*/
public void doAction(ActionEvent e) {
+ performAction(e);
+ }
+
+ /**
+ * Helper routine to allow action to be shared by LOAD.
+ *
+ * @param e event
+ * @return true if Close was not cancelled
+ */
+ static boolean performAction(ActionEvent e){
ActionRouter.getInstance().doActionNow(new ActionEvent(e.getSource(), e.getID(), ActionNames.CHECK_DIRTY));
GuiPackage guiPackage = GuiPackage.getInstance();
if (guiPackage.isDirty()) {
@@ -75,7 +85,7 @@
ActionRouter.getInstance().doActionNow(new ActionEvent(e.getSource(), e.getID(), ActionNames.SAVE));
}
if (response == JOptionPane.CLOSED_OPTION || response == JOptionPane.CANCEL_OPTION) {
- return; // Don't clear the plan
+ return false; // Don't clear the plan
}
}
guiPackage.getTreeModel().clearTestPlan();
@@ -85,5 +95,6 @@
GuiPackage.getInstance().setTestPlanFile(null);
ActionRouter.getInstance().actionPerformed(new ActionEvent(e.getSource(), e.getID(), ActionNames.ADD_ALL));
+ return true;
}
}
Modified: jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/gui/action/Load.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/gui/action/Load.java?view=diff&rev=543879&r1=543878&r2=543879
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/gui/action/Load.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/gui/action/Load.java Sun Jun 3 04:08:01 2007
@@ -85,7 +85,7 @@
} else {
log.info("Loading file: " + f);
// Close the test plan currently open
- ActionRouter.getInstance().doActionNow(new ActionEvent(e.getSource(), e.getID(), ActionNames.CLOSE));
+ if (!Close.performAction(e)) return;
FileServer.getFileServer().setBasedir(f.getAbsolutePath());
}
---------------------------------------------------------------------
To unsubscribe, e-mail: jmeter-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-help@jakarta.apache.org