Author: agomes
Date: Tue Oct 10 18:28:45 2017
New Revision: 1811755

URL: http://svn.apache.org/viewvc?rev=1811755&view=rev
Log:
Reverse Bug 61602, Bug 61595, Bug 61593

Added:
    
jmeter/trunk/src/components/org/apache/jmeter/modifiers/gui/CounterConfigGui.java
      - copied unchanged from r1811618, 
jmeter/trunk/src/components/org/apache/jmeter/modifiers/gui/CounterConfigGui.java
Removed:
    
jmeter/trunk/src/components/org/apache/jmeter/modifiers/CounterConfigBeanInfo.java
    
jmeter/trunk/src/components/org/apache/jmeter/modifiers/CounterConfigResources.properties
    
jmeter/trunk/src/components/org/apache/jmeter/modifiers/CounterConfigResources_es.properties
    
jmeter/trunk/src/components/org/apache/jmeter/modifiers/CounterConfigResources_fr.properties
    
jmeter/trunk/src/components/org/apache/jmeter/modifiers/CounterConfigResources_pt_BR.properties
Modified:
    jmeter/trunk/src/components/org/apache/jmeter/modifiers/CounterConfig.java
    
jmeter/trunk/src/components/org/apache/jmeter/visualizers/backend/BackendListenerGui.java
    jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties
    jmeter/trunk/src/core/org/apache/jmeter/resources/messages_es.properties
    jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties
    jmeter/trunk/src/core/org/apache/jmeter/resources/messages_pt_BR.properties
    
jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/config/gui/JavaConfigGui.java
    jmeter/trunk/test/src/org/apache/jmeter/control/TestIfController.java
    jmeter/trunk/xdocs/changes.xml
    jmeter/trunk/xdocs/images/screenshots/backend_listener.png
    jmeter/trunk/xdocs/images/screenshots/counter.png
    jmeter/trunk/xdocs/images/screenshots/java_defaults.png
    jmeter/trunk/xdocs/images/screenshots/java_request.png

Modified: 
jmeter/trunk/src/components/org/apache/jmeter/modifiers/CounterConfig.java
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/modifiers/CounterConfig.java?rev=1811755&r1=1811754&r2=1811755&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/modifiers/CounterConfig.java 
(original)
+++ jmeter/trunk/src/components/org/apache/jmeter/modifiers/CounterConfig.java 
Tue Oct 10 18:28:45 2017
@@ -21,12 +21,12 @@ package org.apache.jmeter.modifiers;
 import java.io.Serializable;
 import java.text.DecimalFormat;
 
-import org.apache.commons.lang3.math.NumberUtils;
-import org.apache.jmeter.config.ConfigTestElement;
 import org.apache.jmeter.engine.event.LoopIterationEvent;
 import org.apache.jmeter.engine.event.LoopIterationListener;
 import org.apache.jmeter.engine.util.NoThreadClone;
-import org.apache.jmeter.testbeans.TestBean;
+import org.apache.jmeter.testelement.AbstractTestElement;
+import org.apache.jmeter.testelement.property.BooleanProperty;
+import org.apache.jmeter.testelement.property.LongProperty;
 import org.apache.jmeter.threads.JMeterContextService;
 import org.apache.jmeter.threads.JMeterVariables;
 import org.slf4j.Logger;
@@ -35,24 +35,26 @@ import org.slf4j.LoggerFactory;
 /**
  * Provides a counter per-thread(user) or per-thread group.
  */
