The French translation probably needs to be redone ...
On 10 July 2013 23:03, <[email protected]> wrote: > Author: sebb > Date: Wed Jul 10 22:03:33 2013 > New Revision: 1502028 > > URL: http://svn.apache.org/r1502028 > Log: > Templates - provide button to reload template details > Bugzilla Id: 55236 > > Modified: > > jmeter/trunk/src/core/org/apache/jmeter/gui/action/SelectTemplateDialog.java > jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties > jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties > jmeter/trunk/xdocs/changes.xml > > Modified: > 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/SelectTemplateDialog.java?rev=1502028&r1=1502027&r2=1502028&view=diff > ============================================================================== > --- > jmeter/trunk/src/core/org/apache/jmeter/gui/action/SelectTemplateDialog.java > (original) > +++ > jmeter/trunk/src/core/org/apache/jmeter/gui/action/SelectTemplateDialog.java > Wed Jul 10 22:03:33 2013 > @@ -71,6 +71,8 @@ public class SelectTemplateDialog extend > > private final HtmlPane helpDoc = new HtmlPane(); > > + private final JButton reloadTemplateButton = new > JButton(JMeterUtils.getResString("template_reload")); //$NON-NLS-1$; > + > private final JButton applyTemplateButton = new JButton(); > > private final JButton cancelButton = new > JButton(JMeterUtils.getResString("cancel")); //$NON-NLS-1$; > @@ -157,6 +159,7 @@ public class SelectTemplateDialog extend > > private void init() { > templateList.addChangeListener(this); > + reloadTemplateButton.addActionListener(this); > this.getContentPane().setLayout(new BorderLayout(10, 10)); > this.getContentPane().add(templateList, BorderLayout.NORTH); > helpDoc.setContentType("text/html"); //$NON-NLS-1$ > @@ -169,6 +172,7 @@ public class SelectTemplateDialog extend > applyTemplateButton.addActionListener(this); > cancelButton.addActionListener(this); > > + buttonsPanel.add(reloadTemplateButton); > buttonsPanel.add(applyTemplateButton); > buttonsPanel.add(cancelButton); > this.getContentPane().add(buttonsPanel, BorderLayout.SOUTH); > @@ -182,8 +186,7 @@ public class SelectTemplateDialog extend > @Override > public void setVisible(boolean visible){ > if (visible) { > - String[] templateNames = > TemplateManager.getInstance().reset().getTemplateNames(); > - templateList.setValues(templateNames); > + > templateList.setValues(TemplateManager.getInstance().getTemplateNames()); > populateTemplatePage(); > } > super.setVisible(visible); > @@ -195,11 +198,15 @@ public class SelectTemplateDialog extend > */ > @Override > public void actionPerformed(ActionEvent e) { > - if (e.getSource() == cancelButton) { > + final Object source = e.getSource(); > + if (source == cancelButton) { > this.setVisible(false); > return; > + } else if (source == applyTemplateButton) { > + checkDirtyAndLoad(e); > + } else if (source == reloadTemplateButton) { > + > templateList.setValues(TemplateManager.getInstance().reset().getTemplateNames()); > } > - checkDirtyAndLoad(e); > } > > @Override > > 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=1502028&r1=1502027&r2=1502028&view=diff > ============================================================================== > --- jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties > (original) > +++ jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties Wed > Jul 10 22:03:33 2013 > @@ -1049,6 +1049,7 @@ template_create_from=Create > template_field=Template\: > template_load?=Load template ? > template_merge_from=Merge > +template_reload=Reload templates > template_title=Create from Template > test=Test > test_action_action=Action > > 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=1502028&r1=1502027&r2=1502028&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 > Wed Jul 10 22:03:33 2013 > @@ -1042,6 +1042,7 @@ template_create_from=Cr\u00E9er > template_field=Canevas \: > template_load?=Charger le mod\u00E8le ? > template_merge_from=Fusionner > +template_reload=Chercher mod\u00E8les > template_title=Cr\u00E9er \u00E0 partir du mod\u00E8le > test=Test > test_action_action=Action \: > > Modified: jmeter/trunk/xdocs/changes.xml > URL: > http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1502028&r1=1502027&r2=1502028&view=diff > ============================================================================== > --- jmeter/trunk/xdocs/changes.xml (original) > +++ jmeter/trunk/xdocs/changes.xml Wed Jul 10 22:03:33 2013 > @@ -267,6 +267,7 @@ Transaction Controller now sets Response > <li><bugzilla>55172</bugzilla> - Provide plugins a way to add Top Menu and > menu items</li> > <li><bugzilla>55202</bugzilla> - Add syntax color for scripts elements > (BeanShell, BSF, and JSR223) and JDBC elements with RSyntaxTextArea</li> > <li><bugzilla>55175</bugzilla> - HTTPHC4Impl refactoring to allow better > inheritance</li> > +<li><bugzilla>55236</bugzilla> - Templates - provide button to reload > template details</li> > </ul> > > <h2>Non-functional changes</h2> > >
