You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by pm...@apache.org on 2017/11/08 20:54:24 UTC
svn commit: r1814643 - in /jmeter/trunk:
src/core/org/apache/jmeter/functions/gui/
src/core/org/apache/jmeter/resources/ src/jorphan/org/apache/jorphan/gui/
xdocs/
Author: pmouawad
Date: Wed Nov 8 20:54:24 2017
New Revision: 1814643
URL: http://svn.apache.org/viewvc?rev=1814643&view=rev
Log:
Bug 61738 - Function Helper Dialog : Add Copy in Generate and clarify labels
Bugzilla Id: 61738
Modified:
jmeter/trunk/src/core/org/apache/jmeter/functions/gui/FunctionHelper.java
jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties
jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties
jmeter/trunk/src/jorphan/org/apache/jorphan/gui/GuiUtils.java
jmeter/trunk/xdocs/changes.xml
Modified: jmeter/trunk/src/core/org/apache/jmeter/functions/gui/FunctionHelper.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/functions/gui/FunctionHelper.java?rev=1814643&r1=1814642&r2=1814643&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/functions/gui/FunctionHelper.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/functions/gui/FunctionHelper.java Wed Nov 8 20:54:24 2017
@@ -56,6 +56,7 @@ import org.apache.jmeter.util.JMeterUtil
import org.apache.jmeter.util.LocaleChangeEvent;
import org.apache.jmeter.util.LocaleChangeListener;
import org.apache.jorphan.gui.ComponentUtil;
+import org.apache.jorphan.gui.GuiUtils;
import org.apache.jorphan.gui.JLabeledChoice;
import org.apache.jorphan.gui.JLabeledTextField;
import org.slf4j.Logger;
@@ -191,6 +192,7 @@ public class FunctionHelper extends JDia
}
functionCall.append("}");
cutPasteFunction.setText(functionCall.toString());
+ GuiUtils.copyTextToClipboard(cutPasteFunction.getText());
CompoundVariable function = new CompoundVariable(functionCall.toString());
try {
resultTextArea.setText(function.execute().trim());
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=1814643&r1=1814642&r2=1814643&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties Wed Nov 8 20:54:24 2017
@@ -237,7 +237,7 @@ cssjquery_tester_field=Selector\:
cssjquery_tester_title=CSS/JQuery Tester
csvread_file_file_name=CSV file to get values from | *alias
cut=Cut
-cut_paste_function=Copy and paste function string
+cut_paste_function=Function syntax\:
database_conn_pool_max_usage=Max Usage For Each Connection\:
database_conn_pool_props=Database Connection Pool
database_conn_pool_size=Number of Connections in Pool\:
@@ -367,14 +367,14 @@ function_helper_dialog_result_warn=If fu
function_helper_title=Function Helper
function_name_param=Name of variable in which to store the result (required)
function_name_paropt=Name of variable in which to store the result (optional)
-function_params=Function Parameters
+function_params=Function Parameters (Fill in Values below and click Generate)
functional_mode=Functional Test Mode (i.e. save Response Data and Sampler Data)
functional_mode_explanation=Selecting Functional Test Mode may adversely affect performance.
gaussian_timer_delay=Constant Delay Offset (in milliseconds)\:
gaussian_timer_memo=Adds a random delay with a gaussian distribution
gaussian_timer_range=Deviation (in milliseconds)\:
gaussian_timer_title=Gaussian Random Timer
-generate=Generate
+generate=Generate & Copy to clipboard
generator=Name of Generator class
generator_cnf_msg=Could not find the generator class. Please make sure you place your jar file in the /lib directory.
generator_illegal_msg=Could not access the generator class due to IllegalAccessException.
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=1814643&r1=1814642&r2=1814643&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 Wed Nov 8 20:54:24 2017
@@ -232,7 +232,7 @@ cssjquery_tester_field=S\u00E9lecteur\:
cssjquery_tester_title=Testeur CSS/JQuery
csvread_file_file_name=Fichier CSV pour obtenir les valeurs de | *alias
cut=Couper
-cut_paste_function=Fonction de copier/coller de cha\u00EEne de caract\u00E8re
+cut_paste_function=Syntaxe de la fonction \:
database_conn_pool_max_usage=Utilisation max pour chaque connexion\:
database_conn_pool_props=Pool de connexions \u221A\u2020 la base de donn\u221A\u00A9es
database_conn_pool_size=Nombre de Connexions dans le Pool\:
@@ -362,14 +362,14 @@ function_helper_dialog_result_warn=Si la
function_helper_title=Assistant de fonctions
function_name_param=Nom de la fonction. Utilis\u00E9 pour stocker les valeurs \u00E0 utiliser ailleurs dans la plan de test
function_name_paropt=Nom de variable dans laquelle le r\u00E9sultat sera stock\u00E9 (optionnel)
-function_params=Param\u00E8tres de la fonction
+function_params=Param\u00e8tres de fonction (Remplissez les valeurs ci-dessous et cliquez sur G\u00e9n\u00e9rer)
functional_mode=Mode de test fonctionnel
functional_mode_explanation=S\u00E9lectionner le mode de test fonctionnel uniquement si vous avez besoin\nd'enregistrer les donn\u00E9es re\u00E7ues du serveur dans un fichier \u00E0 chaque requ\u00EAte. \n\nS\u00E9lectionner cette option affecte consid\u00E9rablement les performances.
gaussian_timer_delay=D\u00E9lai de d\u00E9calage bas\u00E9 gaussian (en millisecondes) \:
gaussian_timer_memo=Ajoute un d\u00E9lai al\u00E9atoire avec une distribution gaussienne
gaussian_timer_range=D\u00E9viation (en millisecondes) \:
gaussian_timer_title=Compteur de temps al\u00E9atoire gaussien
-generate=G\u00E9n\u00E9rer
+generate=G\u00e9n\u00e9rer et copier dans le presse-papiers
generator=Nom de la classe g\u00E9n\u00E9ratrice
generator_cnf_msg=N'a pas p\u00FB trouver la classe g\u00E9n\u00E9ratrice. Assurez-vous que vous avez plac\u00E9 votre fichier jar dans le r\u00E9pertoire /lib
generator_illegal_msg=N'a pas p\u00FB acc\u00E9der \u00E0 la classes g\u00E9n\u00E9ratrice \u00E0 cause d'une IllegalAccessException.
Modified: jmeter/trunk/src/jorphan/org/apache/jorphan/gui/GuiUtils.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/jorphan/org/apache/jorphan/gui/GuiUtils.java?rev=1814643&r1=1814642&r2=1814643&view=diff
==============================================================================
--- jmeter/trunk/src/jorphan/org/apache/jorphan/gui/GuiUtils.java (original)
+++ jmeter/trunk/src/jorphan/org/apache/jorphan/gui/GuiUtils.java Wed Nov 8 20:54:24 2017
@@ -24,6 +24,7 @@ import java.awt.FlowLayout;
import java.awt.Toolkit;
import java.awt.datatransfer.Clipboard;
import java.awt.datatransfer.DataFlavor;
+import java.awt.datatransfer.StringSelection;
import java.awt.datatransfer.Transferable;
import java.awt.datatransfer.UnsupportedFlavorException;
import java.io.IOException;
@@ -160,4 +161,14 @@ public final class GuiUtils {
MenuScroller.setScrollerFor(menu, maxItems, 200);
}
}
+
+ /**
+ * Copy text to clipboard
+ * @param text Text to copy
+ */
+ public static final void copyTextToClipboard(String text) {
+ Clipboard clpbrd = Toolkit.getDefaultToolkit().getSystemClipboard();
+ StringSelection stringSelection = new StringSelection(text);
+ clpbrd.setContents(stringSelection, null);
+ }
}
Modified: jmeter/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1814643&r1=1814642&r2=1814643&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml [utf-8] (original)
+++ jmeter/trunk/xdocs/changes.xml [utf-8] Wed Nov 8 20:54:24 2017
@@ -120,6 +120,7 @@ Summary
<h3>Functions</h3>
<ul>
<li><bug>61561</bug>Function helper dialog should display exception in result</li>
+ <li><bug>61738</bug>Function Helper Dialog : Add Copy in Generate and clarify labels</li>
<li><bug>61593</bug>Remove Detail, Add, Add from Clipboard, Delete buttons in Function Helper GUI</li>
<li><bug>61724</bug>Add <code>__digest</code> function to provide computing of Hashes (SHA-XXX, MDX). Based on a contribution by orimarko at gmail.com</li>
</ul>