woolfel 2005/09/05 21:28:34
Modified: src/reports/org/apache/jmeter/testelement AbstractTable.java
AbstractChart.java
src/reports/org/apache/jmeter/report/gui TableGui.java
LineGraphGui.java BarChartGui.java
src/reports/org/apache/jmeter/report/gui/action
ReportAddToTree.java
Log:
more updates to the reporting tool. made some more progress on the tool
peter
Revision Changes Path
1.3 +16 -2
jakarta-jmeter/src/reports/org/apache/jmeter/testelement/AbstractTable.java
Index: AbstractTable.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/reports/org/apache/jmeter/testelement/AbstractTable.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AbstractTable.java 5 Sep 2005 04:19:07 -0000 1.2
+++ AbstractTable.java 6 Sep 2005 04:28:31 -0000 1.3
@@ -17,6 +17,8 @@
*/
package org.apache.jmeter.testelement;
+import org.apache.jmeter.report.gui.AbstractReportGui;
+
/**
* AbstractTable is the base Element for different kinds of report tables.
* @author pete
@@ -33,6 +35,18 @@
public static final String REPORT_TABLE_50_PERCENT =
"ReportTable.50.percent";
public static final String REPORT_TABLE_90_PERCENT =
"ReportTable.90.percent";
public static final String REPORT_TABLE_ERROR_RATE =
"ReportTable.error.rate";
+ public static final String[] items = {
+ REPORT_TABLE_MEAN, REPORT_TABLE_MEDIAN, REPORT_TABLE_MAX,
REPORT_TABLE_MIN,
+ REPORT_TABLE_RESPONSE_RATE, REPORT_TABLE_TRANSFER_RATE,
REPORT_TABLE_50_PERCENT,
+ REPORT_TABLE_90_PERCENT, REPORT_TABLE_ERROR_RATE };
+
+ public static final String REPORT_TABLE_FILE = "ReportTable.file";
+ public static final String REPORT_TABLE_DATE = "ReportTable.test.date";
+ public static final String REPORT_TABLE_URL = "ReportTable.url";
+
+ public static final String[] xitems = { REPORT_TABLE_FILE,
REPORT_TABLE_DATE,
+ REPORT_TABLE_URL };
+
public AbstractTable() {
super();
@@ -95,11 +109,11 @@
}
public boolean get90Percent() {
- return getPropertyAsBoolean(REPORT_TABLE_50_PERCENT);
+ return getPropertyAsBoolean(REPORT_TABLE_90_PERCENT);
}
public void set90Percent(String set) {
- setProperty(REPORT_TABLE_50_PERCENT,set);
+ setProperty(REPORT_TABLE_90_PERCENT,set);
}
public boolean getErrorRate() {
1.3 +18 -0
jakarta-jmeter/src/reports/org/apache/jmeter/testelement/AbstractChart.java
Index: AbstractChart.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/reports/org/apache/jmeter/testelement/AbstractChart.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AbstractChart.java 5 Sep 2005 04:19:07 -0000 1.2
+++ AbstractChart.java 6 Sep 2005 04:28:31 -0000 1.3
@@ -17,6 +17,9 @@
*/
package org.apache.jmeter.testelement;
+import java.util.ArrayList;
+import java.util.List;
+
import javax.swing.JComponent;
/**
@@ -84,5 +87,20 @@
this.parent = table;
}
+ /**
+ * Method returns the items that are checked
+ * @return
+ */
+ public List getCheckedItems() {
+ ArrayList checked = new ArrayList();
+ for (int idx=0; idx < AbstractTable.items.length; idx++) {
+ if (this.parent.getPropertyAsString(
+
AbstractTable.items[idx]).equals(String.valueOf(true))) {
+ checked.add(AbstractTable.items[idx]);
+ }
+ }
+ return checked;
+ }
+
public abstract JComponent renderChart(TestElement element);
}
1.3 +10 -1
jakarta-jmeter/src/reports/org/apache/jmeter/report/gui/TableGui.java
Index: TableGui.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/reports/org/apache/jmeter/report/gui/TableGui.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TableGui.java 5 Sep 2005 04:19:08 -0000 1.2
+++ TableGui.java 6 Sep 2005 04:28:32 -0000 1.3
@@ -24,14 +24,17 @@
import javax.swing.JMenu;
import javax.swing.JPanel;
import javax.swing.JPopupMenu;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+import org.apache.jmeter.gui.ReportGuiPackage;
import org.apache.jmeter.gui.util.ReportMenuFactory;
import org.apache.jmeter.gui.util.VerticalPanel;
import org.apache.jmeter.testelement.Table;
import org.apache.jmeter.testelement.TestElement;
import org.apache.jmeter.util.JMeterUtils;
-public class TableGui extends AbstractReportGui {
+public class TableGui extends AbstractReportGui implements ChangeListener {
private JCheckBox meanCheck = new
JCheckBox(JMeterUtils.getResString("average"));
private JCheckBox medianCheck = new
JCheckBox(JMeterUtils.getResString("graph_results_median"));
@@ -70,6 +73,7 @@
pane.setBackground(Color.white);
pane.add(this.getNamePanel(),BorderLayout.NORTH);
+ meanCheck.addChangeListener(this);
VerticalPanel options = new VerticalPanel(Color.white);
meanCheck.setBackground(Color.white);
medianCheck.setBackground(Color.white);
@@ -89,6 +93,7 @@
options.add(fiftypercentCheck);
options.add(nintypercentCheck);
options.add(errorRateCheck);
+
add(pane,BorderLayout.NORTH);
add(options,BorderLayout.CENTER);
}
@@ -141,4 +146,8 @@
responseRateCheck.setSelected(tb.getResponseRate());
transferRateCheck.setSelected(tb.getTransferRate());
}
+
+ public void stateChanged(ChangeEvent e) {
+ modifyTestElement(ReportGuiPackage.getInstance().getCurrentElement());
+ }
}
1.2 +9 -0
jakarta-jmeter/src/reports/org/apache/jmeter/report/gui/LineGraphGui.java
Index: LineGraphGui.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/reports/org/apache/jmeter/report/gui/LineGraphGui.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- LineGraphGui.java 5 Sep 2005 04:19:08 -0000 1.1
+++ LineGraphGui.java 6 Sep 2005 04:28:32 -0000 1.2
@@ -21,7 +21,9 @@
import java.awt.Color;
import javax.swing.JPanel;
+import javax.swing.JPopupMenu;
+import org.apache.jmeter.gui.util.ReportMenuFactory;
import org.apache.jmeter.gui.util.VerticalPanel;
import org.apache.jmeter.testelement.LineGraph;
import org.apache.jmeter.testelement.TestElement;
@@ -50,6 +52,13 @@
public String getLabelResource() {
return "report_line_graph";
}
+
+ public JPopupMenu createPopupMenu() {
+ JPopupMenu pop = new JPopupMenu();
+ ReportMenuFactory.addFileMenu(pop);
+ ReportMenuFactory.addEditMenu(pop,true);
+ return pop;
+ }
protected void init() {
setLayout(new BorderLayout(10, 10));
1.2 +45 -14
jakarta-jmeter/src/reports/org/apache/jmeter/report/gui/BarChartGui.java
Index: BarChartGui.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/reports/org/apache/jmeter/report/gui/BarChartGui.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- BarChartGui.java 5 Sep 2005 04:19:08 -0000 1.1
+++ BarChartGui.java 6 Sep 2005 04:28:32 -0000 1.2
@@ -17,30 +17,35 @@
*/
package org.apache.jmeter.report.gui;
+import javax.swing.border.EmptyBorder;
import java.awt.BorderLayout;
import java.awt.Color;
+import javax.swing.JLabel;
+import javax.swing.JMenu;
import javax.swing.JPanel;
+import javax.swing.JPopupMenu;
+import org.apache.jmeter.gui.util.ReportMenuFactory;
+import org.apache.jmeter.gui.util.HorizontalPanel;
import org.apache.jmeter.gui.util.VerticalPanel;
+import org.apache.jmeter.testelement.AbstractTable;
import org.apache.jmeter.testelement.BarChart;
import org.apache.jmeter.testelement.TestElement;
import org.apache.jmeter.util.JMeterUtils;
+import org.apache.jorphan.gui.JLabeledChoice;
import org.apache.jorphan.gui.JLabeledTextField;
public class BarChartGui extends AbstractReportGui {
- private JLabeledTextField xAxis =
- new
JLabeledTextField(JMeterUtils.getResString("report_chart_x_axis"));
-
- private JLabeledTextField yAxis =
- new
JLabeledTextField(JMeterUtils.getResString("report_chart_y_axis"));
-
private JLabeledTextField xAxisLabel =
new
JLabeledTextField(JMeterUtils.getResString("report_chart_x_axis_label"));
private JLabeledTextField yAxisLabel =
new
JLabeledTextField(JMeterUtils.getResString("report_chart_y_axis_label"));
+
+ private JLabeledChoice checkItems = null;
+ private JLabeledChoice xItems = null;
public BarChartGui() {
super();
@@ -50,6 +55,13 @@
public String getLabelResource() {
return "report_bar_chart";
}
+
+ public JPopupMenu createPopupMenu() {
+ JPopupMenu pop = new JPopupMenu();
+ ReportMenuFactory.addFileMenu(pop);
+ ReportMenuFactory.addEditMenu(pop,true);
+ return pop;
+ }
protected void init() {
setLayout(new BorderLayout(10, 10));
@@ -62,15 +74,30 @@
pane.add(this.getNamePanel(),BorderLayout.NORTH);
VerticalPanel options = new VerticalPanel(Color.white);
- xAxis.setBackground(Color.white);
- yAxis.setBackground(Color.white);
xAxisLabel.setBackground(Color.white);
yAxisLabel.setBackground(Color.white);
- options.add(xAxis);
- options.add(yAxis);
options.add(xAxisLabel);
options.add(yAxisLabel);
+ JLabel yLabel = new
JLabel(JMeterUtils.getResString("report_chart_y_axis"));
+ HorizontalPanel ypanel = new HorizontalPanel(Color.white);
+ yLabel.setBorder(new EmptyBorder(5,2,5,2));
+ checkItems = new JLabeledChoice();
+ checkItems.setBackground(Color.white);
+ ypanel.add(yLabel);
+ ypanel.add(checkItems);
+ options.add(ypanel);
+
+ JLabel xLabel = new
JLabel(JMeterUtils.getResString("report_chart_x_axis"));
+ HorizontalPanel xpanel = new HorizontalPanel(Color.white);
+ xLabel.setBorder(new EmptyBorder(5,2,5,2));
+ xItems = new JLabeledChoice();
+ xItems.setBackground(Color.white);
+ xItems.setValues(AbstractTable.xitems);
+ xpanel.add(xLabel);
+ xpanel.add(xItems);
+ options.add(xpanel);
+
add(pane,BorderLayout.NORTH);
add(options,BorderLayout.CENTER);
}
@@ -84,8 +111,8 @@
public void modifyTestElement(TestElement element) {
this.configureTestElement(element);
BarChart bc = (BarChart)element;
- bc.setXAxis(xAxis.getText());
- bc.setYAxis(yAxis.getText());
+ // bc.setXAxis(xAxis.getText());
+ // bc.setYAxis(yAxis.getText());
bc.setXLabel(xAxisLabel.getText());
bc.setYLabel(yAxisLabel.getText());
}
@@ -93,9 +120,13 @@
public void configure(TestElement element) {
super.configure(element);
BarChart bc = (BarChart)element;
- xAxis.setText(bc.getXAxis());
- yAxis.setText(bc.getYAxis());
+ // xAxis.setText(bc.getXAxis());
+ // yAxis.setText(bc.getYAxis());
xAxisLabel.setText(bc.getXLabel());
yAxisLabel.setText(bc.getYLabel());
+ if (bc.getCheckedItems().size() > 0) {
+ String[] its = new String[bc.getCheckedItems().size()];
+
checkItems.setValues((String[])bc.getCheckedItems().toArray(its));
+ }
}
}
1.2 +2 -1
jakarta-jmeter/src/reports/org/apache/jmeter/report/gui/action/ReportAddToTree.java
Index: ReportAddToTree.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/reports/org/apache/jmeter/report/gui/action/ReportAddToTree.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ReportAddToTree.java 17 Aug 2005 04:22:30 -0000 1.1
+++ ReportAddToTree.java 6 Sep 2005 04:28:33 -0000 1.2
@@ -74,6 +74,7 @@
guiPackage.getTreeModel().insertNodeInto(node,
guiPackage.getTreeListener().getCurrentNode(),
guiPackage.getTreeListener().getCurrentNode().getChildCount());
+
((TestElement)guiPackage.getTreeListener().getCurrentNode().getUserObject()).addTestElement(el);
guiPackage.getMainFrame().getTree().setSelectionPath(
new TreePath(node.getPath()));
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
