bburns      01/04/03 18:53:05

  Modified:    src/org/apache/jmeter/protocol/http/config UrlConfig.java
               src/org/apache/jmeter/protocol/http/config/gui
                        UrlConfigGui.java
  Log:
  added ability to set port in HTTP Sampling
  
  Revision  Changes    Path
  1.7       +17 -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.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- UrlConfig.java    2001/03/17 22:25:49     1.6
  +++ UrlConfig.java    2001/04/04 01:53:05     1.7
  @@ -64,13 +64,14 @@
    *  Apache Foundation
    *
    *@author     Michael Stover
  - *@created    $Date: 2001/03/17 22:25:49 $
  - *@version    $Revision: 1.6 $
  + *@created    $Date: 2001/04/04 01:53:05 $
  + *@version    $Revision: 1.7 $
    ***********************************************************/
   
   public class UrlConfig extends AbstractConfigElement
   {
        public final static String DOMAIN = "domain";
  +    public final static String PORT = "port";
        public final static String PATH = "path";
        public final static String METHOD = "method";
        public final static String ARGUMENTS = "arguments";
  @@ -101,9 +102,18 @@
                {
                        setPath("/"+getPath());
                }
  -             return new URL("http", (String)properties.get(DOMAIN), 80, 
(String)properties.get(PATH));
  +             return new URL("http", (String)properties.get(DOMAIN), 
((Integer)properties.get(PORT)).intValue(), (String)properties.get(PATH));
        }
   
  +    public int getPort() {
  +     Integer port = (Integer)properties.get(PORT);
  +     return (port!=null?port.intValue():80);
  +    }
  +
  +    public void setPort(int port) {
  +     properties.put(PORT, new Integer(port));
  +    }
  +
        public String getPath()
        {
                return (String)properties.get(PATH);
  @@ -184,3 +194,7 @@
                return isGood;
        }
   }
  +
  +
  +
  +
  
  
  
  1.4       +23 -1     
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.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- UrlConfigGui.java 2001/03/17 22:25:49     1.3
  +++ UrlConfigGui.java 2001/04/04 01:53:05     1.4
  @@ -74,12 +74,14 @@
   public class UrlConfigGui extends JPanel implements 
ModelSupported,KeyListener,ActionListener
   {
        private static String DOMAIN = "domain";
  +    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 path = new JTextField(30);
        private JRadioButton post = new JRadioButton("POST");
        private JRadioButton get = new JRadioButton("GET");
  @@ -101,6 +103,9 @@
        {
                domain.setText((String)model.getProperty(UrlConfig.DOMAIN));
                path.setText((String)model.getProperty(UrlConfig.PATH));
  +             Integer portI = (Integer)model.getProperty(UrlConfig.PORT);
  +             if (portI!=null)
  +                 port.setText(portI.toString());
                if(namePanel != null)
                                                 namePanel.updateGui();
                if(UrlConfig.POST.equals(model.getProperty(UrlConfig.METHOD)))
  @@ -130,11 +135,24 @@
                }
   
                this.add(getDomainPanel());
  +             this.add(getPortPanel());
                this.add(getPathPanel());
                this.add(getMethodPanel());
                this.add(getParameterPanel());
        }
   
  +    private JPanel getPortPanel() {
  +     JPanel portP = new JPanel();
  +     portP.add(new JLabel("Port"));
  +     Integer portI = (Integer)model.getProperty(UrlConfig.PORT);
  +     if (portI!=null)
  +         port.setText(portI.toString());
  +     port.setName(PORT);
  +     port.addKeyListener(this);
  +     portP.add(port);
  +     return portP;
  +    }
  +
        private JPanel getDomainPanel()
        {
                JPanel domainP = new JPanel();
  @@ -222,6 +240,10 @@
                {
                        model.putProperty(UrlConfig.PATH,path.getText());
                }
  +             else if (name.equals(PORT)) {
  +                 model.putProperty
  +                     (UrlConfig.PORT, new Integer(port.getText()));
  +             }
        }
   
        public void actionPerformed(ActionEvent e)
  @@ -237,4 +259,4 @@
                }
        }
   
  -}
  \ No newline at end of file
  +}
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to