mstover1 01/04/11 05:45:12
Modified: docs running.html
docs/user_manual index.html
src/org/apache/jmeter/protocol/http/config UrlConfig.java
src/org/apache/jmeter/protocol/http/config/gui
UrlConfigGui.java
xdocs/user_manual index.xml
Log:
Fixing saving bugs, some documentation linking problems
Revision Changes Path
1.13 +0 -0 jakarta-jmeter/docs/running.html
Index: running.html
===================================================================
RCS file: /home/cvs/jakarta-jmeter/docs/running.html,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- running.html 2001/03/29 23:56:26 1.12
+++ running.html 2001/04/11 12:45:02 1.13
@@ -151,7 +151,7 @@
</blockquote>
<p align="center"><font
size="-1">Copyright (c) 1998-99 <a href="http://java.apache.org">The Java Apache
Project</a>.<br />
-$Id: running.html,v 1.12 2001/03/29 23:56:26 mstover1 Exp $</font> <br />
+$Id: running.html,v 1.13 2001/04/11 12:45:02 mstover1 Exp $</font> <br />
<font size="-1">All rights reserved.</font></p>
</blockquote>
</td></tr>
1.3 +1 -1 jakarta-jmeter/docs/user_manual/index.html
Index: index.html
===================================================================
RCS file: /home/cvs/jakarta-jmeter/docs/user_manual/index.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- index.html 2001/03/24 14:39:58 1.2
+++ index.html 2001/04/11 12:45:04 1.3
@@ -84,7 +84,7 @@
<li><a HREF="logical_controllers.html">Creating Flow Logic Controls</a></li>
<li><a HREF="visualizers.html">Using Visualizers</a></li>
<li><a HREF="timers.html">Using Timers</a></li>
- <li><a HREF="Running.html">Running the test script</a></li>
+ <li><a HREF="running.html">Running the test script</a></li>
<li><a href="saving.html">Saving test script elements</a></li>
<li><a href="rmi.html">Running JMeter over RMI</a></li>
1.8 +25 -10
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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- UrlConfig.java 2001/04/04 01:53:05 1.7
+++ UrlConfig.java 2001/04/11 12:45:07 1.8
@@ -64,14 +64,14 @@
* Apache Foundation
*
*@author Michael Stover
- *@created $Date: 2001/04/04 01:53:05 $
- *@version $Revision: 1.7 $
+ *@created $Date: 2001/04/11 12:45:07 $
+ *@version $Revision: 1.8 $
***********************************************************/
public class UrlConfig extends AbstractConfigElement
{
public final static String DOMAIN = "domain";
- public final static String PORT = "port";
+ public final static String PORT = "port";
public final static String PATH = "path";
public final static String METHOD = "method";
public final static String ARGUMENTS = "arguments";
@@ -102,17 +102,32 @@
{
setPath("/"+getPath());
}
- return new URL("http", (String)properties.get(DOMAIN),
((Integer)properties.get(PORT)).intValue(), (String)properties.get(PATH));
+ return new URL("http", (String)properties.get(DOMAIN), getPort(),
(String)properties.get(PATH));
}
- public int getPort() {
- Integer port = (Integer)properties.get(PORT);
- return (port!=null?port.intValue():80);
- }
+ public int getPort() {
+ Object port = properties.get(PORT);
+ if(port == null)
+ {
+ properties.remove(PORT);
+ return 80;
+ }
+ else if(port instanceof Integer)
+ {
+ return ((Integer)port).intValue();
+ }
+ else if(port instanceof String)
+ {
+ Integer intPort = new Integer((String)port);
+ properties.put(PORT,intPort);
+ return intPort.intValue();
+ }
+ return 80;
+ }
- public void setPort(int port) {
+ public void setPort(int port) {
properties.put(PORT, new Integer(port));
- }
+ }
public String getPath()
{
1.5 +15 -9
jakarta-jmeter/src/org/apache/jmeter/protocol/http/config/gui/UrlConfigGui.java
Index: UrlConfigGui.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/org/apache/jmeter/protocol/http/config/gui/UrlConfigGui.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- UrlConfigGui.java 2001/04/04 01:53:05 1.4
+++ UrlConfigGui.java 2001/04/11 12:45:09 1.5
@@ -74,14 +74,14 @@
public class UrlConfigGui extends JPanel implements
ModelSupported,KeyListener,ActionListener
{
private static String DOMAIN = "domain";
- private static String PORT = "port";
+ private static String PORT = "port";
//private static String METHOD = "method";
private static String PATH = "path";
private static String POST = "post";
private static String GET = "get";
private JTextField domain = new JTextField(30);
- private JTextField port = new JTextField("80", 30);
+ private JTextField port = new JTextField(30);
private JTextField path = new JTextField(30);
private JRadioButton post = new JRadioButton("POST");
private JRadioButton get = new JRadioButton("GET");
@@ -103,9 +103,9 @@
{
domain.setText((String)model.getProperty(UrlConfig.DOMAIN));
path.setText((String)model.getProperty(UrlConfig.PATH));
- Integer portI = (Integer)model.getProperty(UrlConfig.PORT);
+ Object portI = model.getProperty(UrlConfig.PORT);
if (portI!=null)
- port.setText(portI.toString());
+ port.setText(portI.toString());
if(namePanel != null)
namePanel.updateGui();
if(UrlConfig.POST.equals(model.getProperty(UrlConfig.METHOD)))
@@ -141,17 +141,17 @@
this.add(getParameterPanel());
}
- private JPanel getPortPanel() {
+ private JPanel getPortPanel() {
JPanel portP = new JPanel();
portP.add(new JLabel("Port"));
- Integer portI = (Integer)model.getProperty(UrlConfig.PORT);
+ Object portI = model.getProperty(UrlConfig.PORT);
if (portI!=null)
- port.setText(portI.toString());
+ port.setText(portI.toString());
port.setName(PORT);
port.addKeyListener(this);
portP.add(port);
return portP;
- }
+ }
private JPanel getDomainPanel()
{
@@ -241,8 +241,14 @@
model.putProperty(UrlConfig.PATH,path.getText());
}
else if (name.equals(PORT)) {
- model.putProperty
+ try
+ {
+ model.putProperty
(UrlConfig.PORT, new Integer(port.getText()));
+ }
+ catch (Exception ex)
+ {
+ }
}
}
1.5 +1 -1 jakarta-jmeter/xdocs/user_manual/index.xml
Index: index.xml
===================================================================
RCS file: /home/cvs/jakarta-jmeter/xdocs/user_manual/index.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- index.xml 2001/03/24 14:39:59 1.4
+++ index.xml 2001/04/11 12:45:11 1.5
@@ -15,7 +15,7 @@
<li><a HREF="logical_controllers.html">Creating Flow Logic Controls</a></li>
<li><a HREF="visualizers.html">Using Visualizers</a></li>
<li><a HREF="timers.html">Using Timers</a></li>
- <li><a HREF="Running.html">Running the test script</a></li>
+ <li><a HREF="running.html">Running the test script</a></li>
<li><a href="saving.html">Saving test script elements</a></li>
<li><a href="rmi.html">Running JMeter over RMI</a></li>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
