You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by mi...@apache.org on 2012/08/23 14:20:12 UTC
svn commit: r1376457 - in /jmeter/trunk/src:
components/org/apache/jmeter/visualizers/RespTimeGraphVisualizer.java
core/org/apache/jmeter/resources/messages.properties
core/org/apache/jmeter/resources/messages_fr.properties
Author: milamber
Date: Thu Aug 23 12:20:12 2012
New Revision: 1376457
URL: http://svn.apache.org/viewvc?rev=1376457&view=rev
Log:
Rename Reload data button to Apply Filter
Bugzilla Id: 53718
Modified:
jmeter/trunk/src/components/org/apache/jmeter/visualizers/RespTimeGraphVisualizer.java
jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties
jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties
Modified: jmeter/trunk/src/components/org/apache/jmeter/visualizers/RespTimeGraphVisualizer.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/visualizers/RespTimeGraphVisualizer.java?rev=1376457&r1=1376456&r2=1376457&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/visualizers/RespTimeGraphVisualizer.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/visualizers/RespTimeGraphVisualizer.java Thu Aug 23 12:20:12 2012
@@ -125,7 +125,7 @@ public class RespTimeGraphVisualizer ext
private final JTextField samplerMatchLabel = new JTextField();
- private final JButton reloadButton = new JButton(JMeterUtils.getResString("aggregate_graph_reload_data")); // $NON-NLS-1$
+ private final JButton applyFilterBtn = new JButton(JMeterUtils.getResString("graph_apply_filter")); // $NON-NLS-1$
private final JCheckBox caseChkBox = new JCheckBox(JMeterUtils.getResString("search_text_chkbox_case"), false); // $NON-NLS-1$
@@ -318,11 +318,9 @@ public class RespTimeGraphVisualizer ext
while (idx < durationTest) {
int keyShift = minStartTime + idx;
Long value = subList.get(Integer.valueOf(keyShift));
- if (value!=null) {
+ if (value != null) {
nanLast = value.doubleValue();
-
data[s][idx] = nanLast;
-
// Calculate intermediate values (if needed)
int nlsize = nanList.size();
if (nlsize > 0) {
@@ -444,12 +442,12 @@ public class RespTimeGraphVisualizer ext
} else if (eventSource == samplerSelection) {
if (samplerSelection.isSelected()) {
samplerMatchLabel.setEnabled(true);
- reloadButton.setEnabled(true);
+ applyFilterBtn.setEnabled(true);
caseChkBox.setEnabled(true);
regexpChkBox.setEnabled(true);
} else {
samplerMatchLabel.setEnabled(false);
- reloadButton.setEnabled(false);
+ applyFilterBtn.setEnabled(false);
caseChkBox.setEnabled(false);
regexpChkBox.setEnabled(false);
// Force reload data
@@ -457,11 +455,11 @@ public class RespTimeGraphVisualizer ext
}
}
// Not 'else if' because forceReloadData
- if (eventSource == reloadButton || eventSource == intervalButton || forceReloadData) {
+ if (eventSource == applyFilterBtn || eventSource == intervalButton || forceReloadData) {
if (eventSource == intervalButton) {
intervalValue = Integer.parseInt(intervalField.getText());
}
- if (eventSource == reloadButton && samplerSelection.isSelected() && samplerMatchLabel.getText() != null
+ if (eventSource == applyFilterBtn && samplerSelection.isSelected() && samplerMatchLabel.getText() != null
&& samplerMatchLabel.getText().length() > 0) {
pattern = createPattern(samplerMatchLabel.getText());
} else if (forceReloadData) {
@@ -596,7 +594,7 @@ public class RespTimeGraphVisualizer ext
searchPanel.add(samplerSelection);
samplerMatchLabel.setEnabled(false);
- reloadButton.setEnabled(false);
+ applyFilterBtn.setEnabled(false);
caseChkBox.setEnabled(false);
regexpChkBox.setEnabled(false);
samplerSelection.addActionListener(this);
@@ -605,9 +603,9 @@ public class RespTimeGraphVisualizer ext
searchPanel.add(Box.createRigidArea(new Dimension(5,0)));
// Button
- reloadButton.setFont(FONT_SMALL);
- reloadButton.addActionListener(this);
- searchPanel.add(reloadButton);
+ applyFilterBtn.setFont(FONT_SMALL);
+ applyFilterBtn.addActionListener(this);
+ searchPanel.add(applyFilterBtn);
// checkboxes
caseChkBox.setFont(FONT_SMALL);
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=1376457&r1=1376456&r2=1376457&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties Thu Aug 23 12:20:12 2012
@@ -318,6 +318,7 @@ generator_illegal_msg=Could not access t
generator_instantiate_msg=Could not create an instance of the generator parser. Please make sure the generator implements Generator interface.
get_xml_from_file=File with SOAP XML Data (overrides above text)
get_xml_from_random=Message(s) Folder
+graph_apply_filter=Apply filter
graph_choose_graphs=Graphs to Display
graph_full_results_title=Graph Full Results
graph_pointshape_circle=Circle
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=1376457&r1=1376456&r2=1376457&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 Thu Aug 23 12:20:12 2012
@@ -48,7 +48,6 @@ aggregate_graph_max_length_xaxis_label=L
aggregate_graph_ms=Millisecondes
aggregate_graph_no_values_to_graph=Pas de valeurs pour le graphique
aggregate_graph_number_grouping=S\u00E9parateur de milliers ?
-aggregate_graph_reload_data=Recharger les donn\u00E9es
aggregate_graph_response_time=Temps de r\u00E9ponse
aggregate_graph_save=Enregistrer le graphique
aggregate_graph_save_table=Enregistrer le tableau de donn\u00E9es
@@ -312,6 +311,7 @@ generator_illegal_msg=N'a pas p\u00FB ac
generator_instantiate_msg=N'a pas p\u00FB cr\u00E9er une instance du parseur g\u00E9n\u00E9rateur. Assurez-vous que le g\u00E9n\u00E9rateur impl\u00E9mente l'interface Generator.
get_xml_from_file=Fichier avec les donn\u00E9es XML SOAP (remplace le texte ci-dessus)
get_xml_from_random=R\u00E9pertoire contenant les fichier(s) \:
+graph_apply_filter=Appliquer le filtre
graph_choose_graphs=Graphique \u00E0 afficher
graph_full_results_title=Graphique de r\u00E9sultats complets
graph_pointshape_circle=Cercle