jsalvata 2003/12/15 15:38:44
Modified: src/core/org/apache/jmeter/gui/action Save.java
ExitCommand.java
src/core/org/apache/jmeter/resources messages_no.properties
messages.properties messages_ja.properties
messages_de.properties
src/core/org/apache/jmeter/util JMeterUtils.java
src/core/org/apache/jmeter/gui/util JMeterMenuBar.java
MenuFactory.java
Log:
Display the current filename in the application titlebar in the following format:
"FileName ( <full path to file name> ) - Apache JMeter"
Also rationalise the usage of the terms save/save_as/save_all/save_all_as/...
Submitted by: Keith Lancaster
Revision Changes Path
1.18 +31 -30 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.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- Save.java 19 Oct 2003 22:26:08 -0000 1.17
+++ Save.java 15 Dec 2003 23:38:43 -0000 1.18
@@ -51,6 +51,10 @@
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
+ *
+ * @author Michael Stover
+ * @author <a href="mailto:[EMAIL PROTECTED]">Keith Lancaster</a>
+ * @version $Id$
*/
package org.apache.jmeter.gui.action;
@@ -71,30 +75,26 @@
import org.apache.jmeter.gui.util.FileDialoger;
import org.apache.jmeter.save.SaveService;
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;
import org.apache.log.Logger;
-/**
- * @author Michael Stover
- * Created February 13, 2001
- * @version $Revision$ Last updated: $Date$
- */
public class Save implements Command
{
transient private static Logger log = LoggingManager.getLoggerForClass();
- public final static String SAVE_ALL = "save_all";
- public final static String SAVE = "save_as";
- public final static String SAVE_TO_PREVIOUS = "save";
+ public final static String SAVE_ALL_AS = "save_all_as";
+ public final static String SAVE_AS = "save_as";
+ public final static String SAVE = "save";
private String chosenFile;
private String testPlanFile;
private static Set commands = new HashSet();
static {
+ commands.add(SAVE_AS);
+ commands.add(SAVE_ALL_AS);
commands.add(SAVE);
- commands.add(SAVE_ALL);
- commands.add(SAVE_TO_PREVIOUS);
}
/**
@@ -117,23 +117,27 @@
public void setTestPlanFile(String f)
{
testPlanFile = f;
+
GuiPackage.getInstance().getMainFrame().setTitle(JMeterUtils.getExtendedFrameTitle(testPlanFile));
}
public void doAction(ActionEvent e) throws IllegalUserActionException
{
HashTree subTree = null;
- if (e.getActionCommand().equals(SAVE))
+ if (!commands.contains(e.getActionCommand()))
+ {
+ throw new IllegalUserActionException("Invalid user command:" +
e.getActionCommand());
+ }
+ if (e.getActionCommand().equals(SAVE_AS))
{
subTree = GuiPackage.getInstance().getCurrentSubTree();
}
- else if (
- e.getActionCommand().equals(SAVE_ALL)
- || e.getActionCommand().equals(SAVE_TO_PREVIOUS))
+ else
{
subTree = GuiPackage.getInstance().getTreeModel().getTestPlan();
}
- if (!SAVE_TO_PREVIOUS.equals(e.getActionCommand())
+ String updateFile = testPlanFile;
+ if (!SAVE.equals(e.getActionCommand())
|| testPlanFile == null)
{
JFileChooser chooser =
@@ -148,22 +152,15 @@
{
return;
}
- if (e.getActionCommand().equals(SAVE_ALL)
- || e.getActionCommand().equals(SAVE_TO_PREVIOUS))
- {
- testPlanFile = chooser.getSelectedFile().getAbsolutePath();
- chosenFile = testPlanFile;
- }
- else
+ updateFile = chooser.getSelectedFile().getAbsolutePath();
+ if (!e.getActionCommand().equals(SAVE_AS))
{
- chosenFile = chooser.getSelectedFile().getAbsolutePath();
+ testPlanFile = updateFile;
}
}
- else
- {
- chosenFile = testPlanFile;
- }
-
+ // TODO: doesn't putting this here mark the tree as
+ // saved even though a failure may occur later?
+
ActionRouter.getInstance().doActionNow(
new ActionEvent(subTree, e.getID(), CheckDirty.SUB_TREE_SAVED));
try
@@ -176,7 +173,7 @@
OutputStream writer = null;
try
{
- writer = new FileOutputStream(chosenFile);
+ writer = new FileOutputStream(updateFile);
SaveService.saveSubTree(subTree, writer);
}
catch (Throwable ex)
@@ -184,11 +181,15 @@
testPlanFile = null;
log.error("", ex);
throw new IllegalUserActionException(
- "Couldn't save test plan to file: " + chosenFile);
+ "Couldn't save test plan to file: " + updateFile);
}
finally
{
closeWriter(writer);
+ if(testPlanFile != null)
+ {
+
GuiPackage.getInstance().getMainFrame().setTitle(JMeterUtils.getExtendedFrameTitle(testPlanFile));
+ }
GuiPackage.getInstance().getMainFrame().repaint();
}
}
1.10 +5 -6
jakarta-jmeter/src/core/org/apache/jmeter/gui/action/ExitCommand.java
Index: ExitCommand.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/gui/action/ExitCommand.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ExitCommand.java 19 Oct 2003 22:26:08 -0000 1.9
+++ ExitCommand.java 15 Dec 2003 23:38:43 -0000 1.10
@@ -51,6 +51,10 @@
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
+ *
+ * @author Brendan Burns
+ * @author <a href="mailto:[EMAIL PROTECTED]">Keith Lancaster</a>
+ * @version $Id$
*/
package org.apache.jmeter.gui.action;
@@ -63,11 +67,6 @@
import org.apache.jmeter.gui.GuiPackage;
import org.apache.jmeter.util.JMeterUtils;
-/**
- * @author Brendan Burns
- * Created October 5, 2001
- * @version $Revision$ Last updated: $Date$
- */
public class ExitCommand implements Command
{
@@ -118,7 +117,7 @@
else if (chosenOption == JOptionPane.YES_OPTION)
{
ActionRouter.getInstance().doActionNow(
- new ActionEvent(e.getSource(), e.getID(), Save.SAVE_ALL));
+ new ActionEvent(e.getSource(), e.getID(), Save.SAVE_ALL_AS));
if (!GuiPackage.getInstance().isDirty())
{
System.exit(0);
1.61 +2 -2
jakarta-jmeter/src/core/org/apache/jmeter/resources/messages_no.properties
Index: messages_no.properties
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/resources/messages_no.properties,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- messages_no.properties 9 Dec 2003 14:53:37 -0000 1.60
+++ messages_no.properties 15 Dec 2003 23:38:43 -0000 1.61
@@ -325,9 +325,9 @@
sampler_on_error_stop_test=Stop Test
sampler_on_error_stop_thread=Stop Thread
save?=Save?
+save=Lagre alle
save_all_as=Lagre alle som...
-save_all=Lagre alle
-save=Lagre som...
+save_as=Lagre som...
scheduler_configuration=Scheduler Configuration
scheduler=Scheduler
search_base=Search base
1.78 +2 -2
jakarta-jmeter/src/core/org/apache/jmeter/resources/messages.properties
Index: messages.properties
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/resources/messages.properties,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- messages.properties 9 Dec 2003 14:53:37 -0000 1.77
+++ messages.properties 15 Dec 2003 23:38:43 -0000 1.78
@@ -325,9 +325,9 @@
sampler_on_error_stop_test=Stop Test
sampler_on_error_stop_thread=Stop Thread
save?=Save?
+save=Save Test Plan
save_all_as=Save Test Plan as
-save_all=Save Test Plan
-save=Save As...
+save_as=Save As...
scheduler_configuration=Scheduler Configuration
scheduler=Scheduler
search_base=Search base
1.62 +2 -2
jakarta-jmeter/src/core/org/apache/jmeter/resources/messages_ja.properties
Index: messages_ja.properties
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/resources/messages_ja.properties,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- messages_ja.properties 9 Dec 2003 14:53:37 -0000 1.61
+++ messages_ja.properties 15 Dec 2003 23:38:43 -0000 1.62
@@ -325,9 +325,9 @@
sampler_on_error_stop_test=Stop Test
sampler_on_error_stop_thread=Stop Thread
save?=\u4fdd\u5b58?
+save=\u30c6\u30b9\u30c8\u8a08\u753b\u3092\u4fdd\u5b58
save_all_as=\u30c6\u30b9\u30c8\u8a08\u753b\u306b\u540d\u524d\u3092\u3064\u3051\u3066\u4fdd\u5b58
-save_all=\u30c6\u30b9\u30c8\u8a08\u753b\u3092\u4fdd\u5b58
-save=\u5225\u540d\u3067\u4fdd\u5b58...
+save_as=\u5225\u540d\u3067\u4fdd\u5b58...
scheduler_configuration=\u30b9\u30b1\u30b8\u30e5\u30fc\u30e9\u8a2d\u5b9a
scheduler=\u30b9\u30b1\u30b8\u30e5\u30fc\u30e9
search_base=\u691c\u7d22\u57fa\u6e96
1.65 +2 -2
jakarta-jmeter/src/core/org/apache/jmeter/resources/messages_de.properties
Index: messages_de.properties
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/resources/messages_de.properties,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- messages_de.properties 9 Dec 2003 14:53:37 -0000 1.64
+++ messages_de.properties 15 Dec 2003 23:38:44 -0000 1.65
@@ -325,9 +325,9 @@
sampler_on_error_stop_test=Stop Test
sampler_on_error_stop_thread=Stop Thread
save?=Speichern?
+save=Speichern Test Plan
save_all_as=Speichern Test Plan unter
-save_all=Speichern Test Plan
-save=Speichern unter
+save_as=Speichern unter
scheduler_configuration=Scheduler Configuration
scheduler=Scheduler
search_base=Search base
1.56 +26 -5 jakarta-jmeter/src/core/org/apache/jmeter/util/JMeterUtils.java
Index: JMeterUtils.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/util/JMeterUtils.java,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- JMeterUtils.java 13 Dec 2003 02:16:32 -0000 1.55
+++ JMeterUtils.java 15 Dec 2003 23:38:44 -0000 1.56
@@ -51,6 +51,10 @@
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
+ *
+ * @author Michael Stover
+ * @author <a href="mailto:[EMAIL PROTECTED]">Keith Lancaster</a>
+ * @version $Id$
*/
package org.apache.jmeter.util;
@@ -91,11 +95,7 @@
import org.xml.sax.XMLReader;
/**
- * This class contains the static utility methods used by JMeter.
- *
- [EMAIL PROTECTED] <a href="mailto://[EMAIL PROTECTED]">Stefano Mazzocchi</a>
- *Created June 28, 2001
- [EMAIL PROTECTED] $Revision$ $Date$
+ * This class contains the static utility methods used by JMeter.
*/
public class JMeterUtils implements UnitTestManager
{
@@ -1074,5 +1074,26 @@
public static String getJMeterVersion()
{
return JMeterVersion.VERSION;
+ }
+
+ /**
+ * Builds the string used as the main frame title
+ * @param the fully qualified name of the current working file
+ * @return a string of the form "FileName (<full path>/FileName) - Apache
JMeter".
+ * If fname is null, returns "Apache JMeter".
+ */
+ public static String getExtendedFrameTitle(String fname)
+ {
+ // file New operation may set to null, so just return
+ // app name
+ if (fname == null)
+ {
+ return "Apache JMeter";
+ }
+
+ // allow for windows / chars in filename
+ String temp = fname.replace('\\','/');
+ String simpleName = temp.substring(temp.lastIndexOf("/") + 1);
+ return simpleName + " (" + fname + ") - Apache JMeter";
}
}
1.19 +15 -15
jakarta-jmeter/src/core/org/apache/jmeter/gui/util/JMeterMenuBar.java
Index: JMeterMenuBar.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/gui/util/JMeterMenuBar.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- JMeterMenuBar.java 19 Oct 2003 22:26:08 -0000 1.18
+++ JMeterMenuBar.java 15 Dec 2003 23:38:44 -0000 1.19
@@ -51,6 +51,10 @@
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
+ *
+ * @author Michael Stover
+ * @author <a href="mailto:[EMAIL PROTECTED]">Keith Lancaster</a>
+ * @version $Id$
*/
package org.apache.jmeter.gui.util;
import java.awt.Component;
@@ -77,15 +81,11 @@
import org.apache.jorphan.logging.LoggingManager;
import org.apache.log.Logger;
-/**
- * @author Michael Stover
- * @version $Revision$ Updated on $Date$
- */
public class JMeterMenuBar extends JMenuBar implements LocaleChangeListener
{
transient private static Logger log = LoggingManager.getLoggerForClass();
JMenu fileMenu;
- JMenuItem file_save_all;
+ JMenuItem file_save_as;
JMenuItem file_load;
JMenuItem file_exit;
JMenuItem file_new;
@@ -132,7 +132,7 @@
public void setFileSaveEnabled(boolean enabled)
{
- file_save_all.setEnabled(enabled);
+ file_save_as.setEnabled(enabled);
}
public void setFileLoadEnabled(boolean enabled)
@@ -239,7 +239,7 @@
*/
public void createMenuBar()
{
- createFileMenu();
+ makeFileMenu();
makeEditMenu();
makeRunMenu();
makeOptionsMenu();
@@ -422,26 +422,26 @@
editMenu.setEnabled(false);
}
- private void createFileMenu()
+ private void makeFileMenu()
{
// FILE MENU
fileMenu = new JMenu(JMeterUtils.getResString("file"));
fileMenu.setMnemonic('F');
JMenuItem file_save =
- new JMenuItem(JMeterUtils.getResString("save_all"), 'S');
+ new JMenuItem(JMeterUtils.getResString("save"), 'S');
file_save.setAccelerator(
KeyStroke.getKeyStroke(KeyEvent.VK_S, KeyEvent.CTRL_MASK));
file_save.setActionCommand("save");
file_save.addActionListener(ActionRouter.getInstance());
file_save.setEnabled(true);
- file_save_all =
+ file_save_as =
new JMenuItem(JMeterUtils.getResString("save_all_as"), 'A');
- file_save_all.setAccelerator(
+ file_save_as.setAccelerator(
KeyStroke.getKeyStroke(KeyEvent.VK_A, KeyEvent.CTRL_MASK));
- file_save_all.setActionCommand("save_all");
- file_save_all.addActionListener(ActionRouter.getInstance());
- file_save_all.setEnabled(true);
+ file_save_as.setActionCommand("save_all_as");
+ file_save_as.addActionListener(ActionRouter.getInstance());
+ file_save_as.setEnabled(true);
file_load = new JMenuItem(JMeterUtils.getResString("open"), 'O');
file_load.setAccelerator(
KeyStroke.getKeyStroke(KeyEvent.VK_O, KeyEvent.CTRL_MASK));
@@ -463,7 +463,7 @@
fileMenu.add(file_new);
fileMenu.add(file_load);
fileMenu.add(file_save);
- fileMenu.add(file_save_all);
+ fileMenu.add(file_save_as);
fileMenu.addSeparator();
fileMenu.add(file_exit);
}
1.23 +5 -5
jakarta-jmeter/src/core/org/apache/jmeter/gui/util/MenuFactory.java
Index: MenuFactory.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/gui/util/MenuFactory.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- MenuFactory.java 5 Oct 2003 01:05:31 -0000 1.22
+++ MenuFactory.java 15 Dec 2003 23:38:44 -0000 1.23
@@ -51,6 +51,10 @@
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
+ *
+ * @author Michael Stover
+ * @author <a href="mailto:[EMAIL PROTECTED]">Keith Lancaster</a>
+ * @version $Id$
*/
package org.apache.jmeter.gui.util;
@@ -80,10 +84,6 @@
import org.apache.jorphan.logging.LoggingManager;
import org.apache.log.Logger;
-/**
- * @author Michael Stover
- * @version $Revision$
- */
public final class MenuFactory
{
transient private static Logger log = LoggingManager.getLoggerForClass();
@@ -195,7 +195,7 @@
menu.add(
makeMenuItem(JMeterUtils.getResString("open"), "Open", "open"));
menu.add(
- makeMenuItem(JMeterUtils.getResString("save"), "Save", "save_as"));
+ makeMenuItem(JMeterUtils.getResString("save_as"), "Save As",
"save_as"));
JMenuItem disabled =
makeMenuItem(
JMeterUtils.getResString("disable"),
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
