You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jmeter-dev@jakarta.apache.org by wo...@apache.org on 2005/11/07 06:39:44 UTC
svn commit: r331216 - in
/jakarta/jmeter/branches/rel-2-1/src/reports/org/apache/jmeter:
report/gui/BarChartGui.java report/gui/LineGraphGui.java
testelement/AbstractChart.java testelement/AbstractTable.java
testelement/LineGraph.java
Author: woolfel
Date: Sun Nov 6 21:39:40 2005
New Revision: 331216
URL: http://svn.apache.org/viewcvs?rev=331216&view=rev
Log:
checking in the latest code. still not functional yet, but the code compiles
peter
Modified:
jakarta/jmeter/branches/rel-2-1/src/reports/org/apache/jmeter/report/gui/BarChartGui.java
jakarta/jmeter/branches/rel-2-1/src/reports/org/apache/jmeter/report/gui/LineGraphGui.java
jakarta/jmeter/branches/rel-2-1/src/reports/org/apache/jmeter/testelement/AbstractChart.java
jakarta/jmeter/branches/rel-2-1/src/reports/org/apache/jmeter/testelement/AbstractTable.java
jakarta/jmeter/branches/rel-2-1/src/reports/org/apache/jmeter/testelement/LineGraph.java
Modified: jakarta/jmeter/branches/rel-2-1/src/reports/org/apache/jmeter/report/gui/BarChartGui.java
URL: http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/reports/org/apache/jmeter/report/gui/BarChartGui.java?rev=331216&r1=331215&r2=331216&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-1/src/reports/org/apache/jmeter/report/gui/BarChartGui.java (original)
+++ jakarta/jmeter/branches/rel-2-1/src/reports/org/apache/jmeter/report/gui/BarChartGui.java Sun Nov 6 21:39:40 2005
@@ -43,7 +43,11 @@
private JLabeledTextField yAxisLabel =
new JLabeledTextField(JMeterUtils.getResString("report_chart_y_axis_label"));
- private JLabeledChoice checkItems = null;
+ private JLabeledTextField caption =
+ new JLabeledTextField(JMeterUtils.getResString("report_chart_caption"),
+ Color.white);
+
+ private JLabeledChoice checkItems = null;
private JLabeledChoice xItems = null;
public BarChartGui() {
@@ -96,6 +100,7 @@
ypanel.add(checkItems);
options.add(ypanel);
options.add(yAxisLabel);
+ options.add(caption);
add(pane,BorderLayout.NORTH);
add(options,BorderLayout.CENTER);
@@ -114,6 +119,7 @@
bc.setYAxis(checkItems.getText());
bc.setXLabel(xAxisLabel.getText());
bc.setYLabel(yAxisLabel.getText());
+ bc.setCaption(caption.getText());
}
public void configure(TestElement element) {
@@ -123,6 +129,7 @@
checkItems.setText(bc.getYAxis());
xAxisLabel.setText(bc.getXLabel());
yAxisLabel.setText(bc.getYLabel());
+ caption.setText(bc.getCaption());
if (bc.getCheckedItems() != null && bc.getCheckedItems().size() > 0) {
String[] its = new String[bc.getCheckedItems().size()];
checkItems.setValues((String[])bc.getCheckedItems().toArray(its));
Modified: jakarta/jmeter/branches/rel-2-1/src/reports/org/apache/jmeter/report/gui/LineGraphGui.java
URL: http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/reports/org/apache/jmeter/report/gui/LineGraphGui.java?rev=331216&r1=331215&r2=331216&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-1/src/reports/org/apache/jmeter/report/gui/LineGraphGui.java (original)
+++ jakarta/jmeter/branches/rel-2-1/src/reports/org/apache/jmeter/report/gui/LineGraphGui.java Sun Nov 6 21:39:40 2005
@@ -43,7 +43,15 @@
private JLabeledTextField yAxisLabel =
new JLabeledTextField(JMeterUtils.getResString("report_chart_y_axis_label"));
- private JLabeledChoice checkItems = null;
+ private JLabeledTextField caption =
+ new JLabeledTextField(JMeterUtils.getResString("report_chart_caption"),
+ Color.white);
+
+ private JLabeledTextField urls =
+ new JLabeledTextField(JMeterUtils.getResString("report_line_graph_urls"),
+ Color.white);
+
+ private JLabeledChoice checkItems = null;
private JLabeledChoice xItems = null;
public LineGraphGui() {
@@ -96,6 +104,8 @@
ypanel.add(checkItems);
options.add(ypanel);
options.add(yAxisLabel);
+ options.add(caption);
+ options.add(urls);
add(pane,BorderLayout.NORTH);
add(options,BorderLayout.CENTER);
@@ -114,6 +124,8 @@
bc.setYAxis(checkItems.getText());
bc.setXLabel(xAxisLabel.getText());
bc.setYLabel(yAxisLabel.getText());
+ bc.setCaption(caption.getText());
+ bc.setURLs(urls.getText());
}
public void configure(TestElement element) {
@@ -123,6 +135,8 @@
checkItems.setText(bc.getYAxis());
xAxisLabel.setText(bc.getXLabel());
yAxisLabel.setText(bc.getYLabel());
+ caption.setText(bc.getCaption());
+ urls.setText(bc.getURLs());
if (bc.getCheckedItems() != null && bc.getCheckedItems().size() > 0) {
String[] its = new String[bc.getCheckedItems().size()];
checkItems.setValues((String[])bc.getCheckedItems().toArray(its));
Modified: jakarta/jmeter/branches/rel-2-1/src/reports/org/apache/jmeter/testelement/AbstractChart.java
URL: http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/reports/org/apache/jmeter/testelement/AbstractChart.java?rev=331216&r1=331215&r2=331216&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-1/src/reports/org/apache/jmeter/testelement/AbstractChart.java (original)
+++ jakarta/jmeter/branches/rel-2-1/src/reports/org/apache/jmeter/testelement/AbstractChart.java Sun Nov 6 21:39:40 2005
@@ -34,11 +34,12 @@
*/
public abstract class AbstractChart extends AbstractTestElement implements ReportChart {
- public static final String REPORT_CHART_X_AXIS = "ReportTable.chart.x.axis";
- public static final String REPORT_CHART_Y_AXIS = "ReportTable.chart.y.axis";
- public static final String REPORT_CHART_X_LABEL = "ReportTable.chart.x.label";
- public static final String REPORT_CHART_Y_LABEL = "ReportTable.chart.y.label";
- public static final String REPORT_CHART_TITLE = "ReportTable.chart.title";
+ public static final String REPORT_CHART_X_AXIS = "ReportChart.chart.x.axis";
+ public static final String REPORT_CHART_Y_AXIS = "ReportChart.chart.y.axis";
+ public static final String REPORT_CHART_X_LABEL = "ReportChart.chart.x.label";
+ public static final String REPORT_CHART_Y_LABEL = "ReportChart.chart.y.label";
+ public static final String REPORT_CHART_TITLE = "ReportChart.chart.title";
+ public static final String REPORT_CHART_CAPTION = "ReportChart.chart.caption";
protected AbstractTable parent = null;
@@ -78,12 +79,42 @@
setProperty(REPORT_CHART_Y_LABEL,label);
}
+ /**
+ * The title is a the name for the chart. A page link will
+ * be generated using the title. The title will also be
+ * used for a page index.
+ * @return
+ */
public String getTitle() {
return getPropertyAsString(REPORT_CHART_TITLE);
}
+ /**
+ * The title is a the name for the chart. A page link will
+ * be generated using the title. The title will also be
+ * used for a page index.
+ * @param title
+ */
public void setTitle(String title) {
setProperty(REPORT_CHART_TITLE,title);
+ }
+
+ /**
+ * The caption is a description for the chart explaining
+ * what the chart means.
+ * @return
+ */
+ public String getCaption() {
+ return getPropertyAsString(REPORT_CHART_CAPTION);
+ }
+
+ /**
+ * The caption is a description for the chart explaining
+ * what the chart means.
+ * @param caption
+ */
+ public void setCaption(String caption) {
+ setProperty(REPORT_CHART_CAPTION,caption);
}
public void setParentTable(AbstractTable table) {
Modified: jakarta/jmeter/branches/rel-2-1/src/reports/org/apache/jmeter/testelement/AbstractTable.java
URL: http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/reports/org/apache/jmeter/testelement/AbstractTable.java?rev=331216&r1=331215&r2=331216&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-1/src/reports/org/apache/jmeter/testelement/AbstractTable.java (original)
+++ jakarta/jmeter/branches/rel-2-1/src/reports/org/apache/jmeter/testelement/AbstractTable.java Sun Nov 6 21:39:40 2005
@@ -21,6 +21,8 @@
import java.util.List;
import org.apache.jmeter.report.ReportTable;
+import org.apache.jorphan.logging.LoggingManager;
+import org.apache.log.Logger;
/**
* AbstractTable is the base Element for different kinds of report tables.
@@ -31,6 +33,8 @@
implements ReportTable
{
+ private static final Logger log = LoggingManager.getLoggerForClass();
+
public static final String REPORT_TABLE_MEAN = "ReportTable.mean";
public static final String REPORT_TABLE_MEDIAN = "ReportTable.median";
public static final String REPORT_TABLE_MAX = "ReportTable.max";
@@ -45,11 +49,10 @@
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_DATE = "ReportTable.test.date";
public static final String REPORT_TABLE_TOTAL = "ReportTable.total";
public static final String REPORT_TABLE_URL = "ReportTable.url";
- public static final String[] xitems = { REPORT_TABLE_DATE, REPORT_TABLE_TOTAL,
+ public static final String[] xitems = { REPORT_TABLE_TOTAL,
REPORT_TABLE_URL };
protected ArrayList children = new ArrayList();
@@ -137,6 +140,7 @@
public void addTestElement(TestElement el) {
super.addTestElement(el);
+ log.info("TestElement: " + el.getClass().getName());
if (el instanceof AbstractChart) {
((AbstractChart)el).setParentTable(this);
}
Modified: jakarta/jmeter/branches/rel-2-1/src/reports/org/apache/jmeter/testelement/LineGraph.java
URL: http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/reports/org/apache/jmeter/testelement/LineGraph.java?rev=331216&r1=331215&r2=331216&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-1/src/reports/org/apache/jmeter/testelement/LineGraph.java (original)
+++ jakarta/jmeter/branches/rel-2-1/src/reports/org/apache/jmeter/testelement/LineGraph.java Sun Nov 6 21:39:40 2005
@@ -23,10 +23,20 @@
public class LineGraph extends AbstractChart {
+ public static final String REPORT_CHART_URLS = "ReportChart.chart.urls";
+
public LineGraph() {
super();
}
+ public String getURLs() {
+ return getPropertyAsString(REPORT_CHART_URLS);
+ }
+
+ public void setURLs(String urls) {
+ setProperty(REPORT_CHART_URLS,urls);
+ }
+
public JComponent renderChart(ReportTable element) {
return null;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: jmeter-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-help@jakarta.apache.org