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/08/29 03:27:12 UTC
cvs commit: jakarta-jmeter/src/reports/org/apache/jmeter/gui ReportMainFrame.java
woolfel 2005/08/28 18:27:12
Modified: src/reports/org/apache/jmeter/report/gui/tree
ReportTreeNode.java
src/reports/org/apache/jmeter/report ReportPage.java
src/reports/org/apache/jmeter/report/writers/gui
AbstractReportWriterGui.java
src/reports/org/apache/jmeter/testelement ReportPlan.java
src/reports/org/apache/jmeter/report/gui
AbstractReportPageGui.java
src/reports/org/apache/jmeter JMeterReport.java
src/reports/org/apache/jmeter/gui/util ReportMenuBar.java
ReportMenuFactory.java
src/reports/org/apache/jmeter/control/gui ReportGui.java
src/reports/org/apache/jmeter/gui ReportMainFrame.java
Added: src/reports/org/apache/jmeter/report/writers/gui
ReportWriterGui.java
src/reports/org/apache/jmeter/testelement ReportPage.java
src/reports/org/apache/jmeter/report/gui
DefaultReportPageGui.java
src/reports/org/apache/jmeter/report/writers
AbstractReportWriter.java
Log:
more updates to the reporting tool
peter
Revision Changes Path
1.3 +2 -1 jakarta-jmeter/src/reports/org/apache/jmeter/report/gui/tree/ReportTreeNode.java
Index: ReportTreeNode.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/reports/org/apache/jmeter/report/gui/tree/ReportTreeNode.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ReportTreeNode.java 27 Aug 2005 03:40:45 -0000 1.2
+++ ReportTreeNode.java 29 Aug 2005 01:27:11 -0000 1.3
@@ -1,3 +1,4 @@
+//$Header:
/*
* Copyright 2005 The Apache Software Foundation.
*
1.3 +2 -2 jakarta-jmeter/src/reports/org/apache/jmeter/report/ReportPage.java
Index: ReportPage.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/reports/org/apache/jmeter/report/ReportPage.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ReportPage.java 17 Aug 2005 04:22:27 -0000 1.2
+++ ReportPage.java 29 Aug 2005 01:27:11 -0000 1.3
@@ -1,3 +1,4 @@
+//$Header:
/*
* Copyright 2005 The Apache Software Foundation.
*
@@ -14,7 +15,6 @@
* limitations under the License.
*
*/
-
package org.apache.jmeter.report;
import java.io.Serializable;
1.5 +7 -2 jakarta-jmeter/src/reports/org/apache/jmeter/report/writers/gui/AbstractReportWriterGui.java
Index: AbstractReportWriterGui.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/reports/org/apache/jmeter/report/writers/gui/AbstractReportWriterGui.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- AbstractReportWriterGui.java 28 Aug 2005 03:54:33 -0000 1.4
+++ AbstractReportWriterGui.java 29 Aug 2005 01:27:11 -0000 1.5
@@ -36,6 +36,11 @@
public abstract class AbstractReportWriterGui extends AbstractJMeterGuiComponent
implements Printable
{
+ public String getLabelResource() {
+ // Replace this with property string later
+ return "report_writer";
+ }
+
/**
* When a user right-clicks on the component in the test tree, or selects
* the edit menu when the component is selected, the component will be asked
@@ -48,7 +53,7 @@
* @return a JPopupMenu appropriate for the component.
*/
public JPopupMenu createPopupMenu() {
- return ReportMenuFactory.getDefaultTimerMenu();
+ return ReportMenuFactory.getDefaultControllerMenu();
}
/**
1.1 jakarta-jmeter/src/reports/org/apache/jmeter/report/writers/gui/ReportWriterGui.java
Index: ReportWriterGui.java
===================================================================
//$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.writers.gui;
import org.apache.jmeter.testelement.TestElement;
/**
* @author pete
*
* TODO To change the template for this generated type comment go to
* Window - Preferences - Java - Code Style - Code Templates
*/
public class ReportWriterGui extends AbstractReportWriterGui {
/* (non-Javadoc)
* @see org.apache.jmeter.gui.JMeterGUIComponent#createTestElement()
*/
public TestElement createTestElement() {
// TODO Auto-generated method stub
return null;
}
/* (non-Javadoc)
* @see org.apache.jmeter.gui.JMeterGUIComponent#modifyTestElement(org.apache.jmeter.testelement.TestElement)
*/
public void modifyTestElement(TestElement element) {
// TODO Auto-generated method stub
}
public static void main(String[] args) {
}
}
1.4 +3 -6 jakarta-jmeter/src/reports/org/apache/jmeter/testelement/ReportPlan.java
Index: ReportPlan.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/reports/org/apache/jmeter/testelement/ReportPlan.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ReportPlan.java 28 Aug 2005 03:54:33 -0000 1.3
+++ ReportPlan.java 29 Aug 2005 01:27:11 -0000 1.4
@@ -1,3 +1,4 @@
+//$Header:
/*
* Copyright 2005 The Apache Software Foundation.
*
@@ -66,11 +67,7 @@
private static boolean functionalMode = false;
static {
- // WARNING! This String value must be identical to the String value
- // returned in org.apache.jmeter.threads.ThreadGroup.getClassLabel()
- // method. If it's not you will not be able to add a Thread Group
- // element to a Test Plan.
- itemsCanAdd.add(JMeterUtils.getResString("reportpage"));
+ itemsCanAdd.add(JMeterUtils.getResString("report_page"));
}
public ReportPlan() {
1.1 jakarta-jmeter/src/reports/org/apache/jmeter/testelement/ReportPage.java
Index: ReportPage.java
===================================================================
//$Header: /home/cvs/jakarta-jmeter/src/reports/org/apache/jmeter/testelement/ReportPage.java,v 1.1 2005/08/29 01:27:11 woolfel Exp $
/*
* 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.testelement;
/**
* @author Peter Lin
*
* TODO To change the template for this generated type comment go to
* Window - Preferences - Java - Code Style - Code Templates
*/
public class ReportPage extends AbstractTestElement {
/**
*
*/
public ReportPage() {
super();
}
}
1.3 +14 -2 jakarta-jmeter/src/reports/org/apache/jmeter/report/gui/AbstractReportPageGui.java
Index: AbstractReportPageGui.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/reports/org/apache/jmeter/report/gui/AbstractReportPageGui.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AbstractReportPageGui.java 28 Aug 2005 03:54:33 -0000 1.2
+++ AbstractReportPageGui.java 29 Aug 2005 01:27:12 -0000 1.3
@@ -1,3 +1,4 @@
+//$Header:
/*
* Copyright 2005 The Apache Software Foundation.
*
@@ -20,10 +21,14 @@
import java.util.Collection;
import javax.swing.JComponent;
+import javax.swing.JMenu;
import javax.swing.JPopupMenu;
import org.apache.jmeter.gui.AbstractJMeterGuiComponent;
+import org.apache.jmeter.gui.util.MenuFactory;
import org.apache.jmeter.gui.util.ReportMenuFactory;
+import org.apache.jmeter.threads.gui.ThreadGroupGui;
+import org.apache.jmeter.util.JMeterUtils;
import org.apache.jmeter.visualizers.Printable;
/**
@@ -46,14 +51,21 @@
* @see org.apache.jmeter.gui.JMeterGUIComponent#getLabelResource()
*/
public String getLabelResource() {
- return AbstractReportPageGui.class.getName();
+ return "report_page";
}
/* (non-Javadoc)
* @see org.apache.jmeter.gui.JMeterGUIComponent#createPopupMenu()
*/
public JPopupMenu createPopupMenu() {
- return ReportMenuFactory.getDefaultSamplerMenu();
+ JPopupMenu pop = new JPopupMenu();
+ JMenu addMenu = new JMenu(JMeterUtils.getResString("Add"));
+ addMenu.add(MenuFactory.makeMenu(MenuFactory.CONFIG_ELEMENTS, "Add"));
+ addMenu.add(MenuFactory.makeMenu(MenuFactory.PRE_PROCESSORS, "Add"));
+ addMenu.add(MenuFactory.makeMenu(MenuFactory.POST_PROCESSORS, "Add"));
+ pop.add(addMenu);
+ MenuFactory.addFileMenu(pop);
+ return pop;
}
/* (non-Javadoc)
1.1 jakarta-jmeter/src/reports/org/apache/jmeter/report/gui/DefaultReportPageGui.java
Index: DefaultReportPageGui.java
===================================================================
//$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.gui;
import org.apache.jmeter.testelement.TestElement;
import org.apache.jmeter.testelement.ReportPage;
/**
* @author pete
*
* TODO To change the template for this generated type comment go to
* Window - Preferences - Java - Code Style - Code Templates
*/
public class DefaultReportPageGui extends AbstractReportPageGui {
/**
*
*/
public DefaultReportPageGui() {
super();
}
/* (non-Javadoc)
* @see org.apache.jmeter.gui.JMeterGUIComponent#createTestElement()
*/
public TestElement createTestElement() {
ReportPage element = new ReportPage();
modifyTestElement(element);
return element;
}
/* (non-Javadoc)
* @see org.apache.jmeter.gui.JMeterGUIComponent#modifyTestElement(org.apache.jmeter.testelement.TestElement)
*/
public void modifyTestElement(TestElement element) {
// TODO Auto-generated method stub
}
}
1.1 jakarta-jmeter/src/reports/org/apache/jmeter/report/writers/AbstractReportWriter.java
Index: AbstractReportWriter.java
===================================================================
//$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.writers;
import org.apache.jmeter.testelement.TestElement;
/**
* @author pete
*
* TODO To change the template for this generated type comment go to
* Window - Preferences - Java - Code Style - Code Templates
*/
public abstract class AbstractReportWriter implements ReportWriter {
/**
*
*/
public AbstractReportWriter() {
super();
// TODO Auto-generated constructor stub
}
/* (non-Javadoc)
* @see org.apache.jmeter.report.writers.ReportWriter#writeReport(org.apache.jmeter.testelement.TestElement)
*/
public ReportSummary writeReport(TestElement element) {
// TODO Auto-generated method stub
return null;
}
/* (non-Javadoc)
* @see org.apache.jmeter.report.writers.ReportWriter#getTargetDirectory()
*/
public String getTargetDirectory() {
// TODO Auto-generated method stub
return null;
}
/* (non-Javadoc)
* @see org.apache.jmeter.report.writers.ReportWriter#setTargetDirectory(java.lang.String)
*/
public void setTargetDirectory(String directory) {
// TODO Auto-generated method stub
}
public static void main(String[] args) {
}
}
1.7 +1 -0 jakarta-jmeter/src/reports/org/apache/jmeter/JMeterReport.java
Index: JMeterReport.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/reports/org/apache/jmeter/JMeterReport.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- JMeterReport.java 28 Aug 2005 03:54:32 -0000 1.6
+++ JMeterReport.java 29 Aug 2005 01:27:12 -0000 1.7
@@ -1,3 +1,4 @@
+//$Header:
/*
* Copyright 2005 The Apache Software Foundation.
*
1.2 +6 -4 jakarta-jmeter/src/reports/org/apache/jmeter/gui/util/ReportMenuBar.java
Index: ReportMenuBar.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/reports/org/apache/jmeter/gui/util/ReportMenuBar.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ReportMenuBar.java 27 Aug 2005 03:40:45 -0000 1.1
+++ ReportMenuBar.java 29 Aug 2005 01:27:12 -0000 1.2
@@ -1,6 +1,6 @@
// $Header$
/*
- * Copyright 2001-2004 The Apache Software Foundation.
+ * 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.
@@ -44,8 +44,10 @@
import org.apache.log.Logger;
/**
+ * This is a version of the MenuBar for the reporting tool. I started
+ * with the existing jmeter menubar.
+ * @author Peter Lin
* @author Michael Stover
- * @author <a href="mailto:klancast@swbell.net">Keith Lancaster</a>
* @version $Revision$ updated on $Date$
*/
public class ReportMenuBar extends JMenuBar implements LocaleChangeListener {
1.2 +5 -5 jakarta-jmeter/src/reports/org/apache/jmeter/gui/util/ReportMenuFactory.java
Index: ReportMenuFactory.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/reports/org/apache/jmeter/gui/util/ReportMenuFactory.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ReportMenuFactory.java 28 Aug 2005 03:54:33 -0000 1.1
+++ ReportMenuFactory.java 29 Aug 2005 01:27:12 -0000 1.2
@@ -1,6 +1,6 @@
// $Header$
/*
- * Copyright 2001-2004 The Apache Software Foundation.
+ * 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.
@@ -37,7 +37,7 @@
import org.apache.jmeter.gui.ReportGuiPackage;
import org.apache.jmeter.gui.JMeterGUIComponent;
-import org.apache.jmeter.gui.action.ActionRouter;
+import org.apache.jmeter.report.gui.action.ReportActionRouter;
import org.apache.jmeter.junit.JMeterTestCase;
import org.apache.jmeter.testbeans.TestBean;
import org.apache.jmeter.testbeans.gui.TestBeanGUI;
@@ -257,7 +257,7 @@
public static JMenuItem makeMenuItem(String label, String name, String actionCommand) {
JMenuItem newMenuChoice = new JMenuItem(label);
newMenuChoice.setName(name);
- newMenuChoice.addActionListener(ActionRouter.getInstance());
+ newMenuChoice.addActionListener(ReportActionRouter.getInstance());
if (actionCommand != null) {
newMenuChoice.setActionCommand(actionCommand);
}
1.5 +6 -17 jakarta-jmeter/src/reports/org/apache/jmeter/control/gui/ReportGui.java
Index: ReportGui.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/reports/org/apache/jmeter/control/gui/ReportGui.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ReportGui.java 28 Aug 2005 03:54:32 -0000 1.4
+++ ReportGui.java 29 Aug 2005 01:27:12 -0000 1.5
@@ -1,5 +1,6 @@
+//$Header:
/*
- * Copyright 2001-2004 The Apache Software Foundation.
+ * 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.
@@ -33,6 +34,7 @@
import org.apache.jmeter.gui.AbstractJMeterGuiComponent;
import org.apache.jmeter.gui.util.ReportMenuFactory;
import org.apache.jmeter.gui.util.VerticalPanel;
+import org.apache.jmeter.report.gui.DefaultReportPageGui;
import org.apache.jmeter.testelement.AbstractTestElement;
import org.apache.jmeter.testelement.TestElement;
import org.apache.jmeter.testelement.ReportPlan;
@@ -63,23 +65,14 @@
}
/**
- * When a user right-clicks on the component in the test tree, or selects
- * the edit menu when the component is selected, the component will be asked
- * to return a JPopupMenu that provides all the options available to the
- * user from this component.
- * <p>
- * The TestPlan will return a popup menu allowing you to add ThreadGroups,
- * Listeners, Configuration Elements, Assertions, PreProcessors,
- * PostProcessors, and Timers.
- *
+ * Need to update this to make the context popupmenu correct
* @return a JPopupMenu appropriate for the component.
*/
public JPopupMenu createPopupMenu() {
JPopupMenu pop = new JPopupMenu();
JMenu addMenu = new JMenu(JMeterUtils.getResString("Add"));
- addMenu.add(ReportMenuFactory.makeMenuItem(new ThreadGroupGui().getStaticLabel(), ThreadGroupGui.class.getName(),
+ addMenu.add(ReportMenuFactory.makeMenuItem(new DefaultReportPageGui().getStaticLabel(), ThreadGroupGui.class.getName(),
"Add"));
- addMenu.add(ReportMenuFactory.makeMenu(ReportMenuFactory.LISTENERS, "Add"));
addMenu.add(ReportMenuFactory.makeMenu(ReportMenuFactory.CONFIG_ELEMENTS, "Add"));
pop.add(addMenu);
ReportMenuFactory.addFileMenu(pop);
@@ -175,10 +168,6 @@
VerticalPanel southPanel = new VerticalPanel();
serializedMode = new JCheckBox(JMeterUtils.getResString("testplan.serialized"));
southPanel.add(serializedMode);
- JTextArea explain = new JTextArea(JMeterUtils.getResString("functional_mode_explanation"));
- explain.setEditable(false);
- explain.setBackground(this.getBackground());
- southPanel.add(explain);
add(southPanel, BorderLayout.SOUTH);
}
1.5 +5 -8 jakarta-jmeter/src/reports/org/apache/jmeter/gui/ReportMainFrame.java
Index: ReportMainFrame.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/reports/org/apache/jmeter/gui/ReportMainFrame.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ReportMainFrame.java 28 Aug 2005 03:54:33 -0000 1.4
+++ ReportMainFrame.java 29 Aug 2005 01:27:12 -0000 1.5
@@ -139,8 +139,7 @@
* true if the menu item should be enabled, false otherwise
*/
public void setFileLoadEnabled(boolean enabled) {
- // menuBar.setFileLoadEnabled(enabled);
- menuBar.setFileLoadEnabled(true);
+ menuBar.setFileLoadEnabled(enabled);
}
/**
@@ -150,8 +149,7 @@
* true if the menu item should be enabled, false otherwise
*/
public void setFileSaveEnabled(boolean enabled) {
- // menuBar.setFileSaveEnabled(enabled);
- menuBar.setFileSaveEnabled(true);
+ menuBar.setFileSaveEnabled(enabled);
}
/**
@@ -171,8 +169,7 @@
* true if the menu item should be enabled, false otherwise
*/
public void setEditEnabled(boolean enabled) {
- // menuBar.setEditEnabled(enabled);
- menuBar.setEditEnabled(true);
+ menuBar.setEditEnabled(enabled);
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: jmeter-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-help@jakarta.apache.org