sebb        2004/07/02 19:40:41

  Modified:    src/protocol/http/org/apache/jmeter/protocol/http/config/gui
                        UrlConfigGui.java
  Log:
  Pick up constants from HTTPSamplerBase class
  
  Revision  Changes    Path
  1.19      +20 -20    
jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/config/gui/UrlConfigGui.java
  
  Index: UrlConfigGui.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/config/gui/UrlConfigGui.java,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- UrlConfigGui.java 20 May 2004 19:18:41 -0000      1.18
  +++ UrlConfigGui.java 3 Jul 2004 02:40:41 -0000       1.19
  @@ -33,7 +33,7 @@
   import org.apache.jmeter.config.Arguments;
   import org.apache.jmeter.config.ConfigTestElement;
   import org.apache.jmeter.protocol.http.gui.HTTPArgumentsPanel;
  -import org.apache.jmeter.protocol.http.sampler.HTTPSampler;
  +import org.apache.jmeter.protocol.http.sampler.HTTPSamplerBase;
   import org.apache.jmeter.protocol.http.util.HTTPArgument;
   import org.apache.jmeter.testelement.AbstractTestElement;
   import org.apache.jmeter.testelement.TestElement;
  @@ -101,18 +101,18 @@
   
           HTTPArgument.convertArgumentsToHTTP(args);
           element.setProperty(
  -            new TestElementProperty(HTTPSampler.ARGUMENTS, args));
  -        element.setProperty(HTTPSampler.DOMAIN, domain.getText());
  -        element.setProperty(HTTPSampler.PORT, port.getText());
  -        element.setProperty(HTTPSampler.PROTOCOL, protocol.getText());
  -        element.setProperty(HTTPSampler.METHOD,
  +            new TestElementProperty(HTTPSamplerBase.ARGUMENTS, args));
  +        element.setProperty(HTTPSamplerBase.DOMAIN, domain.getText());
  +        element.setProperty(HTTPSamplerBase.PORT, port.getText());
  +        element.setProperty(HTTPSamplerBase.PROTOCOL, protocol.getText());
  +        element.setProperty(HTTPSamplerBase.METHOD,
                   (post.isSelected() ? "POST" : "GET"));
  -        element.setProperty(HTTPSampler.PATH, path.getText());
  -        element.setProperty(new BooleanProperty(HTTPSampler.FOLLOW_REDIRECTS,
  +        element.setProperty(HTTPSamplerBase.PATH, path.getText());
  +        element.setProperty(new BooleanProperty(HTTPSamplerBase.FOLLOW_REDIRECTS,
                   followRedirects.isSelected()));
  -        element.setProperty(new BooleanProperty(HTTPSampler.AUTO_REDIRECTS,
  +        element.setProperty(new BooleanProperty(HTTPSamplerBase.AUTO_REDIRECTS,
                   autoRedirects.isSelected()));
  -        element.setProperty(new BooleanProperty(HTTPSampler.USE_KEEPALIVE,
  +        element.setProperty(new BooleanProperty(HTTPSamplerBase.USE_KEEPALIVE,
                   useKeepAlive.isSelected()));
           return element;
       }
  @@ -144,14 +144,14 @@
           setName(el.getPropertyAsString(TestElement.NAME));
           argsPanel.configure(
               (TestElement) el
  -                .getProperty(HTTPSampler.ARGUMENTS)
  +                .getProperty(HTTPSamplerBase.ARGUMENTS)
                   .getObjectValue());
  -        domain.setText(el.getPropertyAsString(HTTPSampler.DOMAIN));
  +        domain.setText(el.getPropertyAsString(HTTPSamplerBase.DOMAIN));
           
  -        String portString = (String) el.getPropertyAsString(HTTPSampler.PORT);
  +        String portString = (String) el.getPropertyAsString(HTTPSamplerBase.PORT);
   
           // Only display the port number if it is meaningfully specified
  -        if (portString.equals("" + HTTPSampler.UNSPECIFIED_PORT))
  +        if (portString.equals("" + HTTPSamplerBase.UNSPECIFIED_PORT))
           {
                   port.setText("");
           }
  @@ -159,8 +159,8 @@
           {
               port.setText(portString);
           }
  -        protocol.setText(el.getPropertyAsString(HTTPSampler.PROTOCOL));
  -        if ("POST".equals(el.getPropertyAsString(HTTPSampler.METHOD)))
  +        protocol.setText(el.getPropertyAsString(HTTPSamplerBase.PROTOCOL));
  +        if ("POST".equals(el.getPropertyAsString(HTTPSamplerBase.METHOD)))
           {
               post.setSelected(true);
               get.setSelected(false);
  @@ -170,17 +170,17 @@
               get.setSelected(true);
               post.setSelected(false);
           }
  -        path.setText(el.getPropertyAsString(HTTPSampler.PATH));
  +        path.setText(el.getPropertyAsString(HTTPSamplerBase.PATH));
           followRedirects.setSelected(
               ((AbstractTestElement) el).getPropertyAsBoolean(
  -                HTTPSampler.FOLLOW_REDIRECTS));
  +                HTTPSamplerBase.FOLLOW_REDIRECTS));
   
           autoRedirects.setSelected(
                   ((AbstractTestElement) el).getPropertyAsBoolean(
  -                    HTTPSampler.AUTO_REDIRECTS));
  +                    HTTPSamplerBase.AUTO_REDIRECTS));
           useKeepAlive.setSelected(
               ((AbstractTestElement) el).getPropertyAsBoolean(
  -                HTTPSampler.USE_KEEPALIVE));
  +                HTTPSamplerBase.USE_KEEPALIVE));
       }
   
       protected void init()
  
  
  

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

Reply via email to