Author: sebb
Date: Fri Sep 19 13:30:22 2008
New Revision: 697226

URL: http://svn.apache.org/viewvc?rev=697226&view=rev
Log:
No need for clone() method in functions

Modified:
    
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/BeanShell.java
    jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/CSVRead.java
    
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/CharFunction.java
    
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/EscapeHtml.java
    
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/EvalFunction.java
    
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/EvalVarFunction.java
    
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/JavaScript.java
    
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/LogFunction.java
    
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/LogFunction2.java
    jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/LongSum.java
    
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/MachineName.java
    jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/Property.java
    
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/Property2.java
    jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/Random.java
    
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/SetProperty.java
    
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/SplitFunction.java
    
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/StringFromFile.java
    
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/TimeFunction.java
    jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/UnEscape.java
    
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/UnEscapeHtml.java
    jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/Variable.java
    jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/XPath.java

Modified: 
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/BeanShell.java
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/BeanShell.java?rev=697226&r1=697225&r2=697226&view=diff
==============================================================================
--- 
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/BeanShell.java 
(original)
+++ 
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/BeanShell.java 
Fri Sep 19 13:30:22 2008
@@ -62,10 +62,6 @@
     public BeanShell() {
     }
 
-    public Object clone() throws CloneNotSupportedException {
-        return super.clone();
-    }
-
     /*
      * (non-Javadoc)
      *

Modified: 
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/CSVRead.java
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/CSVRead.java?rev=697226&r1=697225&r2=697226&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/CSVRead.java 
(original)
+++ jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/CSVRead.java 
Fri Sep 19 13:30:22 2008
@@ -70,10 +70,6 @@
     public CSVRead() {
     }
 
-    public Object clone() throws CloneNotSupportedException {
-        return super.clone();
-    }
-
     /**
      * @see org.apache.jmeter.functions.Function#execute(SampleResult, Sampler)
      */

Modified: 
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/CharFunction.java
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/CharFunction.java?rev=697226&r1=697225&r2=697226&view=diff
==============================================================================
--- 
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/CharFunction.java
 (original)
+++ 
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/CharFunction.java
 Fri Sep 19 13:30:22 2008
@@ -51,10 +51,6 @@
     public CharFunction() {
     }
 
