Author: woolfel
Date: Mon Nov 7 20:32:56 2005
New Revision: 331678
URL: http://svn.apache.org/viewcvs?rev=331678&view=rev
Log:
fixed a NPE with the BarChartGui and LineGraphGui. also changed the design of
the reporting tool a bit.
now instead of having the charts linked to a table, they can be added to a page
directly.
peter
Modified:
jakarta/jmeter/branches/rel-2-1/src/reports/org/apache/jmeter/report/ReportTable.java
jakarta/jmeter/branches/rel-2-1/src/reports/org/apache/jmeter/report/gui/AbstractReportGui.java
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/report/gui/ReportPageGui.java
jakarta/jmeter/branches/rel-2-1/src/reports/org/apache/jmeter/report/gui/TableGui.java
jakarta/jmeter/branches/rel-2-1/src/reports/org/apache/jmeter/report/gui/action/ReportAddToTree.java
jakarta/jmeter/branches/rel-2-1/src/reports/org/apache/jmeter/report/gui/tree/ReportTreeModel.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/ReportPage.java
Modified:
jakarta/jmeter/branches/rel-2-1/src/reports/org/apache/jmeter/report/ReportTable.java
URL:
http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/reports/org/apache/jmeter/report/ReportTable.java?rev=331678&r1=331677&r2=331678&view=diff
==============================================================================
---
jakarta/jmeter/branches/rel-2-1/src/reports/org/apache/jmeter/report/ReportTable.java
(original)
+++
jakarta/jmeter/branches/rel-2-1/src/reports/org/apache/jmeter/report/ReportTable.java
Mon Nov 7 20:32:56 2005
@@ -25,5 +25,4 @@
*/
public interface ReportTable {
String[][] getTableData(List data);
- List getChartElements();
}
Modified:
jakarta/jmeter/branches/rel-2-1/src/reports/org/apache/jmeter/report/gui/AbstractReportGui.java
URL:
http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/reports/org/apache/jmeter/report/gui/AbstractReportGui.java?rev=331678&r1=331677&r2=331678&view=diff
==============================================================================
---
jakarta/jmeter/branches/rel-2-1/src/reports/org/apache/jmeter/report/gui/AbstractReportGui.java
(original)
+++
jakarta/jmeter/branches/rel-2-1/src/reports/org/apache/jmeter/report/gui/AbstractReportGui.java
Mon Nov 7 20:32:56 2005
@@ -33,6 +33,7 @@
import org.apache.jmeter.gui.NamePanel;
import org.apache.jmeter.gui.util.ReportMenuFactory;
import org.apache.jmeter.gui.util.VerticalPanel;
+import org.apache.jmeter.testelement.TestElement;
import org.apache.jmeter.util.JMeterUtils;
import org.apache.jmeter.visualizers.Printable;
import org.apache.jorphan.logging.LoggingManager;
@@ -65,12 +66,9 @@
return "report_page";
}
- /**
public void configureTestElement(TestElement element) {
- log.info("calling super.configureTestElement");
super.configureTestElement(element);
}
- **/
/* (non-Javadoc)
* @see org.apache.jmeter.gui.JMeterGUIComponent#createPopupMenu()
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=331678&r1=331677&r2=331678&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
Mon Nov 7 20:32:56 2005
@@ -47,8 +47,8 @@
new JLabeledTextField(JMeterUtils.getResString("report_chart_caption"),
Color.white);
- private JLabeledChoice checkItems = null;
- private JLabeledChoice xItems = null;
+ private JLabeledChoice yItems = new JLabeledChoice();
+ private JLabeledChoice xItems = new JLabeledChoice();
public BarChartGui() {
super();
@@ -83,7 +83,6 @@
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);
@@ -94,10 +93,10 @@
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);
+ yItems.setBackground(Color.white);
+ yItems.setValues(AbstractTable.items);
ypanel.add(yLabel);
- ypanel.add(checkItems);
+ ypanel.add(yItems);
options.add(ypanel);
options.add(yAxisLabel);
options.add(caption);
@@ -116,7 +115,7 @@
this.configureTestElement(element);
BarChart bc = (BarChart)element;
bc.setXAxis(xItems.getText());
- bc.setYAxis(checkItems.getText());
+ bc.setYAxis(yItems.getText());
bc.setXLabel(xAxisLabel.getText());
bc.setYLabel(yAxisLabel.getText());
bc.setCaption(caption.getText());
@@ -126,14 +125,10 @@
super.configure(element);
BarChart bc = (BarChart)element;
xItems.setText(bc.getXAxis());
- checkItems.setText(bc.getYAxis());
+ yItems.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=331678&r1=331677&r2=331678&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
Mon Nov 7 20:32:56 2005
@@ -51,8 +51,8 @@
new
JLabeledTextField(JMeterUtils.getResString("report_line_graph_urls"),
Color.white);
- private JLabeledChoice checkItems = null;
- private JLabeledChoice xItems = null;
+ private JLabeledChoice yItems = new JLabeledChoice();
+ private JLabeledChoice xItems = new JLabeledChoice();
public LineGraphGui() {
super();
@@ -87,7 +87,6 @@
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);
@@ -98,10 +97,10 @@
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);
+ yItems.setBackground(Color.white);
+ yItems.setValues(AbstractTable.items);
ypanel.add(yLabel);
- ypanel.add(checkItems);
+ ypanel.add(yItems);
options.add(ypanel);
options.add(yAxisLabel);
options.add(caption);
@@ -121,7 +120,7 @@
this.configureTestElement(element);
LineGraph bc = (LineGraph)element;
bc.setXAxis(xItems.getText());
- bc.setYAxis(checkItems.getText());
+ bc.setYAxis(yItems.getText());
bc.setXLabel(xAxisLabel.getText());
bc.setYLabel(yAxisLabel.getText());
bc.setCaption(caption.getText());
@@ -132,14 +131,10 @@
super.configure(element);
LineGraph bc = (LineGraph)element;
xItems.setText(bc.getXAxis());
- checkItems.setText(bc.getYAxis());
+ yItems.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/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=331678&r1=331677&r2=331678&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
Mon Nov 7 20:32:56 2005
@@ -98,7 +98,12 @@
addMenu.add(ReportMenuFactory.makeMenuItem(new
TableGui().getStaticLabel(),
TableGui.class.getName(),
"Add"));
- // addMenu.add(ReportMenuFactory.makeMenu(ReportMenuFactory.TABLES,
"Add"));
+ addMenu.add(ReportMenuFactory.makeMenuItem(new
BarChartGui().getStaticLabel(),
+ BarChartGui.class.getName(),
+ "Add"));
+ addMenu.add(ReportMenuFactory.makeMenuItem(new
LineGraphGui().getStaticLabel(),
+ LineGraphGui.class.getName(),
+ "Add"));
pop.add(addMenu);
ReportMenuFactory.addFileMenu(pop);
ReportMenuFactory.addEditMenu(pop,true);
Modified:
jakarta/jmeter/branches/rel-2-1/src/reports/org/apache/jmeter/report/gui/TableGui.java
URL:
http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/reports/org/apache/jmeter/report/gui/TableGui.java?rev=331678&r1=331677&r2=331678&view=diff
==============================================================================
---
jakarta/jmeter/branches/rel-2-1/src/reports/org/apache/jmeter/report/gui/TableGui.java
(original)
+++
jakarta/jmeter/branches/rel-2-1/src/reports/org/apache/jmeter/report/gui/TableGui.java
Mon Nov 7 20:32:56 2005
@@ -100,14 +100,6 @@
public JPopupMenu createPopupMenu() {
JPopupMenu pop = new JPopupMenu();
- JMenu addMenu = new JMenu(JMeterUtils.getResString("Add"));
- addMenu.add(ReportMenuFactory.makeMenuItem(new
BarChartGui().getStaticLabel(),
- BarChartGui.class.getName(),
- "Add"));
- addMenu.add(ReportMenuFactory.makeMenuItem(new
LineGraphGui().getStaticLabel(),
- LineGraphGui.class.getName(),
- "Add"));
- pop.add(addMenu);
ReportMenuFactory.addFileMenu(pop);
ReportMenuFactory.addEditMenu(pop,true);
return pop;
Modified:
jakarta/jmeter/branches/rel-2-1/src/reports/org/apache/jmeter/report/gui/action/ReportAddToTree.java
URL:
http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/reports/org/apache/jmeter/report/gui/action/ReportAddToTree.java?rev=331678&r1=331677&r2=331678&view=diff
==============================================================================
---
jakarta/jmeter/branches/rel-2-1/src/reports/org/apache/jmeter/report/gui/action/ReportAddToTree.java
(original)
+++
jakarta/jmeter/branches/rel-2-1/src/reports/org/apache/jmeter/report/gui/action/ReportAddToTree.java
Mon Nov 7 20:32:56 2005
@@ -75,8 +75,12 @@
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()));
+ TestElement curNode =
+
(TestElement)guiPackage.getTreeListener().getCurrentNode().getUserObject();
+ if (curNode != null) {
+ curNode.addTestElement(el);
+ guiPackage.getMainFrame().getTree().setSelectionPath(
+ new TreePath(node.getPath()));
+ }
}
}
Modified:
jakarta/jmeter/branches/rel-2-1/src/reports/org/apache/jmeter/report/gui/tree/ReportTreeModel.java
URL:
http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/reports/org/apache/jmeter/report/gui/tree/ReportTreeModel.java?rev=331678&r1=331677&r2=331678&view=diff
==============================================================================
---
jakarta/jmeter/branches/rel-2-1/src/reports/org/apache/jmeter/report/gui/tree/ReportTreeModel.java
(original)
+++
jakarta/jmeter/branches/rel-2-1/src/reports/org/apache/jmeter/report/gui/tree/ReportTreeModel.java
Mon Nov 7 20:32:56 2005
@@ -109,9 +109,6 @@
guicomp.configure(component);
guicomp.modifyTestElement(component);
ReportGuiPackage.getInstance().getCurrentGui(); // put the gui
object back
- if (component instanceof AbstractChart) {
-
((AbstractChart)component).setParentTable((AbstractTable)node.getUserObject());
- }
// to the way it was.
ReportTreeNode newNode = new ReportTreeNode(component, this);
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=331678&r1=331677&r2=331678&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
Mon Nov 7 20:32:56 2005
@@ -17,9 +17,6 @@
*/
package org.apache.jmeter.testelement;
-import java.util.ArrayList;
-import java.util.List;
-
import javax.swing.JComponent;
import org.apache.jmeter.report.ReportChart;
@@ -41,8 +38,6 @@
public static final String REPORT_CHART_TITLE = "ReportChart.chart.title";
public static final String REPORT_CHART_CAPTION =
"ReportChart.chart.caption";
- protected AbstractTable parent = null;
-
public AbstractChart() {
super();
}
@@ -115,27 +110,6 @@
*/
public void setCaption(String caption) {
setProperty(REPORT_CHART_CAPTION,caption);
- }
-
- public void setParentTable(AbstractTable table) {
- this.parent = table;
- }
-
- /**
- * Method returns the items that are checked
- * @return
- */
- public List getCheckedItems() {
- ArrayList checked = new ArrayList();
- if ( this.parent != null) {
- 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;
}
/**
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=331678&r1=331677&r2=331678&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
Mon Nov 7 20:32:56 2005
@@ -17,7 +17,6 @@
*/
package org.apache.jmeter.testelement;
-import java.util.ArrayList;
import java.util.List;
import org.apache.jmeter.report.ReportTable;
@@ -55,15 +54,12 @@
public static final String[] xitems = { REPORT_TABLE_TOTAL,
REPORT_TABLE_URL };
- protected ArrayList children = new ArrayList();
-
public AbstractTable() {
super();
}
public void clear() {
super.clear();
- children.clear();
}
public boolean getMean() {
@@ -139,12 +135,10 @@
}
public void addTestElement(TestElement el) {
- super.addTestElement(el);
- log.info("TestElement: " + el.getClass().getName());
- if (el instanceof AbstractChart) {
- ((AbstractChart)el).setParentTable(this);
- }
- this.children.add(el);
+ if (el != null) {
+ super.addTestElement(el);
+ log.info("TestElement: " + el.getClass().getName());
+ }
}
/**
@@ -154,7 +148,4 @@
*/
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/ReportPage.java
URL:
http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/reports/org/apache/jmeter/testelement/ReportPage.java?rev=331678&r1=331677&r2=331678&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
Mon Nov 7 20:32:56 2005
@@ -42,7 +42,6 @@
* No-arg constructor.
*/
public ReportPage() {
- //
setProperty(TestElement.GUI_CLASS,AbstractReportGui.class.getName());
}
public static ReportPage createReportPage(String name) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
