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 2005/05/28 01:10:34 UTC
cvs commit: jakarta-jmeter/src/core/org/apache/jmeter/gui GuiPackage.java
sebb 2005/05/27 16:10:34
Modified: src/core/org/apache/jmeter/gui/action Close.java Save.java
Load.java AbstractAction.java
src/core/org/apache/jmeter JMeter.java
src/core/org/apache/jmeter/gui GuiPackage.java
Log:
Bug 35067 - set up filename when using -t option
Revision Changes Path
1.4 +3 -7 jakarta-jmeter/src/core/org/apache/jmeter/gui/action/Close.java
Index: Close.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/gui/action/Close.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Close.java 18 Mar 2005 15:26:57 -0000 1.3
+++ Close.java 27 May 2005 23:10:34 -0000 1.4
@@ -92,11 +92,7 @@
guiPackage.getTreeListener().getJTree().setSelectionRow(1);
// Clear the name of the test plan file
- Save save =
- (Save) ActionRouter.getInstance().getAction(
- "save",
- "org.apache.jmeter.gui.action.Save");
- save.setTestPlanFile(null);
+ GuiPackage.getInstance().setTestPlanFile(null);
ActionRouter.getInstance().actionPerformed(
new ActionEvent(e.getSource(), e.getID(), CheckDirty.ADD_ALL));
1.28 +6 -34 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.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- Save.java 7 May 2005 21:53:06 -0000 1.27
+++ Save.java 27 May 2005 23:10:34 -0000 1.28
@@ -21,7 +21,6 @@
import java.awt.event.ActionEvent;
import java.io.FileOutputStream;
import java.io.FileWriter;
-import java.io.IOException;
import java.io.Writer;
import java.util.HashSet;
import java.util.Iterator;
@@ -37,9 +36,7 @@
import org.apache.jmeter.gui.util.FileDialoger;
import org.apache.jmeter.save.OldSaveService;
import org.apache.jmeter.save.SaveService;
-import org.apache.jmeter.services.FileServer;
import org.apache.jmeter.testelement.TestElement;
-import org.apache.jmeter.util.JMeterUtils;
import org.apache.jorphan.collections.HashTree;
import org.apache.jorphan.collections.ListedHashTree;
import org.apache.jorphan.logging.LoggingManager;
@@ -57,7 +54,6 @@
public final static String SAVE_AS = "save_as";
public final static String SAVE = "save";
//NOTUSED private String chosenFile;
- private String testPlanFile;
private static Set commands = new HashSet();
static {
@@ -83,25 +79,6 @@
return commands;
}
- public boolean hasTestPlanFile()
- {
- return testPlanFile != null;
- }
-
- public void setTestPlanFile(String f)
- {
- testPlanFile = f;
- GuiPackage.getInstance().getMainFrame().setTitle(JMeterUtils.getExtendedFrameTitle(testPlanFile));
- try
- {
- FileServer.getFileServer().setBasedir(testPlanFile);
- }
- catch(IOException e1)
- {
- log.error("Failure setting file server's base dir",e1);
- }
- }
-
public void doAction(ActionEvent e) throws IllegalUserActionException
{
HashTree subTree = null;
@@ -118,9 +95,9 @@
subTree = GuiPackage.getInstance().getTreeModel().getTestPlan();
}
- String updateFile = testPlanFile;
+ String updateFile = GuiPackage.getInstance().getTestPlanFile();
if (!SAVE.equals(e.getActionCommand())
- || testPlanFile == null)
+ || updateFile == null)
{
JFileChooser chooser =
FileDialoger.promptToSaveFile(
@@ -137,7 +114,7 @@
updateFile = chooser.getSelectedFile().getAbsolutePath();
if (!e.getActionCommand().equals(SAVE_AS))
{
- setTestPlanFile(updateFile);
+ GuiPackage.getInstance().setTestPlanFile(updateFile);
}
}
// TODO: doesn't putting this here mark the tree as
@@ -169,7 +146,7 @@
}
catch (Throwable ex)
{
- testPlanFile = null;
+ GuiPackage.getInstance().setTestPlanFile(null);
log.error("", ex);
throw new IllegalUserActionException(
"Couldn't save test plan to file: " + updateFile);
@@ -178,11 +155,6 @@
{
closeWriter(writer);
closeStream(ostream);
- if(testPlanFile != null)
- {
- GuiPackage.getInstance().getMainFrame().setTitle(JMeterUtils.getExtendedFrameTitle(testPlanFile));
- }
- GuiPackage.getInstance().getMainFrame().repaint();
}
}
1.30 +3 -6 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.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- Load.java 18 May 2005 22:57:53 -0000 1.29
+++ Load.java 27 May 2005 23:10:34 -0000 1.30
@@ -136,10 +136,7 @@
// don't change name if merging
if (!merging && isTestPlan && f != null)
{
- ((Save) ActionRouter.getInstance().getAction(
- "save",
- "org.apache.jmeter.gui.action.Save")).setTestPlanFile(
- f.getAbsolutePath());
+ GuiPackage.getInstance().setTestPlanFile(f.getAbsolutePath());
}
}
1.15 +4 -5 jakarta-jmeter/src/core/org/apache/jmeter/gui/action/AbstractAction.java
Index: AbstractAction.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/gui/action/AbstractAction.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- AbstractAction.java 10 Dec 2004 21:32:53 -0000 1.14
+++ AbstractAction.java 27 May 2005 23:10:34 -0000 1.15
@@ -95,9 +95,8 @@
*/
protected void popupShouldSave(ActionEvent e)
{
- if(!( ((Save) ActionRouter.getInstance().getAction(
- "save",
- "org.apache.jmeter.gui.action.Save")).hasTestPlanFile()))
+ log.debug("popupShouldSave");
+ if(GuiPackage.getInstance().getTestPlanFile() == null)
{
if(JOptionPane.showConfirmDialog(GuiPackage.getInstance().getMainFrame(),
JMeterUtils.getResString("should_save"),JMeterUtils.getResString("warning"),
1.38 +3 -0 jakarta-jmeter/src/core/org/apache/jmeter/JMeter.java
Index: JMeter.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/JMeter.java,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- JMeter.java 18 May 2005 22:57:20 -0000 1.37
+++ JMeter.java 27 May 2005 23:10:34 -0000 1.38
@@ -239,6 +239,9 @@
log.info("Loading file: " + f);
FileInputStream reader = new FileInputStream(f);
HashTree tree = SaveService.loadTree(reader);
+
+ GuiPackage.getInstance().setTestPlanFile(f.getAbsolutePath());
+
new Load().insertLoadedTree(1, tree);
}
catch (Exception e)
1.36 +33 -5 jakarta-jmeter/src/core/org/apache/jmeter/gui/GuiPackage.java
Index: GuiPackage.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/gui/GuiPackage.java,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- GuiPackage.java 8 Apr 2005 15:05:11 -0000 1.35
+++ GuiPackage.java 27 May 2005 23:10:34 -0000 1.36
@@ -21,6 +21,7 @@
import java.awt.Component;
import java.awt.event.MouseEvent;
import java.beans.Introspector;
+import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
@@ -31,6 +32,7 @@
import org.apache.jmeter.gui.tree.JMeterTreeListener;
import org.apache.jmeter.gui.tree.JMeterTreeModel;
import org.apache.jmeter.gui.tree.JMeterTreeNode;
+import org.apache.jmeter.services.FileServer;
import org.apache.jmeter.testbeans.TestBean;
import org.apache.jmeter.testbeans.gui.TestBeanGUI;
import org.apache.jmeter.testelement.TestElement;
@@ -244,15 +246,15 @@
try
{
updateCurrentNode();
- TestElement currentNode =
+ TestElement curNode =
treeListener.getCurrentNode().getTestElement();
- JMeterGUIComponent comp = getGui(currentNode);
+ JMeterGUIComponent comp = getGui(curNode);
if(!(comp instanceof AbstractVisualizer)) // TODO: a hack that needs to be fixed for 2.0
{
comp.clear();
}
log.debug("Updating gui to new node");
- comp.configure(currentNode);
+ comp.configure(curNode);
currentNodeUpdated = false;
return comp;
}
@@ -647,4 +649,30 @@
mf.setEditMenu(getTreeListener().getCurrentNode().createPopupMenu());
}
}
+
+ private String testPlanFile;
+
+ /**
+ * Sets the filepath of the current test plan. It's shown in the main frame
+ * title and used on saving.
+ * @param f
+ */
+ public void setTestPlanFile(String f)
+ {
+ testPlanFile = f;
+ GuiPackage.getInstance().getMainFrame().setTitle(JMeterUtils.getExtendedFrameTitle(testPlanFile));
+ try
+ {
+ FileServer.getFileServer().setBasedir(testPlanFile);
+ }
+ catch(IOException e1)
+ {
+ log.error("Failure setting file server's base dir",e1);
+ }
+ }
+
+ public String getTestPlanFile()
+ {
+ return testPlanFile;
+ }
}
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: jmeter-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-help@jakarta.apache.org