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 se...@apache.org on 2003/11/29 01:41:30 UTC
cvs commit: jakarta-jmeter/src/core/org/apache/jmeter/testelement TestPlan.java
sebb 2003/11/28 16:41:30
Modified: src/core/org/apache/jmeter/resources messages_no.properties
messages_de.properties messages.properties
messages_ja.properties
src/core/org/apache/jmeter/control/gui TestPlanGui.java
src/core/org/apache/jmeter/testelement TestPlan.java
Log:
Add comment text area to Test Plan
Revision Changes Path
1.55 +1 -0 jakarta-jmeter/src/core/org/apache/jmeter/resources/messages_no.properties
Index: messages_no.properties
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/resources/messages_no.properties,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- messages_no.properties 20 Nov 2003 17:49:55 -0000 1.54
+++ messages_no.properties 29 Nov 2003 00:41:30 -0000 1.55
@@ -393,6 +393,7 @@
test=Test
test_configuration=Test Configuration
test_plan=Testplan
+testplan_comments=Comments:
testplan.serialized=Run each Thread Group separately (i.e. run one group before starting the next)
thread_delay_properties=Tr�dforsinkelse egenskaper
thread_group_title=Tr�dgruppe
1.59 +1 -0 jakarta-jmeter/src/core/org/apache/jmeter/resources/messages_de.properties
Index: messages_de.properties
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/resources/messages_de.properties,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- messages_de.properties 20 Nov 2003 17:49:55 -0000 1.58
+++ messages_de.properties 29 Nov 2003 00:41:30 -0000 1.59
@@ -393,6 +393,7 @@
test=Test
test_configuration=Test Configuration
test_plan=Test Plan
+testplan_comments=Comments:
testplan.serialized=Run each Thread Group separately (i.e. run one group before starting the next)
thread_delay_properties=Thread Delay Properties
thread_group_title=Thread Gruppe
1.71 +1 -0 jakarta-jmeter/src/core/org/apache/jmeter/resources/messages.properties
Index: messages.properties
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/resources/messages.properties,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- messages.properties 28 Nov 2003 13:56:51 -0000 1.70
+++ messages.properties 29 Nov 2003 00:41:30 -0000 1.71
@@ -393,6 +393,7 @@
test_configuration=Test Configuration
test_plan=Test Plan
test=Test
+testplan_comments=Comments:
testplan.serialized=Run each Thread Group separately (i.e. run one group before starting the next)
thread_delay_properties=Thread Delay Properties
thread_group_title=Thread Group
1.56 +1 -0 jakarta-jmeter/src/core/org/apache/jmeter/resources/messages_ja.properties
Index: messages_ja.properties
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/resources/messages_ja.properties,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- messages_ja.properties 20 Nov 2003 17:49:55 -0000 1.55
+++ messages_ja.properties 29 Nov 2003 00:41:30 -0000 1.56
@@ -393,6 +393,7 @@
test_configuration=\u30c6\u30b9\u30c8\u8a2d\u5b9a
test_plan=\u30c6\u30b9\u30c8\u8a08\u753b
test=\u30c6\u30b9\u30c8
+testplan_comments=Comments:
testplan.serialized=\u5404\u30b9\u30ec\u30c3\u30c9\u30b0\u30eb\u30fc\u30d7\u3092\u5225\u3005\u306b\u5b9f\u884c
thread_delay_properties=\u30b9\u30ec\u30c3\u30c9\u9045\u5ef6\u6642\u9593\u30d7\u30ed\u30d1\u30c6\u30a3
thread_group_title=\u30b9\u30ec\u30c3\u30c9\u30b0\u30eb\u30fc\u30d7
1.16 +19 -2 jakarta-jmeter/src/core/org/apache/jmeter/control/gui/TestPlanGui.java
Index: TestPlanGui.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/control/gui/TestPlanGui.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- TestPlanGui.java 25 Jun 2003 20:55:33 -0000 1.15
+++ TestPlanGui.java 29 Nov 2003 00:41:30 -0000 1.16
@@ -1,9 +1,11 @@
package org.apache.jmeter.control.gui;
import java.awt.BorderLayout;
+import java.awt.Container;
import java.util.Collection;
import javax.swing.JCheckBox;
+import javax.swing.JLabel;
import javax.swing.JMenu;
import javax.swing.JPanel;
import javax.swing.JPopupMenu;
@@ -25,10 +27,11 @@
* the test is run.
*
* @author Michael Stover
- * @version $Revision$
+ * @version $Revision$ Last Updated: $date$
*/
public class TestPlanGui extends AbstractJMeterGuiComponent
{
+
/**
* A checkbox allowing the user to specify whether or not JMeter should
* do functional testing.
@@ -40,6 +43,9 @@
/** A panel allowing the user to define variables. */
private ArgumentsPanel argsPanel;
+ /** A panel to contain comments on the test plan. */
+ private JTextArea commentPanel;
+
/**
* Create a new TestPlanGui.
*/
@@ -98,6 +104,7 @@
tp.setSerialized(serializedMode.isSelected());
tp.setUserDefinedVariables(
(Arguments) argsPanel.createTestElement());
+ tp.setProperty(TestPlan.COMMENTS,commentPanel.getText());
}
}
@@ -146,6 +153,7 @@
.getProperty(TestPlan.USER_DEFINED_VARIABLES)
.getObjectValue());
}
+ commentPanel.setText(el.getPropertyAsString(TestPlan.COMMENTS));
}
/**
@@ -162,6 +170,15 @@
return argsPanel;
}
+ private Container createCommentPanel(){
+ Container panel = makeTitlePanel();
+ commentPanel = new JTextArea();
+ JLabel label = new JLabel(JMeterUtils.getResString("testplan_comments"));
+ label.setLabelFor(commentPanel);
+ panel.add(label);
+ panel.add(commentPanel);
+ return panel;
+ }
/**
* Initialize the components and layout of this component.
*/
@@ -170,7 +187,7 @@
setLayout(new BorderLayout(10, 10));
setBorder(makeBorder());
- add(makeTitlePanel(), BorderLayout.NORTH);
+ add(createCommentPanel(), BorderLayout.NORTH);
add(createVariablePanel(), BorderLayout.CENTER);
1.10 +7 -4 jakarta-jmeter/src/core/org/apache/jmeter/testelement/TestPlan.java
Index: TestPlan.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/testelement/TestPlan.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- TestPlan.java 19 Oct 2003 22:30:05 -0000 1.9
+++ TestPlan.java 29 Nov 2003 00:41:30 -0000 1.10
@@ -28,6 +28,7 @@
"TestPlan.user_defined_variables";
public final static String SERIALIZE_THREADGROUPS =
"TestPlan.serialize_threadgroups";
+ public final static String COMMENTS = "TestPlan.comments";
private List threadGroups = new LinkedList();
private List configs = new LinkedList();
@@ -44,14 +45,16 @@
public TestPlan()
{
- this("Test Plan");
- setFunctionalMode(false);
- setSerialized(false);
+// this("Test Plan");
+// setFunctionalMode(false);
+// setSerialized(false);
}
public TestPlan(String name)
{
setName(name);
+// setFunctionalMode(false);
+// setSerialized(false);
setProperty(new CollectionProperty(THREAD_GROUPS, threadGroups));
}
---------------------------------------------------------------------
To unsubscribe, e-mail: jmeter-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-help@jakarta.apache.org