mstover1 01/08/20 16:06:13
Modified: src/org/apache/jmeter/gui MenuFactory.java
src/org/apache/jmeter/protocol/http/config
MultipartUrlConfig.java UrlConfig.java
UrlConfigFull.java
src/org/apache/jmeter/protocol/http/proxy Proxy.java
Log:
Added log statement
Revision Changes Path
1.12 +15 -3 jakarta-jmeter/src/org/apache/jmeter/gui/MenuFactory.java
Index: MenuFactory.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/org/apache/jmeter/gui/MenuFactory.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- MenuFactory.java 2001/08/16 23:36:56 1.11
+++ MenuFactory.java 2001/08/20 23:06:13 1.12
@@ -57,6 +57,8 @@
import javax.swing.*;
import java.util.*;
+import org.apache.log4j.*;
+
import org.apache.jmeter.util.*;
import org.apache.jmeter.gui.JMeterComponentModel;
import org.apache.jmeter.gui.action.ActionRouter;
@@ -65,12 +67,15 @@
* Title: JMeter Description: Copyright: Copyright (c) 2000 Company: Apache
*
*@author Michael Stover
- *@created $Date: 2001/08/16 23:36:56 $
+ *@created $Date: 2001/08/20 23:06:13 $
*@version 1.0
***********************************************************/
public class MenuFactory
{
+ public static Category catClass =
+ Category.getInstance(MenuFactory.class.getName());
+
private static JMenu timerMenu;
private static JMenu controllerMenu;
private static JMenu generativeControllerMenu;
@@ -252,11 +257,18 @@
while (iter.hasNext())
{
String item = (String)iter.next();
- if((skip == null || !skip.contains(item)) &&
!elementsToSkip.contains(item))
+ String label = getClassLabel(item);
+ if((skip == null || !skip.contains(item)) &&
!elementsToSkip.contains(item) &&
+
!elementsToSkip.contains(label))
{
- JMenuItem mItem = new
JMenuItem(getClassLabel(item));
+ JMenuItem mItem = new JMenuItem(label);
mItem.addActionListener(ActionRouter.getInstance());
menu.add(mItem);
+ elementsToSkip.add(label);
+ }
+ else
+ {
+ catClass.debug("Not adding "+item+" to menus");
}
}
1.4 +2 -1
jakarta-jmeter/src/org/apache/jmeter/protocol/http/config/MultipartUrlConfig.java
Index: MultipartUrlConfig.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/org/apache/jmeter/protocol/http/config/MultipartUrlConfig.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- MultipartUrlConfig.java 2001/07/26 00:34:47 1.3
+++ MultipartUrlConfig.java 2001/08/20 23:06:13 1.4
@@ -45,10 +45,11 @@
return (String)this.getProperty(BOUNDARY);
}
+ /*
public String getClassLabel()
{
return "Multipart-Form Sample";
- }
+ }*/
/**
* !ToDo (Method description)
1.19 +3 -3
jakarta-jmeter/src/org/apache/jmeter/protocol/http/config/UrlConfig.java
Index: UrlConfig.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/org/apache/jmeter/protocol/http/config/UrlConfig.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- UrlConfig.java 2001/08/02 11:29:15 1.18
+++ UrlConfig.java 2001/08/20 23:06:13 1.19
@@ -65,8 +65,8 @@
* Apache Foundation
*
*@author Michael Stover
- *@created $Date: 2001/08/02 11:29:15 $
- *@version $Revision: 1.18 $
+ *@created $Date: 2001/08/20 23:06:13 $
+ *@version $Revision: 1.19 $
*/
public class UrlConfig extends AbstractConfigElement
@@ -429,7 +429,7 @@
{
String name = args[i].substring(0,index);
String value = args[i].substring(index + 1);
- addArgument(name, value);
+ addArgument(name, URLDecoder.decode(value));
}
}
}
1.2 +5 -5
jakarta-jmeter/src/org/apache/jmeter/protocol/http/config/UrlConfigFull.java
Index: UrlConfigFull.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/org/apache/jmeter/protocol/http/config/UrlConfigFull.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- UrlConfigFull.java 2001/07/23 19:17:39 1.1
+++ UrlConfigFull.java 2001/08/20 23:06:13 1.2
@@ -70,8 +70,8 @@
* Apache Foundation
*
*@author Michael Stover
- *@created $Date: 2001/07/23 19:17:39 $
- *@version $Revision: 1.1 $
+ *@created $Date: 2001/08/20 23:06:13 $
+ *@version $Revision: 1.2 $
*/
public class UrlConfigFull extends UrlConfig
@@ -91,11 +91,11 @@
* Return label
*
* @return label
- */
+
public String getClassLabel()
{
return "UrlFull Sample";
- }
+ }*/
/**
* Clone the instance
@@ -173,7 +173,7 @@
public void testGetClassLabel()
{
catClass.debug("Start : testGetClassLabel1");
- assertEquals("UrlFull Sample", urlConfigFull.getClassLabel());
+ assertEquals("Url Sample", urlConfigFull.getClassLabel());
catClass.debug("End : testGetClassLabel1");
}
1.4 +1 -8
jakarta-jmeter/src/org/apache/jmeter/protocol/http/proxy/Proxy.java
Index: Proxy.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/org/apache/jmeter/protocol/http/proxy/Proxy.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Proxy.java 2001/07/26 00:34:48 1.3
+++ Proxy.java 2001/08/20 23:06:13 1.4
@@ -163,14 +163,7 @@
SrvrSocket.getOutputStream().write(readValue);
}
SrvrSocket.getOutputStream().flush();
- try
- {
-
urlConfig.parseArguments(URLDecoder.decode(buff.toString()));
- }
- catch(IllegalArgumentException e)
- {
- urlConfig.parseArguments(buff.toString());
- }
+ urlConfig.parseArguments(buff.toString());
target.deliverUrlConfig(urlConfig);
// Third, check reply headers (we must read first
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
