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/07 12:11:25 UTC
svn commit: r1781992 - in /jmeter/trunk/src/core/org/apache/jmeter:
gui/action/SearchTreeDialog.java resources/messages.properties
resources/messages_fr.properties
Author: pmouawad
Date: Tue Feb 7 12:11:25 2017
New Revision: 1781992
URL: http://svn.apache.org/viewvc?rev=1781992&view=rev
Log:
Bug 54525 Search Feature : Enhance it with ability to replace
Improve rendering and add i18n for message
Bugzilla Id: 54525
Modified:
jmeter/trunk/src/core/org/apache/jmeter/gui/action/SearchTreeDialog.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/core/org/apache/jmeter/gui/action/SearchTreeDialog.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/action/SearchTreeDialog.java?rev=1781992&r1=1781991&r2=1781992&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/action/SearchTreeDialog.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/action/SearchTreeDialog.java Tue Feb 7 12:11:25 2017
@@ -58,8 +58,9 @@ import org.apache.jmeter.testelement.Tes
import org.apache.jmeter.util.JMeterUtils;
import org.apache.jorphan.gui.ComponentUtil;
import org.apache.jorphan.gui.JLabeledTextField;
-import org.apache.jorphan.logging.LoggingManager;
-import org.apache.log.Logger;
+import org.apache.jorphan.gui.layout.VerticalLayout;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* FIXME Why is searchTF not getting focus correctly after having been setVisible(false) once
@@ -68,7 +69,7 @@ public class SearchTreeDialog extends JD
private static final long serialVersionUID = -4436834972710248247L;
- private static final Logger logger = LoggingManager.getLoggerForClass();
+ private static final Logger logger = LoggerFactory.getLogger(SearchTreeDialog.class);
private static final Font FONT_DEFAULT = UIManager.getDefaults().getFont("TextField.font");
@@ -144,8 +145,9 @@ public class SearchTreeDialog extends JD
}
replaceTF = new JLabeledTextField(JMeterUtils.getResString("search_text_replace"), 20); //$NON-NLS-1$
- statusLabel = new JLabel();
- statusLabel.setMinimumSize(new Dimension(100, 30));
+ statusLabel = new JLabel(" ");
+ statusLabel.setPreferredSize(new Dimension(100, 20));
+ statusLabel.setMinimumSize(new Dimension(100, 20));
isRegexpCB = new JCheckBox(JMeterUtils.getResString("search_text_chkbox_regexp"), false); //$NON-NLS-1$
isCaseSensitiveCB = new JCheckBox(JMeterUtils.getResString("search_text_chkbox_case"), true); //$NON-NLS-1$
@@ -178,10 +180,10 @@ public class SearchTreeDialog extends JD
buttonsPanel.add(cancelButton);
JPanel searchAndReplacePanel = new JPanel();
- searchAndReplacePanel.setLayout(new BorderLayout());
- searchAndReplacePanel.add(searchPanel, BorderLayout.NORTH);
- searchAndReplacePanel.add(searchCriterionPanel, BorderLayout.CENTER);
- searchAndReplacePanel.add(buttonsPanel, BorderLayout.SOUTH);
+ searchAndReplacePanel.setLayout(new VerticalLayout());
+ searchAndReplacePanel.add(searchPanel);
+ searchAndReplacePanel.add(searchCriterionPanel);
+ searchAndReplacePanel.add(buttonsPanel);
this.getContentPane().add(searchAndReplacePanel);
searchTF.requestFocusInWindow();
@@ -258,9 +260,9 @@ public class SearchTreeDialog extends JD
}
GuiPackage.getInstance().getMainFrame().repaint();
searchTF.requestFocusInWindow();
- if(numberOfMatches > 0) {
- statusLabel.setText(MessageFormat.format("{0} nodes match the search", new Object[]{numberOfMatches}));
- }
+ statusLabel.setText(
+ MessageFormat.format(
+ JMeterUtils.getResString("search_tree_matches"),new Object[]{numberOfMatches}));
}
/**
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=1781992&r1=1781991&r2=1781992&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties Tue Feb 7 12:11:25 2017
@@ -970,6 +970,7 @@ search_text_button_next=Find next
search_text_chkbox_case=Case sensitive
search_text_chkbox_regexp=Regular exp.
search_text_field=Search:
+search_tree_matches={0} node(s) match the search
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_fr.properties
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties?rev=1781992&r1=1781991&r2=1781992&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 Feb 7 12:11:25 2017
@@ -960,6 +960,7 @@ 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_tree_matches={0} correspondance(s)
search_text_replace=Remplacer par
search_text_title_not_found=Pas trouv\u00E9
search_tree_title=Rechercher dans l'arbre