-    public Object clone() throws CloneNotSupportedException {
-        return super.clone();
-    }
-
     public synchronized String execute(SampleResult previousResult, Sampler 
currentSampler)
             throws InvalidVariableException {
 

Modified: 
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/EscapeHtml.java
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/EscapeHtml.java?rev=697226&r1=697225&r2=697226&view=diff
==============================================================================
--- 
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/EscapeHtml.java 
(original)
+++ 
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/EscapeHtml.java 
Fri Sep 19 13:30:22 2008
@@ -62,10 +62,6 @@
     public EscapeHtml() {
     }
 
-    public Object clone() throws CloneNotSupportedException {
-        return super.clone();
-    }
-
     public synchronized String execute(SampleResult previousResult, Sampler 
currentSampler)
             throws InvalidVariableException {
 

Modified: 
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/EvalFunction.java
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/EvalFunction.java?rev=697226&r1=697225&r2=697226&view=diff
==============================================================================
--- 
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/EvalFunction.java
 (original)
+++ 
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/EvalFunction.java
 Fri Sep 19 13:30:22 2008
@@ -59,10 +59,6 @@
     public EvalFunction() {
     }
 
-    public Object clone() throws CloneNotSupportedException {
-        return super.clone();
-    }
-
     public synchronized String execute(SampleResult previousResult, Sampler 
currentSampler)
             throws InvalidVariableException {
         String parameter = ((CompoundVariable) values[0]).execute();

Modified: 
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/EvalVarFunction.java
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/EvalVarFunction.java?rev=697226&r1=697225&r2=697226&view=diff
==============================================================================
--- 
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/EvalVarFunction.java
 (original)
+++ 
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/EvalVarFunction.java
 Fri Sep 19 13:30:22 2008
@@ -64,10 +64,6 @@
     public EvalVarFunction() {
     }
 
-    public Object clone() throws CloneNotSupportedException {
-        return super.clone();
-    }
-
     public synchronized String execute(SampleResult previousResult, Sampler 
currentSampler)
             throws InvalidVariableException {
         String variableName = ((CompoundVariable) values[0]).execute();

Modified: 
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/JavaScript.java
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/JavaScript.java?rev=697226&r1=697225&r2=697226&view=diff
==============================================================================
--- 
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/JavaScript.java 
(original)
+++ 
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/JavaScript.java 
Fri Sep 19 13:30:22 2008
@@ -58,10 +58,6 @@
     public JavaScript() {
     }
 
-    public Object clone() throws CloneNotSupportedException {
-        return super.clone();
-    }
-
     /*
      * (non-Javadoc)
      *

Modified: 
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/LogFunction.java
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/LogFunction.java?rev=697226&r1=697225&r2=697226&view=diff
==============================================================================
--- 
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/LogFunction.java 
(original)
+++ 
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/LogFunction.java 
Fri Sep 19 13:30:22 2008
@@ -77,10 +77,6 @@
     public LogFunction() {
     }
 
-    public Object clone() throws CloneNotSupportedException {
-        return super.clone();
-    }
-
     public synchronized String execute(SampleResult previousResult, Sampler 
currentSampler)
             throws InvalidVariableException {
         String stringToLog = ((CompoundVariable) values[0]).execute();

Modified: 
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/LogFunction2.java
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/LogFunction2.java?rev=697226&r1=697225&r2=697226&view=diff
==============================================================================
--- 
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/LogFunction2.java
 (original)
+++ 
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/LogFunction2.java
 Fri Sep 19 13:30:22 2008
@@ -72,10 +72,6 @@
     public LogFunction2() {
     }
 
-    public Object clone() throws CloneNotSupportedException {
-        return super.clone();
-    }
-
     public synchronized String execute(SampleResult previousResult, Sampler 
currentSampler)
             throws InvalidVariableException {
         String stringToLog = ((CompoundVariable) values[0]).execute();

Modified: 
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/LongSum.java
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/LongSum.java?rev=697226&r1=697225&r2=697226&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/LongSum.java 
(original)
+++ jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/LongSum.java 
Fri Sep 19 13:30:22 2008
@@ -56,16 +56,6 @@
     }
 
     /**
-     * Clone this Add object.
-     *
-     * @return A new Add object.
-     * @throws CloneNotSupportedException
-     */
-    public Object clone() throws CloneNotSupportedException {
-        return super.clone();
-    }
-
-    /**
      * Execute the function.
      *
      * @see Function#execute(SampleResult, Sampler)

Modified: 
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/MachineName.java
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/MachineName.java?rev=697226&r1=697225&r2=697226&view=diff
==============================================================================
--- 
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/MachineName.java 
(original)
+++ 
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/MachineName.java 
Fri Sep 19 13:30:22 2008
@@ -45,10 +45,6 @@
     public MachineName() {
     }
 
-    public Object clone() throws CloneNotSupportedException {
-        return super.clone();
-    }
-
     public synchronized String execute(SampleResult previousResult, Sampler 
currentSampler)
             throws InvalidVariableException {
 

Modified: 
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/Property.java
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/Property.java?rev=697226&r1=697225&r2=697226&view=diff
==============================================================================
--- 
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/Property.java 
(original)
+++ 
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/Property.java 
Fri Sep 19 13:30:22 2008
@@ -66,10 +66,6 @@
     public Property() {
     }
 
-    public Object clone() throws CloneNotSupportedException {
-        return super.clone();
-    }
-
     public synchronized String execute(SampleResult previousResult, Sampler 
currentSampler)
             throws InvalidVariableException {
         String propertyName = ((CompoundVariable) values[0]).execute();

Modified: 
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/Property2.java
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/Property2.java?rev=697226&r1=697225&r2=697226&view=diff
==============================================================================
--- 
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/Property2.java 
(original)
+++ 
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/Property2.java 
Fri Sep 19 13:30:22 2008
@@ -70,10 +70,6 @@
     public Property2() {
     }
 
-    public Object clone() throws CloneNotSupportedException {
-        return super.clone();
-    }
-
     public synchronized String execute(SampleResult previousResult, Sampler 
currentSampler)
             throws InvalidVariableException {
         String propertyName = ((CompoundVariable) values[0]).execute();

Modified: 
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/Random.java
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/Random.java?rev=697226&r1=697225&r2=697226&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/Random.java 
(original)
+++ jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/Random.java 
Fri Sep 19 13:30:22 2008
@@ -56,10 +56,6 @@
     public Random() {
     }
 
-    public Object clone() throws CloneNotSupportedException {
-        return super.clone();
-    }
-
     /**
      * Execute the function.
      *

Modified: 
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/SetProperty.java
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/SetProperty.java?rev=697226&r1=697225&r2=697226&view=diff
==============================================================================
--- 
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/SetProperty.java 
(original)
+++ 
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/SetProperty.java 
Fri Sep 19 13:30:22 2008
@@ -64,10 +64,6 @@
     public SetProperty() {
     }
 
-    public Object clone() throws CloneNotSupportedException {
-        return super.clone();
-    }
-
     public synchronized String execute(SampleResult previousResult, Sampler 
currentSampler)
             throws InvalidVariableException {
         String propertyName = ((CompoundVariable) values[0]).execute();

Modified: 
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/SplitFunction.java
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/SplitFunction.java?rev=697226&r1=697225&r2=697226&view=diff
==============================================================================
--- 
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/SplitFunction.java
 (original)
+++ 
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/SplitFunction.java
 Fri Sep 19 13:30:22 2008
@@ -79,10 +79,6 @@
     public SplitFunction() {
     }
 
-    public Object clone() throws CloneNotSupportedException {
-        return super.clone();
-    }
-
     public synchronized String execute(SampleResult previousResult, Sampler 
currentSampler)
             throws InvalidVariableException {
         JMeterVariables vars = getVariables();

Modified: 
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/StringFromFile.java
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/StringFromFile.java?rev=697226&r1=697225&r2=697226&view=diff
==============================================================================
--- 
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/StringFromFile.java
 (original)
+++ 
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/StringFromFile.java
 Fri Sep 19 13:30:22 2008
@@ -122,15 +122,6 @@
         return this;
     }
 
-    public Object clone() throws CloneNotSupportedException {
-        StringFromFile newReader = (StringFromFile) super.clone();
-        if (log.isDebugEnabled()) { // Skip expensive parameter creation ..
-            log.debug(this + "::StringFromFile.clone()", new 
Throwable("debug"));//$NON-NLS-1$
-        }
-
-        return newReader;
-    }
-
     /*
      * Warning: the file will generally be left open at the end of a test run.
      * This is because functions don't (yet) have any way to find out when a

Modified: 
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/TimeFunction.java
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/TimeFunction.java?rev=697226&r1=697225&r2=697226&view=diff
==============================================================================
--- 
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/TimeFunction.java
 (original)
+++ 
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/TimeFunction.java
 Fri Sep 19 13:30:22 2008
@@ -80,10 +80,6 @@
         super();
     }
 
-    public Object clone() throws CloneNotSupportedException {
-        return super.clone();
-    }
-
     /*
      * (non-Javadoc)
      *

Modified: 
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/UnEscape.java
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/UnEscape.java?rev=697226&r1=697225&r2=697226&view=diff
==============================================================================
--- 
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/UnEscape.java 
(original)
+++ 
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/UnEscape.java 
Fri Sep 19 13:30:22 2008
@@ -51,10 +51,6 @@
     public UnEscape() {
     }
 
-    public Object clone() throws CloneNotSupportedException {
-        return super.clone();
-    }
-
     public synchronized String execute(SampleResult previousResult, Sampler 
currentSampler)
             throws InvalidVariableException {
 

Modified: 
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/UnEscapeHtml.java
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/UnEscapeHtml.java?rev=697226&r1=697225&r2=697226&view=diff
==============================================================================
--- 
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/UnEscapeHtml.java
 (original)
+++ 
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/UnEscapeHtml.java
 Fri Sep 19 13:30:22 2008
@@ -53,10 +53,6 @@
     public UnEscapeHtml() {
     }
 
-    public Object clone() throws CloneNotSupportedException {
-        return super.clone();
-    }
-
     public synchronized String execute(SampleResult previousResult, Sampler 
currentSampler)
             throws InvalidVariableException {
 

Modified: 
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/Variable.java
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/Variable.java?rev=697226&r1=697225&r2=697226&view=diff
==============================================================================
--- 
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/Variable.java 
(original)
+++ 
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/Variable.java 
Fri Sep 19 13:30:22 2008
@@ -60,10 +60,6 @@
     public Variable() {
     }
 
-    public Object clone() throws CloneNotSupportedException {
-        return super.clone();
-    }
-
     public synchronized String execute(SampleResult previousResult, Sampler 
currentSampler)
             throws InvalidVariableException {
         String variableName = ((CompoundVariable) values[0]).execute();

Modified: 
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/XPath.java
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/XPath.java?rev=697226&r1=697225&r2=697226&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/XPath.java 
(original)
+++ jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/XPath.java 
Fri Sep 19 13:30:22 2008
@@ -68,10 +68,6 @@
     public XPath() {
     }
 
-    public Object clone() throws CloneNotSupportedException {
-        return super.clone();
-    }
-
     /**
      * @see org.apache.jmeter.functions.Function#execute(SampleResult, Sampler)
      */



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

Reply via email to