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/10/10 13:34:07 UTC
svn commit: r583436 - in /jakarta/jmeter/trunk:
src/core/org/apache/jmeter/gui/action/Save.java
src/core/org/apache/jmeter/gui/util/JMeterMenuBar.java
src/core/org/apache/jmeter/resources/messages.properties xdocs/changes.xml
Author: sebb
Date: Wed Oct 10 04:34:06 2007
New Revision: 583436
URL: http://svn.apache.org/viewvc?rev=583436&view=rev
Log:
"Save Selection As" added to main menu; now checks only item is selected
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Save.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/util/JMeterMenuBar.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties
jakarta/jmeter/trunk/xdocs/changes.xml
Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Save.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Save.java?rev=583436&r1=583435&r2=583436&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Save.java (original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Save.java Wed Oct 10 04:34:06 2007
@@ -82,6 +82,13 @@
throw new IllegalUserActionException("Invalid user command:" + e.getActionCommand());
}
if (e.getActionCommand().equals(ActionNames.SAVE_AS)) {
+ JMeterTreeNode[] nodes = GuiPackage.getInstance().getTreeListener().getSelectedNodes();
+ if (nodes.length > 1){
+ JMeterUtils.reportErrorToUser(
+ JMeterUtils.getResString("save_as_error"), // $NON-NLS-1$
+ JMeterUtils.getResString("save_as")); // $NON-NLS-1$
+ return;
+ }
subTree = GuiPackage.getInstance().getCurrentSubTree();
} else {
subTree = GuiPackage.getInstance().getTreeModel().getTestPlan();
Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/util/JMeterMenuBar.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/util/JMeterMenuBar.java?rev=583436&r1=583435&r2=583436&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/util/JMeterMenuBar.java (original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/util/JMeterMenuBar.java Wed Oct 10 04:34:06 2007
@@ -52,6 +52,8 @@
private JMenuItem file_save_as;
+ private JMenuItem file_selection_as;
+
private JMenuItem file_revert;
private JMenuItem file_load;
@@ -463,6 +465,11 @@
file_save_as.addActionListener(ActionRouter.getInstance());
file_save_as.setEnabled(true);
+ file_selection_as = new JMenuItem(JMeterUtils.getResString("save_as")); //$NON-NLS-1$
+ file_selection_as.setActionCommand(ActionNames.SAVE_AS);
+ file_selection_as.addActionListener(ActionRouter.getInstance());
+ file_selection_as.setEnabled(true);
+
file_revert = new JMenuItem(JMeterUtils.getResString("revert_project"), 'R'); //$NON-NLS-1$
file_revert.setActionCommand(ActionNames.REVERT_PROJECT);
file_revert.addActionListener(ActionRouter.getInstance());
@@ -501,6 +508,7 @@
fileMenu.addSeparator();
fileMenu.add(file_save);
fileMenu.add(file_save_as);
+ fileMenu.add(file_selection_as);
fileMenu.add(file_revert);
fileMenu.addSeparator();
// Add the recent files, which will also add a separator that is
Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties?rev=583436&r1=583435&r2=583436&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties (original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties Wed Oct 10 04:34:06 2007
@@ -618,7 +618,8 @@
save=Save
save?=Save?
save_all_as=Save Test Plan as
-save_as=Save As...
+save_as=Save Selection As...
+save_as_error=More than one item selected!
save_as_image=Save Node As Image
save_as_image_all=Save Screen As Image
save_assertionresultsfailuremessage=Save Assertion Results Failure Message
Modified: jakarta/jmeter/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/xdocs/changes.xml?rev=583436&r1=583435&r2=583436&view=diff
==============================================================================
--- jakarta/jmeter/trunk/xdocs/changes.xml (original)
+++ jakarta/jmeter/trunk/xdocs/changes.xml Wed Oct 10 04:34:06 2007
@@ -52,6 +52,7 @@
<li>JDBC Sampler now allows per-thread connections</li>
<li>Cookie Manager not longer clears cookies defined in the GUI</li>
<li>HTTP Parameters without names are ignored (except for POST requests with no file)</li>
+<li>"Save Selection As" added to main menu; now checks only item is selected</li>
</ul>
<h4>Non-functional Improvements</h4>
---------------------------------------------------------------------
To unsubscribe, e-mail: jmeter-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-help@jakarta.apache.org