Author: sebb Date: Sat May 9 19:26:54 2009 New Revision: 773264 URL: http://svn.apache.org/viewvc?rev=773264&view=rev Log: Save "Include group Name in Label" settings in Aggregate and Summary reports
Modified: jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/StatVisualizer.java jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/SummaryReport.java jakarta/jmeter/trunk/xdocs/changes.xml Modified: jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/StatVisualizer.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/StatVisualizer.java?rev=773264&r1=773263&r2=773264&view=diff ============================================================================== --- jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/StatVisualizer.java (original) +++ jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/StatVisualizer.java Sat May 9 19:26:54 2009 @@ -50,6 +50,7 @@ import org.apache.jmeter.samplers.Clearable; import org.apache.jmeter.samplers.SampleResult; import org.apache.jmeter.save.CSVSaveService; +import org.apache.jmeter.testelement.TestElement; import org.apache.jmeter.util.JMeterUtils; import org.apache.jmeter.visualizers.gui.AbstractVisualizer; import org.apache.jorphan.gui.NumberRenderer; @@ -72,6 +73,8 @@ private static final Logger log = LoggingManager.getLoggerForClass(); + private static final String USE_GROUP_NAME = "useGroupName"; //$NON-NLS-1$ + private static final String[] COLUMNS = { "sampler_label", //$NON-NLS-1$ "aggregate_report_count", //$NON-NLS-1$ @@ -87,19 +90,19 @@ private final String TOTAL_ROW_LABEL = JMeterUtils.getResString("aggregate_report_total_label"); //$NON-NLS-1$ - protected JTable myJTable; + private JTable myJTable; - protected JScrollPane myScrollPane; + private JScrollPane myScrollPane; - protected JButton saveTable = + private final JButton saveTable = new JButton(JMeterUtils.getResString("aggregate_graph_save_table")); //$NON-NLS-1$ - private JCheckBox useGroupName = + private final JCheckBox useGroupName = new JCheckBox(JMeterUtils.getResString("aggregate_graph_use_group_name")); //$NON-NLS-1$ private transient ObjectTableModel model; - Map tableRows = Collections.synchronizedMap(new HashMap()); + private final Map tableRows = Collections.synchronizedMap(new HashMap()); public StatVisualizer() { super(); @@ -140,6 +143,7 @@ new NumberRenderer("#.0"), // pageSize //$NON-NLS-1$ }; + /** @deprecated - only for use in testing */ public static boolean testFunctors(){ StatVisualizer instance = new StatVisualizer(); return instance.model.checkFunctors(null,instance.getClass()); @@ -216,6 +220,16 @@ this.add(opts,BorderLayout.SOUTH); } + public void modifyTestElement(TestElement c) { + super.modifyTestElement(c); + c.setProperty(USE_GROUP_NAME, useGroupName.isSelected(), false); + } + + public void configure(TestElement el) { + super.configure(el); + useGroupName.setSelected(el.getPropertyAsBoolean(USE_GROUP_NAME, false)); + } + public void actionPerformed(ActionEvent ev) { if (ev.getSource() == saveTable) { JFileChooser chooser = FileDialoger.promptToSaveFile("aggregate.csv");//$NON-NLS-1$ Modified: jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/SummaryReport.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/SummaryReport.java?rev=773264&r1=773263&r2=773264&view=diff ============================================================================== --- jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/SummaryReport.java (original) +++ jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/SummaryReport.java Sat May 9 19:26:54 2009 @@ -45,6 +45,7 @@ import org.apache.jmeter.samplers.Clearable; import org.apache.jmeter.samplers.SampleResult; import org.apache.jmeter.save.CSVSaveService; +import org.apache.jmeter.testelement.TestElement; import org.apache.jmeter.util.Calculator; import org.apache.jmeter.util.JMeterUtils; import org.apache.jmeter.visualizers.gui.AbstractVisualizer; @@ -65,6 +66,8 @@ private static final Logger log = LoggingManager.getLoggerForClass(); + private static final String USE_GROUP_NAME = "useGroupName"; //$NON-NLS-1$ + private static final String[] COLUMNS = { "sampler_label", //$NON-NLS-1$ "aggregate_report_count", //$NON-NLS-1$ @@ -81,19 +84,19 @@ private final String TOTAL_ROW_LABEL = JMeterUtils.getResString("aggregate_report_total_label"); //$NON-NLS-1$ - protected JTable myJTable; + private JTable myJTable; - protected JScrollPane myScrollPane; + private JScrollPane myScrollPane; - protected JButton saveTable = + private final JButton saveTable = new JButton(JMeterUtils.getResString("aggregate_graph_save_table")); //$NON-NLS-1$ - private JCheckBox useGroupName = + private final JCheckBox useGroupName = new JCheckBox(JMeterUtils.getResString("aggregate_graph_use_group_name")); //$NON-NLS-1$ private transient ObjectTableModel model; - Map tableRows = Collections.synchronizedMap(new HashMap()); + private final Map tableRows = Collections.synchronizedMap(new HashMap()); // Column renderers private static final TableCellRenderer[] RENDERERS = @@ -133,6 +136,7 @@ init(); } + /** @deprecated - only for use in testing */ public static boolean testFunctors(){ SummaryReport instance = new SummaryReport(); return instance.model.checkFunctors(null,instance.getClass()); @@ -207,6 +211,16 @@ this.add(opts,BorderLayout.SOUTH); } + public void modifyTestElement(TestElement c) { + super.modifyTestElement(c); + c.setProperty(USE_GROUP_NAME, useGroupName.isSelected(), false); + } + + public void configure(TestElement el) { + super.configure(el); + useGroupName.setSelected(el.getPropertyAsBoolean(USE_GROUP_NAME, false)); + } + public void actionPerformed(ActionEvent ev) { if (ev.getSource() == saveTable) { JFileChooser chooser = FileDialoger.promptToSaveFile("summary.csv");//$NON-NLS-1$ Modified: jakarta/jmeter/trunk/xdocs/changes.xml URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/xdocs/changes.xml?rev=773264&r1=773263&r2=773264&view=diff ============================================================================== --- jakarta/jmeter/trunk/xdocs/changes.xml (original) +++ jakarta/jmeter/trunk/xdocs/changes.xml Sat May 9 19:26:54 2009 @@ -212,6 +212,7 @@ <li>Bug 47150 - ThreadGroup with a loop count of zero causes infinite loop</li> <li>A reference to a missing function - e.g. ${__missing(a)} - is now treated the same as a missing variable. Previously the function name - and leading { - were dropped.</li> <li>Bug 47165 - Using the same module name in command line mode causes NPE</li> +<li>Save "Include group Name in Label" settings in Aggregate and Summary reports</li> </ul> <h3>Improvements</h3> --------------------------------------------------------------------- To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org