sebb        2004/09/20 16:43:39

  Modified:    src/core/org/apache/jmeter/samplers Tag: rel-2_0
                        SampleResult.java
               src/protocol/http/org/apache/jmeter/protocol/http/sampler
                        Tag: rel-2_0 HTTPSampleResult.java
  Log:
  Move get/setURL from HTTPSampleResult to SampleResult superclass
  - makes it easier to render HTML
  - other sample types may have URLs too
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.29.2.4  +13 -2     
jakarta-jmeter/src/core/org/apache/jmeter/samplers/SampleResult.java
  
  Index: SampleResult.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/samplers/SampleResult.java,v
  retrieving revision 1.29.2.3
  retrieving revision 1.29.2.4
  diff -u -r1.29.2.3 -r1.29.2.4
  --- SampleResult.java 26 Jun 2004 23:18:38 -0000      1.29.2.3
  +++ SampleResult.java 20 Sep 2004 23:43:38 -0000      1.29.2.4
  @@ -20,6 +20,7 @@
   
   import java.io.Serializable;
   import java.io.StringWriter;
  +import java.net.URL;
   import java.util.ArrayList;
   import java.util.HashSet;
   import java.util.List;
  @@ -700,4 +701,14 @@
                }
           // TODO some more invalid sequence tests needed
       }
  +
  +     private URL location;
  +
  +     public void setURL(URL location) {
  +         this.location= location;
  +     }
  +
  +     public URL getURL() {
  +         return location;
  +     }
   }
  
  
  
  No                   revision
  No                   revision
  1.10.2.1  +3 -13     
jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSampleResult.java
  
  Index: HTTPSampleResult.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSampleResult.java,v
  retrieving revision 1.10
  retrieving revision 1.10.2.1
  diff -u -r1.10 -r1.10.2.1
  --- HTTPSampleResult.java     12 Feb 2004 00:29:49 -0000      1.10
  +++ HTTPSampleResult.java     20 Sep 2004 23:43:39 -0000      1.10.2.1
  @@ -55,16 +55,6 @@
           setCookies(res.getCookies());
       }
   
  -    private URL location;
  -    
  -    public void setURL(URL location) {
  -        this.location= location;
  -    }
  -    
  -    public URL getURL() {
  -        return location;
  -    }
  -    
       private String method;
       
       public void setHTTPMethod(String method) {
  @@ -110,7 +100,7 @@
       {
           StringBuffer sb= new StringBuffer();
           sb.append(getHTTPMethod());
  -        URL u= getURL();
  +        URL u= super.getURL();
           if (u != null)
           {
               sb.append(' ');
  
  
  

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

Reply via email to