mstover1 2003/04/01 08:49:55
Modified: src/components/org/apache/jmeter/assertions/gui
AssertionGui.java
src/protocol/http/org/apache/jmeter/protocol/http/control
CookieManager.java
src/protocol/http/org/apache/jmeter/protocol/http/gui
CookiePanel.java
Log:
Fixing GUI problems with assertion and cookie manager guis (Elan Chezhiyan)
Revision Changes Path
1.7 +18 -10
jakarta-jmeter/src/components/org/apache/jmeter/assertions/gui/AssertionGui.java
Index: AssertionGui.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/components/org/apache/jmeter/assertions/gui/AssertionGui.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- AssertionGui.java 31 Mar 2003 14:51:37 -0000 1.6
+++ AssertionGui.java 1 Apr 2003 16:49:54 -0000 1.7
@@ -211,6 +211,14 @@
{
tableModel.addRow(new Object[] { tests.next()});
}
+ if(model.getTestStrings().size() == 0)
+ {
+ deletePattern.setEnabled(false);
+ }
+ else
+ {
+ deletePattern.setEnabled(true);
+ }
tableModel.fireTableDataChanged();
}
1.6 +7 -1
jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/control/CookieManager.java
Index: CookieManager.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/control/CookieManager.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- CookieManager.java 20 Sep 2002 19:44:40 -0000 1.5
+++ CookieManager.java 1 Apr 2003 16:49:54 -0000 1.6
@@ -198,6 +198,12 @@
public void add() {
getCookies().add(new Cookie());
}
+ /***Remove all the cookie*/
+ public void clear() {
+ super.clear();
+ setProperty(COOKIES,new ArrayList());
+ }
+
/** remove a cookie */
public void remove(int index) {
1.7 +4 -2
jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/gui/CookiePanel.java
Index: CookiePanel.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/gui/CookiePanel.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- CookiePanel.java 28 Feb 2003 14:21:50 -0000 1.6
+++ CookiePanel.java 1 Apr 2003 16:49:55 -0000 1.7
@@ -277,6 +277,7 @@
*/
public void modifyTestElement(TestElement cm)
{
+ cm.clear();
configureTestElement(cm);
if(cm instanceof CookieManager)
{
@@ -299,6 +300,7 @@
private void populateTable(CookieManager manager)
{
+ tableModel.clearData();
Iterator iter = manager.getCookies().iterator();
while(iter.hasNext())
{
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
