Author: woolfel
Date: Sun Oct 23 19:38:58 2005
New Revision: 327924
URL: http://svn.apache.org/viewcvs?rev=327924&view=rev
Log:
checking in a bunch of updates to the reporting tool
peter lin
Added:
jakarta/jmeter/branches/rel-2-1/src/reports/org/apache/jmeter/report/ReportChart.java
Removed:
jakarta/jmeter/branches/rel-2-1/src/reports/org/apache/jmeter/testelement/Chart.java
Modified:
jakarta/jmeter/branches/rel-2-1/src/reports/org/apache/jmeter/control/gui/ReportGui.java
jakarta/jmeter/branches/rel-2-1/src/reports/org/apache/jmeter/report/gui/ReportPageGui.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/BarChart.java
jakarta/jmeter/branches/rel-2-1/src/reports/org/apache/jmeter/testelement/LineGraph.java
jakarta/jmeter/branches/rel-2-1/src/reports/org/apache/jmeter/testelement/ReportPage.java
jakarta/jmeter/branches/rel-2-1/src/reports/org/apache/jmeter/testelement/ReportPlan.java
jakarta/jmeter/branches/rel-2-1/src/reports/org/apache/jmeter/testelement/Table.java
Modified:
jakarta/jmeter/branches/rel-2-1/src/reports/org/apache/jmeter/control/gui/ReportGui.java
URL:
http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/reports/org/apache/jmeter/control/gui/ReportGui.java?rev=327924&r1=327923&r2=327924&view=diff
==============================================================================
---
jakarta/jmeter/branches/rel-2-1/src/reports/org/apache/jmeter/control/gui/ReportGui.java
(original)
+++
jakarta/jmeter/branches/rel-2-1/src/reports/org/apache/jmeter/control/gui/ReportGui.java
Sun Oct 23 19:38:58 2005
@@ -32,6 +32,7 @@
import org.apache.jmeter.config.Arguments;
import org.apache.jmeter.config.gui.ArgumentsPanel;
+import org.apache.jmeter.gui.util.DirectoryPanel;
import org.apache.jmeter.gui.util.ReportMenuFactory;
import org.apache.jmeter.report.gui.AbstractReportGui;
import org.apache.jmeter.report.gui.ReportPageGui;
@@ -50,12 +51,16 @@
private JCheckBox serializedMode;
- /** A panel allowing the user to define variables. */
- private ArgumentsPanel argsPanel;
-
/** A panel to contain comments on the test plan. */
private JTextField commentPanel;
+ private DirectoryPanel baseDir =
+ new DirectoryPanel(JMeterUtils.getResString("report_base_directory"),
"",
+ Color.white);
+
+ /** A panel allowing the user to define variables. */
+ private ArgumentsPanel argsPanel;
+
/**
* Create a new TestPlanGui.
*/
@@ -97,6 +102,7 @@
ReportPlan rp = (ReportPlan) plan;
rp.setUserDefinedVariables((Arguments)
argsPanel.createTestElement());
rp.setProperty(ReportPlan.COMMENTS,
commentPanel.getText());
+ rp.setBasedir(baseDir.getFilename());
}
}
@@ -132,6 +138,7 @@
argsPanel.configure((Arguments)
el.getProperty(ReportPlan.USER_DEFINED_VARIABLES).getObjectValue());
}
commentPanel.setText(el.getPropertyAsString(ReportPlan.COMMENTS));
+ baseDir.setFilename(el.getPropertyAsString(ReportPlan.BASEDIR));
}
/**
@@ -147,14 +154,19 @@
}
private Container createCommentPanel() {
- Container panel = makeTitlePanel();
+ JPanel panel = new JPanel();
+ panel.setBackground(Color.white);
+ panel.setLayout(new BorderLayout(10, 10));
+ Container title = makeTitlePanel();
commentPanel = new JTextField();
commentPanel.setBackground(Color.white);
JLabel label = new
JLabel(JMeterUtils.getResString("testplan_comments"));
label.setBackground(Color.white);
label.setLabelFor(commentPanel);
- panel.add(label);
- panel.add(commentPanel);
+ title.add(label);
+ title.add(commentPanel);
+ panel.add(title,BorderLayout.NORTH);
+ panel.add(baseDir,BorderLayout.CENTER);
return panel;
}
Added:
jakarta/jmeter/branches/rel-2-1/src/reports/org/apache/jmeter/report/ReportChart.java
URL:
http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/reports/org/apache/jmeter/report/ReportChart.java?rev=327924&view=auto
==============================================================================
---
jakarta/jmeter/branches/rel-2-1/src/reports/org/apache/jmeter/report/ReportChart.java
(added)
+++
jakarta/jmeter/branches/rel-2-1/src/reports/org/apache/jmeter/report/ReportChart.java
Sun Oct 23 19:38:58 2005
@@ -0,0 +1,25 @@
+//$Header$
+/*
+ * Copyright 2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+package org.apache.jmeter.report;
+
+import javax.swing.JComponent;
+
+
+public interface ReportChart {
+ JComponent renderChart(ReportTable element);
+}
Modified:
jakarta/jmeter/branches/rel-2-1/src/reports/org/apache/jmeter/report/gui/ReportPageGui.java
URL:
http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/reports/org/apache/jmeter/report/gui/ReportPageGui.java?rev=327924&r1=327923&r2=327924&view=diff
==============================================================================
---
jakarta/jmeter/branches/rel-2-1/src/reports/org/apache/jmeter/report/gui/ReportPageGui.java
(original)
+++
jakarta/jmeter/branches/rel-2-1/src/reports/org/apache/jmeter/report/gui/ReportPageGui.java
Sun Oct 23 19:38:58 2005
@@ -54,6 +54,7 @@
private JLabeledTextArea introduction =
new JLabeledTextArea(JMeterUtils.getResString("report_page_intro"),
null);
+
/**
*
*/
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=327924&r1=327923&r2=327924&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 Oct 23 19:38:58 2005
@@ -22,6 +22,9 @@
import javax.swing.JComponent;
+import org.apache.jmeter.report.ReportChart;
+import org.apache.jmeter.report.ReportTable;
+
/**
* The general idea of the chart graphs information for a table.
* A chart can only be generated from a specific table, though more
@@ -29,7 +32,7 @@
* @author Peter Lin
*
*/
-public abstract class AbstractChart extends AbstractTestElement implements
Chart {
+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";
@@ -104,5 +107,5 @@
return checked;
}
- public abstract JComponent renderChart(TestElement element);
+ public abstract JComponent renderChart(ReportTable element);
}
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=327924&r1=327923&r2=327924&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 Oct 23 19:38:58 2005
@@ -17,13 +17,19 @@
*/
package org.apache.jmeter.testelement;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.jmeter.report.ReportTable;
/**
* AbstractTable is the base Element for different kinds of report tables.
* @author pete
*
*/
-public abstract class AbstractTable extends AbstractTestElement {
+public abstract class AbstractTable extends AbstractTestElement
+ implements ReportTable
+{
public static final String REPORT_TABLE_MEAN = "ReportTable.mean";
public static final String REPORT_TABLE_MEDIAN = "ReportTable.median";
@@ -46,11 +52,17 @@
public static final String[] xitems = { REPORT_TABLE_FILE,
REPORT_TABLE_DATE,
REPORT_TABLE_URL };
-
+ protected ArrayList children = new ArrayList();
+
public AbstractTable() {
super();
}
+ public void clear() {
+ super.clear();
+ children.clear();
+ }
+
public boolean getMean() {
return getPropertyAsBoolean(REPORT_TABLE_MEAN);
}
@@ -128,5 +140,16 @@
if (el instanceof AbstractChart) {
((AbstractChart)el).setParentTable(this);
}
+ this.children.add(el);
}
+
+ /**
+ * method isn't implemented and is left as abstract. Subclasses
+ * need to provide concrete logic
+ */
+ public abstract String[][] getTableData(List data);
+
+ public List getChartElements() {
+ return this.children;
+ }
}
Modified:
jakarta/jmeter/branches/rel-2-1/src/reports/org/apache/jmeter/testelement/BarChart.java
URL:
http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/reports/org/apache/jmeter/testelement/BarChart.java?rev=327924&r1=327923&r2=327924&view=diff
==============================================================================
---
jakarta/jmeter/branches/rel-2-1/src/reports/org/apache/jmeter/testelement/BarChart.java
(original)
+++
jakarta/jmeter/branches/rel-2-1/src/reports/org/apache/jmeter/testelement/BarChart.java
Sun Oct 23 19:38:58 2005
@@ -19,6 +19,8 @@
import javax.swing.JComponent;
+import org.apache.jmeter.report.ReportTable;
+
/**
* The class is reponsible for returning
* @author pete
@@ -30,7 +32,7 @@
super();
}
- public JComponent renderChart(TestElement element) {
+ public JComponent renderChart(ReportTable element) {
return null;
}
}
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=327924&r1=327923&r2=327924&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 Oct 23 19:38:58 2005
@@ -19,13 +19,15 @@
import javax.swing.JComponent;
+import org.apache.jmeter.report.ReportTable;
+
public class LineGraph extends AbstractChart {
public LineGraph() {
super();
}
- public JComponent renderChart(TestElement element) {
+ public JComponent renderChart(ReportTable element) {
return null;
}
Modified:
jakarta/jmeter/branches/rel-2-1/src/reports/org/apache/jmeter/testelement/ReportPage.java
URL:
http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/reports/org/apache/jmeter/testelement/ReportPage.java?rev=327924&r1=327923&r2=327924&view=diff
==============================================================================
---
jakarta/jmeter/branches/rel-2-1/src/reports/org/apache/jmeter/testelement/ReportPage.java
(original)
+++
jakarta/jmeter/branches/rel-2-1/src/reports/org/apache/jmeter/testelement/ReportPage.java
Sun Oct 23 19:38:58 2005
@@ -47,7 +47,6 @@
public static ReportPage createReportPage(String name) {
ReportPage page = new ReportPage();
- //
page.setProperty(TestElement.GUI_CLASS,AbstractReportGui.class.getName());
return page;
}
@@ -98,4 +97,5 @@
public void setIntroduction(String intro) {
setProperty(REPORT_PAGE_INTRO,intro);
}
+
}
Modified:
jakarta/jmeter/branches/rel-2-1/src/reports/org/apache/jmeter/testelement/ReportPlan.java
URL:
http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/reports/org/apache/jmeter/testelement/ReportPlan.java?rev=327924&r1=327923&r2=327924&view=diff
==============================================================================
---
jakarta/jmeter/branches/rel-2-1/src/reports/org/apache/jmeter/testelement/ReportPlan.java
(original)
+++
jakarta/jmeter/branches/rel-2-1/src/reports/org/apache/jmeter/testelement/ReportPlan.java
Sun Oct 23 19:38:58 2005
@@ -50,7 +50,7 @@
public final static String COMMENTS = "ReportPlan.comments";
- public final static String BASEDIR = "basedir";
+ public final static String BASEDIR = "ReportPlan.basedir";
private transient List reportPages = new LinkedList();
Modified:
jakarta/jmeter/branches/rel-2-1/src/reports/org/apache/jmeter/testelement/Table.java
URL:
http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/reports/org/apache/jmeter/testelement/Table.java?rev=327924&r1=327923&r2=327924&view=diff
==============================================================================
---
jakarta/jmeter/branches/rel-2-1/src/reports/org/apache/jmeter/testelement/Table.java
(original)
+++
jakarta/jmeter/branches/rel-2-1/src/reports/org/apache/jmeter/testelement/Table.java
Sun Oct 23 19:38:58 2005
@@ -17,10 +17,19 @@
*/
package org.apache.jmeter.testelement;
+import java.util.List;
+
public class Table extends AbstractTable {
public Table() {
super();
}
+ /**
+ * for now the method isn't implemented. I still need to decide how
+ * it should be implemented.
+ */
+ public String[][] getTableData(List data) {
+ return null;
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
