You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by se...@apache.org on 2013/07/09 23:24:57 UTC
svn commit: r1501566 -
/jmeter/trunk/src/core/org/apache/jmeter/gui/action/SelectTemplateDialog.java
Author: sebb
Date: Tue Jul 9 21:24:56 2013
New Revision: 1501566
URL: http://svn.apache.org/r1501566
Log:
Template GUI Manager silently overwrites files; does not allow for file merge
Change GUI to show whether template is full test plan or partial
Bugzilla Id: 55224
Modified:
jmeter/trunk/src/core/org/apache/jmeter/gui/action/SelectTemplateDialog.java
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=1501566&r1=1501565&r2=1501566&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 Tue Jul 9 21:24:56 2013
@@ -75,9 +75,9 @@ public class SelectTemplateDialog extend
private final HtmlPane helpDoc = new HtmlPane();
- private JButton createFromTemplateButton;
+ private final JButton applyTemplateButton = new JButton();
- private JButton cancelButton;
+ private final JButton cancelButton = new JButton(JMeterUtils.getResString("cancel")); //$NON-NLS-1$;
private final JScrollPane scroller = new JScrollPane(helpDoc);
@@ -155,20 +155,18 @@ public class SelectTemplateDialog extend
this.getContentPane().add(templateList, BorderLayout.NORTH);
helpDoc.setContentType("text/html"); //$NON-NLS-1$
helpDoc.setEditable(false);
- fillDescription();
this.getContentPane().add(scroller, BorderLayout.CENTER);
JPanel buttonsPanel = new JPanel(new FlowLayout(FlowLayout.CENTER));
- createFromTemplateButton = new JButton(JMeterUtils.getResString("template_create_from")); //$NON-NLS-1$
- createFromTemplateButton.addActionListener(this);
-
- cancelButton = new JButton(JMeterUtils.getResString("cancel")); //$NON-NLS-1$
+ applyTemplateButton.addActionListener(this);
cancelButton.addActionListener(this);
- buttonsPanel.add(createFromTemplateButton);
+
+ buttonsPanel.add(applyTemplateButton);
buttonsPanel.add(cancelButton);
this.getContentPane().add(buttonsPanel, BorderLayout.SOUTH);
+ populateTemplatePage();
this.pack();
this.setMinimumSize(new Dimension(MINIMAL_BOX_WIDTH, MINIMAL_BOX_HEIGHT));
ComponentUtil.centerComponentInWindow(this, 50); // center position and 50% of screen size
@@ -195,16 +193,16 @@ public class SelectTemplateDialog extend
@Override
public void stateChanged(ChangeEvent event) {
- fillDescription();
+ populateTemplatePage();
}
- /**
- *
- */
- protected void fillDescription() {
+ private void populateTemplatePage() {
String selectedTemplate = templateList.getText();
Template template = TemplateManager.getInstance().getTemplateByName(selectedTemplate);
helpDoc.setText(template.getDescription());
+ applyTemplateButton.setText(template.isTestPlan()
+ ? JMeterUtils.getResString("template_create_from")
+ : JMeterUtils.getResString("template_merge_from") );
}
/**