Author: pmouawad
Date: Tue Oct 25 14:08:38 2011
New Revision: 1188664
URL: http://svn.apache.org/viewvc?rev=1188664&view=rev
Log:
Bug 51816 - Comment Field in User Defined Variables control.
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/config/Argument.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/config/gui/ArgumentsPanel.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties
jakarta/jmeter/trunk/xdocs/changes.xml
jakarta/jmeter/trunk/xdocs/images/screenshots/user_defined_variables.png
Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/config/Argument.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/config/Argument.java?rev=1188664&r1=1188663&r2=1188664&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/config/Argument.java
(original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/config/Argument.java Tue
Oct 25 14:08:38 2011
@@ -37,6 +37,9 @@ public class Argument extends AbstractTe
/** Name used to store the argument's value. */
public static final String VALUE = "Argument.value";
+ /** Name used to store the argument's description. */
+ public static final String DESCRIPTION = "Argument.desc";
+
/** Name used to store the argument's metadata. */
public static final String METADATA = "Argument.metadata";
@@ -76,6 +79,25 @@ public class Argument extends AbstractTe
}
/**
+ * Create a new Argument with the specified name, value, and metadata.
+ *
+ * @param name
+ * the argument name
+ * @param value
+ * the argument value
+ * @param metadata
+ * the argument metadata
+ * @param description
+ * the argument description
+ */
+ public Argument(String name, String value, String metadata, String
description) {
+ setProperty(new StringProperty(ARG_NAME, name));
+ setProperty(new StringProperty(VALUE, value));
+ setProperty(new StringProperty(METADATA, metadata));
+ setProperty(new StringProperty(DESCRIPTION, description));
+ }
+
+ /**
* Set the name of the Argument.
*
* @param newName
@@ -116,6 +138,25 @@ public class Argument extends AbstractTe
}
/**
+ * Sets the Description attribute of the Argument.
+ *
+ * @param description
+ * the new description
+ */
+ public void setDescription(String description) {
+ setProperty(new StringProperty(DESCRIPTION, description));
+ }
+
+ /**
+ * Gets the Meta Data attribute of the Argument.
+ *
+ * @return the MetaData value
+ */
+ public String getDescription() {
+ return getPropertyAsString(DESCRIPTION);
+ }
+
+ /**
* Sets the Meta Data attribute of the Argument.
*
* @param newMetaData
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/config/gui/ArgumentsPanel.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/config/gui/ArgumentsPanel.java?rev=1188664&r1=1188663&r2=1188664&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/core/org/apache/jmeter/config/gui/ArgumentsPanel.java
(original)
+++
jakarta/jmeter/trunk/src/core/org/apache/jmeter/config/gui/ArgumentsPanel.java
Tue Oct 25 14:08:38 2011
@@ -105,6 +105,8 @@ public class ArgumentsPanel extends Abst
public static final String COLUMN_RESOURCE_NAMES_1 = "value"; //
$NON-NLS-1$
+ public static final String COLUMN_RESOURCE_NAMES_2 = "description"; //
$NON-NLS-1$
+
/**
* Create a new ArgumentsPanel as a standalone component.
*/
@@ -432,6 +434,19 @@ public class ArgumentsPanel extends Abst
* Initialize the table model used for the arguments table.
*/
protected void initializeTableModel() {
+ if(standalone) {
+ tableModel = new ObjectTableModel(new String[] {
COLUMN_RESOURCE_NAMES_0, COLUMN_RESOURCE_NAMES_1, COLUMN_RESOURCE_NAMES_2 },
+ Argument.class,
+ new Functor[] {
+ new Functor("getName"), // $NON-NLS-1$
+ new Functor("getValue"), // $NON-NLS-1$
+ new Functor("getDescription") }, // $NON-NLS-1$
+ new Functor[] {
+ new Functor("setName"), // $NON-NLS-1$
+ new Functor("setValue"), // $NON-NLS-1$
+ new Functor("setDescription") }, // $NON-NLS-1$
+ new Class[] { String.class, String.class, String.class });
+ } else {
tableModel = new ObjectTableModel(new String[] {
COLUMN_RESOURCE_NAMES_0, COLUMN_RESOURCE_NAMES_1 },
Argument.class,
new Functor[] {
@@ -441,6 +456,7 @@ public class ArgumentsPanel extends Abst
new Functor("setName"), // $NON-NLS-1$
new Functor("setValue") }, // $NON-NLS-1$
new Class[] { String.class, String.class });
+ }
}
public static boolean testFunctors(){
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties?rev=1188664&r1=1188663&r2=1188664&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties
(original)
+++
jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties
Tue Oct 25 14:08:38 2011
@@ -187,6 +187,7 @@ delete_test=Delete Test
delete_user=Delete User
deltest=Deletion test
deref=Dereference aliases
+description=Description
disable=Disable
distribution_graph_title=Distribution Graph (alpha)
distribution_note1=The graph will update every 10 samples
Modified: jakarta/jmeter/trunk/xdocs/changes.xml
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/xdocs/changes.xml?rev=1188664&r1=1188663&r2=1188664&view=diff
==============================================================================
--- jakarta/jmeter/trunk/xdocs/changes.xml (original)
+++ jakarta/jmeter/trunk/xdocs/changes.xml Tue Oct 25 14:08:38 2011
@@ -58,6 +58,8 @@ For example a Test Action sampler with 0
or a Debug Sampler with all fields set to False (to reduce the sample size).
</p>
+<p>Start next Loop option in Thread Group is broken, see Bugs (51868, 51866,
51865).</p>
+
<p>
The menu item Options / Choose Language does not change all the displayed text
to the new language.
[The behaviour has improved, but language change is still not fully working]
@@ -179,6 +181,7 @@ Mirror server now uses default port 8081
<li>Bug 52037 - Remember user-set LaF over restarts.</li>
<li>Bug 51861 - Improve HTTP Request GUI to better show parameters without
name (GWT RPC requests for example) (UNDER DEVELOPMENT)</li>
<li>Bug 52040 - Add a toolbar in JMeter main window</li>
+<li>Bug 51816 - Comment Field in User Defined Variables control.</li>
</ul>
<h2>Non-functional changes</h2>
Modified:
jakarta/jmeter/trunk/xdocs/images/screenshots/user_defined_variables.png
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/xdocs/images/screenshots/user_defined_variables.png?rev=1188664&r1=1188663&r2=1188664&view=diff
==============================================================================
Binary files - no diff available.
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
