You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by mi...@apache.org on 2013/07/21 13:13:34 UTC
svn commit: r1505338 - in /jmeter/trunk/src/core/org/apache/jmeter:
gui/action/ gui/util/ resources/
Author: milamber
Date: Sun Jul 21 11:13:34 2013
New Revision: 1505338
URL: http://svn.apache.org/r1505338
Log:
UX Improvement : Ability to create New Test Plan from Templates
Rename "Create from templates" to Templates (internally)
Bugzilla Id: 55085
Added:
jmeter/trunk/src/core/org/apache/jmeter/gui/action/SelectTemplatesDialog.java (contents, props changed)
- copied, changed from r1505328, jmeter/trunk/src/core/org/apache/jmeter/gui/action/SelectTemplateDialog.java
jmeter/trunk/src/core/org/apache/jmeter/gui/action/TemplatesCommand.java (contents, props changed)
- copied, changed from r1505328, jmeter/trunk/src/core/org/apache/jmeter/gui/action/TemplateCommand.java
Removed:
jmeter/trunk/src/core/org/apache/jmeter/gui/action/SelectTemplateDialog.java
jmeter/trunk/src/core/org/apache/jmeter/gui/action/TemplateCommand.java
Modified:
jmeter/trunk/src/core/org/apache/jmeter/gui/action/ActionNames.java
jmeter/trunk/src/core/org/apache/jmeter/gui/util/JMeterMenuBar.java
jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties
jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties
Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/action/ActionNames.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/action/ActionNames.java?rev=1505338&r1=1505337&r2=1505338&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/action/ActionNames.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/action/ActionNames.java Sun Jul 21 11:13:34 2013
@@ -62,7 +62,7 @@ public final class ActionNames {
public static final String MERGE = "merge"; // $NON-NLS-1$
public static final String OPEN = "open"; // $NON-NLS-1$
public static final String OPEN_RECENT = "open_recent"; // $NON-NLS-1$
- public static final String CREATE_FROM_TEMPLATE = "create_from_template"; // $NON-NLS-1$
+ public static final String TEMPLATES = "templates"; // $NON-NLS-1$
public static final String PASTE = "Paste"; // $NON-NLS-1$
public static final String REMOTE_EXIT = "remote_exit"; // $NON-NLS-1$
public static final String REMOTE_EXIT_ALL = "remote_exit_all"; // $NON-NLS-1$
Copied: jmeter/trunk/src/core/org/apache/jmeter/gui/action/SelectTemplatesDialog.java (from r1505328, jmeter/trunk/src/core/org/apache/jmeter/gui/action/SelectTemplateDialog.java)
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/action/SelectTemplatesDialog.java?p2=jmeter/trunk/src/core/org/apache/jmeter/gui/action/SelectTemplatesDialog.java&p1=jmeter/trunk/src/core/org/apache/jmeter/gui/action/SelectTemplateDialog.java&r1=1505328&r2=1505338&rev=1505338&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/action/SelectTemplateDialog.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/action/SelectTemplatesDialog.java Sun Jul 21 11:13:34 2013
@@ -58,7 +58,7 @@ import org.apache.log.Logger;
* Dialog used for Templates selection
* @since 2.10
*/
-public class SelectTemplateDialog extends JDialog implements ChangeListener, ActionListener, HyperlinkListener {
+public class SelectTemplatesDialog extends JDialog implements ChangeListener, ActionListener, HyperlinkListener {
private static final long serialVersionUID = -4436834972710248247L;
@@ -82,7 +82,7 @@ public class SelectTemplateDialog extend
private final JScrollPane scroller = new JScrollPane(helpDoc);
- public SelectTemplateDialog() {
+ public SelectTemplatesDialog() {
super((JFrame) null, JMeterUtils.getResString("template_title"), true); //$NON-NLS-1$
init();
}
Propchange: jmeter/trunk/src/core/org/apache/jmeter/gui/action/SelectTemplatesDialog.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jmeter/trunk/src/core/org/apache/jmeter/gui/action/SelectTemplatesDialog.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: jmeter/trunk/src/core/org/apache/jmeter/gui/action/TemplatesCommand.java (from r1505328, jmeter/trunk/src/core/org/apache/jmeter/gui/action/TemplateCommand.java)
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/action/TemplatesCommand.java?p2=jmeter/trunk/src/core/org/apache/jmeter/gui/action/TemplatesCommand.java&p1=jmeter/trunk/src/core/org/apache/jmeter/gui/action/TemplateCommand.java&r1=1505328&r2=1505338&rev=1505338&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/action/TemplateCommand.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/action/TemplatesCommand.java Sun Jul 21 11:13:34 2013
@@ -26,18 +26,18 @@ import java.util.Set;
* Open Templates
* @since 2.10
*/
-public class TemplateCommand extends AbstractAction {
+public class TemplatesCommand extends AbstractAction {
private static final Set<String> commands = new HashSet<String>();
// Ensure the dialog is only created when it is first needed
// In turn this avoids scanning the templates until first needed
static class IODH {
- private static final SelectTemplateDialog dialog = new SelectTemplateDialog();
+ private static final SelectTemplatesDialog dialog = new SelectTemplatesDialog();
}
static {
- commands.add(ActionNames.CREATE_FROM_TEMPLATE);
+ commands.add(ActionNames.TEMPLATES);
}
/**
Propchange: jmeter/trunk/src/core/org/apache/jmeter/gui/action/TemplatesCommand.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jmeter/trunk/src/core/org/apache/jmeter/gui/action/TemplatesCommand.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/util/JMeterMenuBar.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/util/JMeterMenuBar.java?rev=1505338&r1=1505337&r2=1505338&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/util/JMeterMenuBar.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/util/JMeterMenuBar.java Sun Jul 21 11:13:34 2013
@@ -71,7 +71,7 @@ public class JMeterMenuBar extends JMenu
private JMenuItem file_load;
- private JMenuItem create_from_template;
+ private JMenuItem templates;
private List<JComponent> file_load_recent_files;
@@ -511,8 +511,8 @@ public class JMeterMenuBar extends JMenu
// is selected is ROOT, which does not allow items to be inserted.
file_load.setEnabled(false);
- create_from_template = makeMenuItemRes("create_from_template", 'T', ActionNames.CREATE_FROM_TEMPLATE); //$NON-NLS-1$
- create_from_template.setEnabled(true);
+ templates = makeMenuItemRes("template_menu", 'T', ActionNames.TEMPLATES); //$NON-NLS-1$
+ templates.setEnabled(true);
file_close = makeMenuItemRes("menu_close", 'C', ActionNames.CLOSE, KeyStrokes.CLOSE); //$NON-NLS-1$
@@ -527,7 +527,7 @@ public class JMeterMenuBar extends JMenu
fileMenu.add(file_close);
fileMenu.add(file_load);
- fileMenu.add(create_from_template);
+ fileMenu.add(templates);
fileMenu.add(file_merge);
fileMenu.addSeparator();
fileMenu.add(file_save);
Modified: jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties?rev=1505338&r1=1505337&r2=1505338&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties Sun Jul 21 11:13:34 2013
@@ -207,7 +207,6 @@ counter_config_title=Counter
counter_per_user=Track counter independently for each user
counter_reset_per_tg_iteration=Reset counter on each Thread Group Iteration
countlim=Size limit
-create_from_template=Templates...
csvread_file_file_name=CSV file to get values from | *alias
cut=Cut
cut_paste_function=Copy and paste function string
@@ -1048,9 +1047,10 @@ template_choose=Select Template
template_create_from=Create
template_field=Template\:
template_load?=Load template ?
+template_menu=Templates...
template_merge_from=Merge
template_reload=Reload templates
-template_title=Create from Template
+template_title=Templates
test=Test
test_action_action=Action
test_action_duration=Duration (milliseconds)
Modified: jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties?rev=1505338&r1=1505337&r2=1505338&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties Sun Jul 21 11:13:34 2013
@@ -195,7 +195,6 @@ counter_config_title=Compteur
counter_per_user=Suivre le compteur ind\u00E9pendamment pour chaque unit\u00E9 de test
counter_reset_per_tg_iteration=R\u00E9initialiser le compteur \u00E0 chaque it\u00E9ration du groupe d'unit\u00E9s
countlim=Limiter le nombre d'\u00E9l\u00E9ments retourn\u00E9s \u00E0
-create_from_template=Mod\u00E8les...
cssjquery_attribute=Attribut
cssjquery_impl=Impl\u00E9mentation CSS/JQuery\:
cssjquery_render_no_text=Les donn\u00E9es de r\u00E9ponse ne sont pas du texte.
@@ -1041,9 +1040,10 @@ template_choose=Choisir le mod\u00E8le
template_create_from=Cr\u00E9er
template_field=Canevas \:
template_load?=Charger le mod\u00E8le ?
+template_menu=Mod\u00E8les...
template_merge_from=Fusionner
template_reload=Recharger les mod\u00E8les
-template_title=Cr\u00E9er \u00E0 partir du mod\u00E8le
+template_title=Mod\u00E8les
test=Test
test_action_action=Action \:
test_action_duration=Dur\u00E9e (millisecondes) \: