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/02/01 22:24:08 UTC
svn commit: r1781326 - in /jmeter/trunk:
src/components/org/apache/jmeter/visualizers/
src/core/org/apache/jmeter/resources/ xdocs/
Author: pmouawad
Date: Wed Feb 1 22:24:08 2017
New Revision: 1781326
URL: http://svn.apache.org/viewvc?rev=1781326&view=rev
Log:
Bug 60678 - View Results Tree : Text renderer, search should not popup "Text Not Found"
Bugzilla Id: 60678
Modified:
jmeter/trunk/src/components/org/apache/jmeter/visualizers/SearchTextExtension.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/xdocs/changes.xml
Modified: jmeter/trunk/src/components/org/apache/jmeter/visualizers/SearchTextExtension.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/visualizers/SearchTextExtension.java?rev=1781326&r1=1781325&r2=1781326&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/visualizers/SearchTextExtension.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/visualizers/SearchTextExtension.java Wed Feb 1 22:24:08 2017
@@ -65,6 +65,8 @@ public class SearchTextExtension impleme
private static final String SEARCH_TEXT_COMMAND = "search_text"; // $NON-NLS-1$
+ public static final Color LIGHT_RED = new Color(0xFF, 0x80, 0x80);
+
private JLabel label;
private JButton findButton;
@@ -104,6 +106,8 @@ public class SearchTextExtension impleme
// new search?
if (lastTextTofind != null && !lastTextTofind.equals(textToFind)) {
searchProvider.resetTextToFind();
+ textToFindField.setBackground(Color.WHITE);
+ textToFindField.setForeground(Color.BLACK);
}
try {
@@ -112,14 +116,13 @@ public class SearchTextExtension impleme
if(found) {
findButton.setText(JMeterUtils.getResString("search_text_button_next"));// $NON-NLS-1$
lastTextTofind = textToFind;
+ textToFindField.setBackground(Color.WHITE);
+ textToFindField.setForeground(Color.BLACK);
}
else {
findButton.setText(JMeterUtils.getResString("search_text_button_find"));// $NON-NLS-1$
- // Display not found message
- JOptionPane.showMessageDialog(null, JMeterUtils
- .getResString("search_text_msg_not_found"),// $NON-NLS-1$
- JMeterUtils.getResString("search_text_title_not_found"), // $NON-NLS-1$
- JOptionPane.INFORMATION_MESSAGE);
+ textToFindField.setBackground(LIGHT_RED);
+ textToFindField.setForeground(Color.WHITE);
}
} catch (PatternSyntaxException pse) {
JOptionPane.showMessageDialog(null,
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=1781326&r1=1781325&r2=1781326&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties Wed Feb 1 22:24:08 2017
@@ -970,7 +970,6 @@ search_text_button_next=Find next
search_text_chkbox_case=Case sensitive
search_text_chkbox_regexp=Regular exp.
search_text_field=Search:
-search_text_msg_not_found=Text not found
search_text_replace=Replace by
search_text_title_not_found=Not found
search_tree_title=Search Tree
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=1781326&r1=1781325&r2=1781326&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 Wed Feb 1 22:24:08 2017
@@ -692,7 +692,6 @@ search_text_button_next=Encontrar siguie
search_text_chkbox_case=Sensible a may\u00FAsculas
search_text_chkbox_regexp=Expresi\u00F3n regular
search_text_field=Buscar\:
-search_text_msg_not_found=Texto no encontrado
search_text_title_not_found=No encontrado
searchbase=Base de B\u00FAsqueda
searchfilter=Filtro de B\u00FAsqueda
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=1781326&r1=1781325&r2=1781326&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 Feb 1 22:24:08 2017
@@ -960,7 +960,6 @@ search_text_button_next=Suivant
search_text_chkbox_case=Consid\u00E9rer la casse
search_text_chkbox_regexp=Exp. reguli\u00E8re
search_text_field=Rechercher \:
-search_text_msg_not_found=Texte non trouv\u00E9
search_text_replace=Remplacer par
search_text_title_not_found=Pas trouv\u00E9
search_tree_title=Rechercher dans l'arbre
Modified: jmeter/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1781326&r1=1781325&r2=1781326&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml [utf-8] (original)
+++ jmeter/trunk/xdocs/changes.xml [utf-8] Wed Feb 1 22:24:08 2017
@@ -135,6 +135,7 @@ JMeter now requires Java 8. Ensure you u
<li><bug>52962</bug>Allow sorting by columns for View Results in Table, Summary Report, Aggregate Report and Aggregate Graph. Based on a <pr>245</pr> by Logan Mauzaize (logan.mauzaize at gmail.com) and Maxime Chassagneux (maxime.chassagneux at gmail.com).</li>
<li><bug>60590</bug>BackendListener : Add Influxdb BackendListenerClient implementation to JMeter. Partly based on <pr>246</pr> by Logan Mauzaize (logan.mauzaize at gmail.com) and Maxime Chassagneux (maxime.chassagneux at gmail.com).</li>
<li><bug>60591</bug>BackendListener : Add a time boxed sampling. Based on a <pr>237</pr> by Logan Mauzaize (logan.mauzaize at gmail.com) and Maxime Chassagneux (maxime.chassagneux at gmail.com).</li>
+ <li><bug>60678</bug>View Results Tree : Text renderer, search should not popup "Text Not Found"</li>
</ul>
<h3>Timers, Assertions, Config, Pre- & Post-Processors</h3>