-public class CounterConfig extends ConfigTestElement
-    implements TestBean, Serializable, LoopIterationListener, NoThreadClone {
+public class CounterConfig extends AbstractTestElement
+    implements Serializable, LoopIterationListener, NoThreadClone {
 
     private static final long serialVersionUID = 234L;
-    
-    private String startValue;
 
-    private String maxValue;
+    private static final String START = "CounterConfig.start"; // $NON-NLS-1$
 
-    private String varName;
+    private static final String END = "CounterConfig.end"; // $NON-NLS-1$
 
-    private String format;
+    private static final String INCREMENT = "CounterConfig.incr"; // 
$NON-NLS-1$
 
-    private String increment;
+    private static final String FORMAT = "CounterConfig.format"; // $NON-NLS-1$
 
-    private boolean perUser;
+    private static final String PER_USER = "CounterConfig.per_user"; // 
$NON-NLS-1$
 
-    private boolean resetPerTGIteration;
+    private static final String VAR_NAME = "CounterConfig.name"; // $NON-NLS-1$
+
+    private static final String RESET_ON_THREAD_GROUP_ITERATION = 
"CounterConfig.reset_on_tg_iteration"; // $NON-NLS-1$
+
+    private static final boolean RESET_ON_THREAD_GROUP_ITERATION_DEFAULT = 
false;
 
     // This class is not cloned per thread, so this is shared
     //@GuardedBy("this")
@@ -67,14 +69,10 @@ public class CounterConfig extends Confi
     private static final Logger log = 
LoggerFactory.getLogger(CounterConfig.class);
 
     private void init() { // WARNING: called from ctor so must not be 
overridden (i.e. must be private or final)
-        if (NumberUtils.toLong(getStartValue()) > 
NumberUtils.toLong(getMaxValue())){
-            log.error("maximum({}) must be > minimum({})", getMaxValue(), 
getStartValue());
-            return;
-        }
         perTheadNumber = new ThreadLocal<Long>() {
             @Override
             protected Long initialValue() {
-                return Long.valueOf(getStartValue());
+                return Long.valueOf(getStart());
             }
         };
         perTheadLastIterationNumber = new ThreadLocal<Long>() {
@@ -102,9 +100,9 @@ public class CounterConfig extends Confi
     public void iterationStart(LoopIterationEvent event) {
         // Cannot use getThreadContext() as not cloned per thread
         JMeterVariables variables = 
JMeterContextService.getContext().getVariables();
-        long start = Long.valueOf(getStartValue());
-        long end = Long.valueOf(getMaxValue());
-        long increment = Long.valueOf(getIncrement());
+        long start = getStart();
+        long end = getEnd();
+        long increment = getIncrement();
         if (!isPerUser()) {
             synchronized (this) {
                 if (globalCounter == Long.MIN_VALUE || globalCounter > end) {
@@ -115,12 +113,12 @@ public class CounterConfig extends Confi
             }
         } else {
             long current = perTheadNumber.get().longValue();
-            if(isResetPerTGIteration()) {
+            if(isResetOnThreadGroupIteration()) {
                 int iteration = variables.getIteration();
                 Long lastIterationNumber = perTheadLastIterationNumber.get();
                 if(iteration != lastIterationNumber.longValue()) {
                     // reset
-                    current = Long.valueOf(getStartValue());
+                    current = getStart();
                 }
                 perTheadLastIterationNumber.set(Long.valueOf(iteration));
             }
@@ -147,75 +145,97 @@ public class CounterConfig extends Confi
         return Long.toString(value);
     }
 
-
-
-    public String getStartValue() {
-        return startValue;
+    public void setStart(long start) {
+        setProperty(new LongProperty(START, start));
     }
 
-
-    public void setStartValue(String startValue) {
-        this.startValue = startValue;
+    public void setStart(String start) {
+        setProperty(START, start);
     }
 
-
-    public String getMaxValue() {
-        if ("".equals(maxValue)) {
-            maxValue = String.valueOf(Long.MAX_VALUE);
-        }
-        return maxValue;
+    public long getStart() {
+        return getPropertyAsLong(START);
     }
 
-
-    public void setMaxValue(String maxValue) {
-        this.maxValue = maxValue;
+    public String getStartAsString() {
+        return getPropertyAsString(START);
     }
 
-
-    public boolean isResetPerTGIteration() {
-        return resetPerTGIteration;
+    public void setEnd(long end) {
+        setProperty(new LongProperty(END, end));
     }
 
-
-    public void setResetPerTGIteration(boolean resetPerTGIteration) {
-        this.resetPerTGIteration = resetPerTGIteration;
+    public void setEnd(String end) {
+        setProperty(END, end);
     }
 
-    public boolean isPerUser() {
-        return perUser;
+    /**
+     * @param value boolean indicating if counter must be reset on Thread 
Group Iteration
+     */
+    public void setResetOnThreadGroupIteration(boolean value) {
+        setProperty(RESET_ON_THREAD_GROUP_ITERATION, value, 
RESET_ON_THREAD_GROUP_ITERATION_DEFAULT);
     }
 
-    public void setPerUser(boolean perUser) {
-        this.perUser = perUser;
+    /**
+     * @return true if counter must be reset on Thread Group Iteration
+     */
+    public boolean isResetOnThreadGroupIteration() {
+        return getPropertyAsBoolean(RESET_ON_THREAD_GROUP_ITERATION, 
RESET_ON_THREAD_GROUP_ITERATION_DEFAULT);
     }
 
+    /**
+     *
+     * @return counter upper limit (default Long.MAX_VALUE)
+     */
+    public long getEnd() {
+       long propertyAsLong = getPropertyAsLong(END);
+       if (propertyAsLong == 0 && 
"".equals(getProperty(END).getStringValue())) {
+          propertyAsLong = Long.MAX_VALUE;
+       }
+       return propertyAsLong;
+    }
 
-    public String getVarName() {
-        return varName;
+    public String getEndAsString(){
+        return getPropertyAsString(END);
     }
 
+    public void setIncrement(long inc) {
+        setProperty(new LongProperty(INCREMENT, inc));
+    }
 
-    public void setVarName(String varName) {
-        this.varName = varName;
+    public void setIncrement(String incr) {
+        setProperty(INCREMENT, incr);
     }
 
+    public long getIncrement() {
+        return getPropertyAsLong(INCREMENT);
+    }
 
-    public String getFormat() {
-        return format;
+    public String getIncrementAsString() {
+        return getPropertyAsString(INCREMENT);
     }
 
+    public void setIsPerUser(boolean isPer) {
+        setProperty(new BooleanProperty(PER_USER, isPer));
+    }
 
-    public void setFormat(String format) {
-        this.format = format;
+    public boolean isPerUser() {
+        return getPropertyAsBoolean(PER_USER);
     }
 
+    public void setVarName(String name) {
+        setProperty(VAR_NAME, name);
+    }
 
-    public String getIncrement() {
-        return increment;
+    public String getVarName() {
+        return getPropertyAsString(VAR_NAME);
     }
 
+    public void setFormat(String format) {
+        setProperty(FORMAT, format);
+    }
 
-    public void setIncrement(String increment) {
-        this.increment = increment;
+    public String getFormat() {
+        return getPropertyAsString(FORMAT);
     }
 }

Modified: 
jmeter/trunk/src/components/org/apache/jmeter/visualizers/backend/BackendListenerGui.java
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/visualizers/backend/BackendListenerGui.java?rev=1811755&r1=1811754&r2=1811755&view=diff
==============================================================================
--- 
jmeter/trunk/src/components/org/apache/jmeter/visualizers/backend/BackendListenerGui.java
 (original)
+++ 
jmeter/trunk/src/components/org/apache/jmeter/visualizers/backend/BackendListenerGui.java
 Tue Oct 10 18:28:45 2017
@@ -214,7 +214,7 @@ public class BackendListenerGui extends
      * @return a panel containing the relevant components
      */
     private JPanel createParameterPanel() {
-        argsPanel = new 
ArgumentsPanel(true,JMeterUtils.getResString("backend_listener_paramtable")); 
// $NON-NLS-1$
+        argsPanel = new 
ArgumentsPanel(JMeterUtils.getResString("backend_listener_paramtable")); // 
$NON-NLS-1$
         return argsPanel;
     }
 

Modified: jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties?rev=1811755&r1=1811754&r2=1811755&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties 
(original)
+++ jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties Tue 
Oct 10 18:28:45 2017
@@ -215,6 +215,9 @@ cookie_manager_title=HTTP Cookie Manager
 cookie_options=Options
 cookies_stored=User-Defined Cookies
 copy=Copy
+counter_config_title=Counter
+counter_per_user=Track counter independently for each user
+counter_reset_per_tg_iteration=Reset counter on each Thread Group Iteration
 countlim=Size limit
 critical_section_controller_label=Lock name
 critical_section_controller_title=Critical Section Controller
@@ -434,6 +437,7 @@ ignore_subcontrollers=Ignore sub-control
 include_controller=Include Controller
 include_equals=Include Equals?
 include_path=Include Test Plan
+increment=Increment
 infinite=Forever
 initial_context_factory=Initial Context Factory
 insert_after=Insert After
@@ -652,6 +656,7 @@ mailer_title_smtpserver=SMTP server
 mailer_visualizer_title=Mailer Visualizer
 match_num_field=Match No. (0 for Random)\: 
 max=Maximum
+max_value=Maximum value
 maximum_param=The maximum value allowed for a range of values
 md5hex_assertion_failure=Error asserting MD5 sum : got {0} but should have 
been {1}
 md5hex_assertion_label=MD5Hex
@@ -1106,6 +1111,7 @@ ssl_port=SSL Port
 sslmanager=SSL Manager
 start=Start
 start_no_timers=Start no pauses
+start_value=Starting value
 stop=Stop
 stopping_test=Shutting down all test threads. You can see number of active 
threads in the upper right corner of GUI. Please be patient. 
 stopping_test_failed=One or more test threads won't exit; see log file.
@@ -1244,6 +1250,7 @@ validate_threadgroup=Validate
 value=Value
 value_to_quote_meta=Value to escape from ORO Regexp meta chars
 value_to_shift=Amount of seconds/minutes/hours/days to add ( example P2D \: 
plus one day ) (optional)
+var_name=Reference Name
 variable_name_param=Name of variable (may include variable and function 
references)
 view_graph_tree_title=View Graph Tree
 view_results_assertion_error=Assertion error: 

Modified: 
jmeter/trunk/src/core/org/apache/jmeter/resources/messages_es.properties
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_es.properties?rev=1811755&r1=1811754&r2=1811755&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/resources/messages_es.properties 
(original)
+++ jmeter/trunk/src/core/org/apache/jmeter/resources/messages_es.properties 
Tue Oct 10 18:28:45 2017
@@ -136,6 +136,8 @@ cookie_manager_policy=Pol\u00EDtica de C
 cookie_manager_title=Gestor de Cookies HTTP
 cookies_stored=Cookies almacenadas en el Gestor de Cookies
 copy=Copiar
+counter_config_title=Contador
+counter_per_user=Contador independiente para cada usuario
 countlim=L\u00EDmite de tama\u00F1o
 csvread_file_file_name=Archivo CSV del que obtener valores | *alias
 cut=Cortar
@@ -283,6 +285,7 @@ ignore_subcontrollers=Ignorar bloques su
 include_controller=Incluir Controlador
 include_equals=\u00BFIncluir Equals?
 include_path=Incluir Plan de Pruebas
+increment=Incrementar
 infinite=Sin f\u00EDn
 initial_context_factory=Factor\u00EDa Initial Context
 insert_after=Insertar Despu\u00E9s
@@ -448,6 +451,7 @@ mailer_error=No pude enviar mail. Por fa
 mailer_visualizer_title=Visualizador de Mailer
 match_num_field=Coincidencia No. (0 para Aleatorio)\:
 max=M\u00E1ximo
+max_value=Valor m\u00E1ximo
 maximum_param=El valor m\u00E1ximo permitido para un rango de valores
 md5hex_assertion_failure=Error validando MD5\: obtuve {0} pero deber\u00EDa 
haber obtenido {1}
 md5hex_assertion_label=MD5Hex
@@ -790,6 +794,7 @@ ssl_port=Puerto SSL
 sslmanager=Gestor SSL
 start=Arrancar
 start_no_timers=Inicio no se detiene
+start_value=Valor inicial
 stop=Parar
 stopping_test=Parando todos los hilos. Por favor, sea paciente.
 stopping_test_failed=Uno o m\u00E1s hilos de test no saldr\u00E1n; ver fichero 
de log.
@@ -891,6 +896,7 @@ userdn=Nombre de Usuario
 username=Nombre de Usuario
 userpw=Contrase\u00F1a
 value=Valor
+var_name=Nombre de Referencia
 variable_name_param=Nombre de variable(puede incluir variables y referencias a 
funci\u00F3n)
 view_graph_tree_title=Ver \u00C1rbol Gr\u00E1fico
 view_results_assertion_error=Error de aserci\u00F3n\:

Modified: 
jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties?rev=1811755&r1=1811754&r2=1811755&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties 
(original)
+++ jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties 
Tue Oct 10 18:28:45 2017
@@ -210,6 +210,9 @@ cookie_manager_title=Gestionnaire de coo
 cookie_options=Options
 cookies_stored=Cookies stock\u00E9s
 copy=Copier
+counter_config_title=Compteur
+counter_per_user=Suivre le compteur ind\u00E9pendamment pour chaque unit\u00E9 
de test
+counter_reset_per_tg_iteration=R\u00E9initialiser le compteur \u00E0 chaque 
it\u00E9ration du groupe d'unit\u00E9s
 countlim=Limiter le nombre d'\u00E9l\u00E9ments retourn\u00E9s \u00E0
 critical_section_controller_label=Nom du verrou
 critical_section_controller_title=Contr\u00F4leur Section critique
@@ -429,6 +432,7 @@ ignore_subcontrollers=Ignorer les sous-b
 include_controller=Contr\u00F4leur Inclusion
 include_equals=Inclure \u00E9gal ?
 include_path=Plan de test \u00E0 inclure
+increment=Incr\u00E9ment \:
 infinite=Infini
 initial_context_factory=Fabrique de contexte initiale
 insert_after=Ins\u00E9rer apr\u00E8s
@@ -642,6 +646,7 @@ mailer_title_smtpserver=Serveur SMTP
 mailer_visualizer_title=R\u00E9cepteur Notification Email
 match_num_field=R\u00E9cup\u00E9rer la Ni\u00E8me corresp. (0 \: 
Al\u00E9atoire) \: 
 max=Maximum \:
+max_value=Valeur maximum \:
 maximum_param=La valeur maximum autoris\u00E9e pour un \u00E9cart de valeurs
 md5hex_assertion_failure=Erreur de v\u00E9rification de la somme MD5 \: obtenu 
{0} mais aurait d\u00FB \u00EAtre {1}
 md5hex_assertion_label=MD5Hex
@@ -1096,6 +1101,7 @@ ssl_port=Port SSL
 sslmanager=Gestionnaire SSL
 start=Lancer
 start_no_timers=Lancer sans pauses
+start_value=Valeur initiale \:
 stop=Arr\u00EAter
 stopping_test=Arr\u00EAt de toutes les unit\u00E9s de tests en cours. Le 
nombre d'unit\u00E9s actives est visible dans le coin haut droit de 
l'interface. Soyez patient, merci. 
 stopping_test_failed=Au moins une unit\u00E9 non arr\u00EAt\u00E9e; voir le 
journal.
@@ -1234,6 +1240,7 @@ validate_threadgroup=Valider
 value=Valeur \:
 value_to_quote_meta=Valeur \u00E0 \u00E9chapper des caract\u00E8res 
sp\u00E9ciaux utilis\u00E8s par ORO Regexp
 value_to_shift=Valeur \u00E0 ajouter ( example P2D \: plus deux jour ) 
(optionnel)
+var_name=Nom de r\u00E9f\u00E9rence \:
 variable_name_param=Nom de variable (peut inclure une r\u00E9f\u00E9rence de 
variable ou fonction)
 view_graph_tree_title=Voir le graphique en arbre
 view_results_assertion_error=Erreur d'assertion \: 

Modified: 
jmeter/trunk/src/core/org/apache/jmeter/resources/messages_pt_BR.properties
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_pt_BR.properties?rev=1811755&r1=1811754&r2=1811755&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/resources/messages_pt_BR.properties 
(original)
+++ jmeter/trunk/src/core/org/apache/jmeter/resources/messages_pt_BR.properties 
Tue Oct 10 18:28:45 2017
@@ -131,6 +131,8 @@ cookie_manager_policy=Pol\u00EDtica de C
 cookie_manager_title=Gerenciador de Cookie HTTP
 cookies_stored=Cookies Definidos pelo Usu\u00E1rio
 copy=Copiar
+counter_config_title=Contador
+counter_per_user=Realiza contagem independentemente para cada usu\u00E1rio
 countlim=Tamanho limite
 csvread_file_file_name=Arquivo CSV de onde os valores ser\u00E3o obtidos | 
*apelido
 cut=Recortar
@@ -271,6 +273,7 @@ ignore_subcontrollers=Ignorar blocos de
 include_controller=Controlador de Inclus\u00E3o
 include_equals=Incluir Igual?
 include_path=Incluir Plano de Teste
+increment=Incremento
 infinite=Infinito
 initial_context_factory=F\u00E1brica de Contexto Inicial
 insert_after=Inserir Depois
@@ -424,6 +427,7 @@ mailer_error=N\u00E3o foi poss\u00EDvel
 mailer_visualizer_title=Vizualizador de Email
 match_num_field=N\u00FAmero para Combina\u00E7\u00E3o (0 para aleat\u00F3rio)
 max=M\u00E1ximo
+max_value=Valor m\u00E1ximo
 maximum_param=O valor m\u00E1ximo permitido para um intervalo de valores
 md5hex_assertion_failure=Erro avaliando soma MD5\: encontrado {0} mas deveria 
haver {1}
 md5hex_assertion_md5hex_test=MD5Hex para Asser\u00E7\u00E3o
@@ -679,6 +683,7 @@ ssl_port=Porta SSL
 sslmanager=Gerenciador SSL
 start=Iniciar
 start_no_timers=Iniciar sem pausas
+start_value=Valor inicial
 stop=Interromper
 stopping_test=Interrompendo todos os usu\u00E1rios virtuais. Por favor, seja 
paciente.
 stopping_test_failed=Um ou mais usu\u00E1rios virtuais n\u00E3o pararam; veja 
arquivo de log.
@@ -764,6 +769,7 @@ userdn=Nome do Usu\u00E1rio
 username=Nome do Usu\u00E1rio
 userpw=Senha
 value=Valor
+var_name=Nome de Refer\u00EAncia
 variable_name_param=Nome da vari\u00E1vel (pode incluir refer\u00EAncias de 
vari\u00E1veis e fun\u00E7\u00F5es)
 view_graph_tree_title=Ver Gr\u00E1fico de \u00C1rvore
 view_results_assertion_error=Erro de asser\u00E7\u00E3o\:

Modified: 
jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/config/gui/JavaConfigGui.java
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/config/gui/JavaConfigGui.java?rev=1811755&r1=1811754&r2=1811755&view=diff
==============================================================================
--- 
jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/config/gui/JavaConfigGui.java
 (original)
+++ 
jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/config/gui/JavaConfigGui.java
 Tue Oct 10 18:28:45 2017
@@ -238,7 +238,7 @@ public class JavaConfigGui extends Abstr
      * @return a panel containing the relevant components
      */
     private JPanel createParameterPanel() {
-        argsPanel = new 
ArgumentsPanel(true,JMeterUtils.getResString("paramtable")); // $NON-NLS-1$
+        argsPanel = new 
ArgumentsPanel(JMeterUtils.getResString("paramtable")); // $NON-NLS-1$
         return argsPanel;
     }
 

Modified: jmeter/trunk/test/src/org/apache/jmeter/control/TestIfController.java
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/test/src/org/apache/jmeter/control/TestIfController.java?rev=1811755&r1=1811754&r2=1811755&view=diff
==============================================================================
--- jmeter/trunk/test/src/org/apache/jmeter/control/TestIfController.java 
(original)
+++ jmeter/trunk/test/src/org/apache/jmeter/control/TestIfController.java Tue 
Oct 10 18:28:45 2017
@@ -102,8 +102,8 @@ public class TestIfController extends JM
         ifCont2.setEvaluateAll(false);
 
         CounterConfig counterConfig = new CounterConfig();
-        counterConfig.setStartValue("1");
-        counterConfig.setIncrement("1");
+        counterConfig.setStart(1);
+        counterConfig.setIncrement(1);
         counterConfig.setVarName("VAR1");
 
         DebugSampler debugSampler2 = new DebugSampler();

Modified: jmeter/trunk/xdocs/changes.xml
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1811755&r1=1811754&r2=1811755&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml [utf-8] (original)
+++ jmeter/trunk/xdocs/changes.xml [utf-8] Tue Oct 10 18:28:45 2017
@@ -84,8 +84,6 @@ Summary
 
 <h3>Other samplers</h3>
 <ul>
-    <li><bug>61595</bug>Remove Detail, Add, Add from Clipboard, Delete buttons 
in Java Request Defaults and Java Request GUI</li>
-    <li><bug>61602</bug>Counter GUI: New GUI based to BeanInfoSupport-based 
generated UI.</li>
 </ul>
 
 <h3>Controllers</h3>
@@ -94,7 +92,6 @@ Summary
 
 <h3>Listeners</h3>
 <ul>
-    <li><bug>61594</bug>Remove Detail, Add, Add from Clipboard, Delete buttons 
in Backend listener GUI</li>
 </ul>
 
 <h3>Timers, Assertions, Config, Pre- &amp; Post-Processors</h3>

Modified: jmeter/trunk/xdocs/images/screenshots/backend_listener.png
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/xdocs/images/screenshots/backend_listener.png?rev=1811755&r1=1811754&r2=1811755&view=diff
==============================================================================
Binary files - no diff available.

Modified: jmeter/trunk/xdocs/images/screenshots/counter.png
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/xdocs/images/screenshots/counter.png?rev=1811755&r1=1811754&r2=1811755&view=diff
==============================================================================
Binary files - no diff available.

Modified: jmeter/trunk/xdocs/images/screenshots/java_defaults.png
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/xdocs/images/screenshots/java_defaults.png?rev=1811755&r1=1811754&r2=1811755&view=diff
==============================================================================
Binary files - no diff available.

Modified: jmeter/trunk/xdocs/images/screenshots/java_request.png
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/xdocs/images/screenshots/java_request.png?rev=1811755&r1=1811754&r2=1811755&view=diff
==============================================================================
Binary files - no diff available.


Reply via email to