Attachment #35826 for bug #62234

View | Details | Raw Unified | Return to bug 62234
Collapse All | Expand All




                .map(token -> caseSensitive ? token : token.toLowerCase())
                .anyMatch(token -> token.contains(textToSearch));
    }

    /**
     * Returns true if searchedTextLowerCase is in value
     * @param value string in which the search will be done
     * @param searchedTextLowerCase string which will be searched for
     * @return true if searchedTextLowerCase is in value
     */
    protected boolean testField(String value, String searchedTextLowerCase) {
        return !StringUtils.isEmpty(value)
                && value.toLowerCase().contains(searchedTextLowerCase);
    }
}




import java.awt.Dimension;
import java.awt.FlowLayout;
import java.awt.Font;
import java.awt.GridLayout;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Set;
import java.util.regex.Pattern;

import javax.swing.Action;
import javax.swing.ActionMap;
import javax.swing.BorderFactory;
import javax.swing.Box;
import javax.swing.InputMap;
import javax.swing.JButton;
import javax.swing.JCheckBox;

import javax.swing.tree.TreePath;

import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.tuple.Pair;
import org.apache.commons.lang3.tuple.Triple;
import org.apache.jmeter.gui.GuiPackage;
import org.apache.jmeter.gui.Replaceable;
import org.apache.jmeter.gui.Searchable;

import org.apache.jmeter.util.JMeterUtils;
import org.apache.jorphan.gui.ComponentUtil;
import org.apache.jorphan.gui.JLabeledTextField;
import org.apache.jorphan.gui.layout.VerticalLayout;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;



    private JButton searchButton;

    private JButton nextButton;
    
    private JButton previousButton;
    
    private JButton searchAndExpandButton;
    
    private JButton replaceButton;
    
    private JButton replaceAllButton;
    
    private JButton replaceAndFindButton;

    private JButton cancelButton;

    private JLabeledTextField searchTF;

    private JLabeledTextField replaceTF;


    private JCheckBox isCaseSensitiveCB;

    private JButton cancelButton;

    private transient Triple<String, Boolean, Boolean> lastSearchConditions = null;

    private List<JMeterTreeNode> lastSearchResult = new ArrayList<>();
    private int currentSearchIndex;

    public SearchTreeDialog() {
        super((JFrame) null, JMeterUtils.getResString("search_tree_title"), false); //$NON-NLS-1$

        this.getContentPane().setLayout(new BorderLayout(10,10));

        searchTF = new JLabeledTextField(JMeterUtils.getResString("search_text_field"), 20); //$NON-NLS-1$
        searchTF.setAlignmentY(TOP_ALIGNMENT);
        if (lastSearchConditions != null) {
            searchTF.setText(lastSearchConditions.getLeft());
            isCaseSensitiveCB.setSelected(lastSearchConditions.getMiddle());
            isRegexpCB.setSelected(lastSearchConditions.getRight());
        }

        replaceTF = new JLabeledTextField(JMeterUtils.getResString("search_text_replace"), 20); //$NON-NLS-1$
        replaceTF.setAlignmentX(TOP_ALIGNMENT);
        statusLabel = new JLabel(" ");
        statusLabel.setPreferredSize(new Dimension(100, 20));
        statusLabel.setMinimumSize(new Dimension(100, 20));

        isCaseSensitiveCB.setFont(FONT_SMALL);

        JPanel searchCriterionPanel = new JPanel(new FlowLayout(FlowLayout.CENTER));
        searchCriterionPanel.setBorder(BorderFactory.createTitledBorder(JMeterUtils.getResString("search_matching"))); //$NON-NLS-1$
        searchCriterionPanel.add(isCaseSensitiveCB);
        searchCriterionPanel.add(isRegexpCB);

        JPanel searchPanel = new JPanel();
        searchPanel.setLayout(new GridLayout(4, 1));
        searchPanel.setBorder(BorderFactory.createEmptyBorder(7, 3, 3, 3));
        searchPanel.add(searchTF);
        searchPanel.add(replaceTF);
        searchPanel.add(statusLabel);
        searchPanel.add(searchCriterionPanel);

        JPanel buttonsPanel = new JPanel(new GridLayout(9, 1));
        searchButton = createButton("search_search_all"); //$NON-NLS-1$
        searchButton.addActionListener(this);
        nextButton = createButton("search_next"); //$NON-NLS-1$
        nextButton.addActionListener(this);
        previousButton = createButton("search_previous"); //$NON-NLS-1$
        previousButton.addActionListener(this);
        searchAndExpandButton = createButton("search_search_all_expand"); //$NON-NLS-1$
        searchAndExpandButton.addActionListener(this);
        replaceButton = createButton("search_replace"); //$NON-NLS-1$
        replaceButton.addActionListener(this);
        replaceAllButton = createButton("search_replace_all"); //$NON-NLS-1$
        replaceAllButton.addActionListener(this);
        replaceAndFindButton = createButton("search_replace_and_find"); //$NON-NLS-1$
        replaceAndFindButton.addActionListener(this);
        cancelButton = createButton("cancel"); //$NON-NLS-1$
        cancelButton.addActionListener(this);
        buttonsPanel.add(nextButton);
        buttonsPanel.add(previousButton);
        buttonsPanel.add(searchButton);
        buttonsPanel.add(searchAndExpandButton);
        buttonsPanel.add(Box.createVerticalStrut(30));
        buttonsPanel.add(replaceButton);
        buttonsPanel.add(replaceAllButton);
        buttonsPanel.add(replaceAndFindButton);
        buttonsPanel.add(cancelButton);

        JPanel searchAndReplacePanel = new JPanel();
        searchAndReplacePanel.setLayout(new BorderLayout());
        searchAndReplacePanel.add(searchPanel, BorderLayout.CENTER);
        searchAndReplacePanel.add(buttonsPanel, BorderLayout.EAST);
        searchAndReplacePanel.add(buttonsPanel);
        this.getContentPane().add(searchAndReplacePanel);
        searchTF.requestFocusInWindow();


        ComponentUtil.centerComponentInWindow(this);
    }

    private JButton createButton(String messageKey) {
        return new JButton(JMeterUtils.getResString(messageKey));
    }

    /**
     * Do search
     * @param e {@link ActionEvent}
     */
    @Override
    public void actionPerformed(ActionEvent e) {
        Object source = e.getSource();
        statusLabel.setText("");
        if (source == cancelButton) {
            searchTF.requestFocusInWindow();
            this.setVisible(false);
        } else if (source == searchButton
                || source == searchAndExpandButton) {
            doSearch(e);
        } else if (source == nextButton ||
                source == previousButton) {
            doNavigateToSearchResult(source == nextButton);
        } else if (source == replaceAllButton){
            doReplaceAll(e);
        } else if (!lastSearchResult.isEmpty() && source == replaceButton){
            doReplace();
        } else if (source == replaceAndFindButton){
            if(!lastSearchResult.isEmpty()) {
                doReplace();
            }
            doNavigateToSearchResult(true);
        }
    }

    /**
     * 
     */
    private void doReplace() {
        GuiPackage.getInstance().updateCurrentNode();
        JMeterTreeNode currentNode = lastSearchResult.get(currentSearchIndex);
        if(currentNode != null) {
            String wordToSearch = searchTF.getText();
            String wordToReplace = replaceTF.getText();
            String regex = isRegexpCB.isSelected() ? wordToSearch : Pattern.quote(wordToSearch);
            boolean caseSensitiveReplacement = isCaseSensitiveCB.isSelected();
            Pair<Integer, JMeterTreeNode> pair = doReplacementInCurrentNode(currentNode, regex, wordToReplace, caseSensitiveReplacement);
            int nbReplacements = 0;
            if(pair != null) {
                nbReplacements = pair.getLeft();
                GuiPackage.getInstance().updateCurrentGui();
                GuiPackage.getInstance().getMainFrame().repaint();
            } 
            statusLabel.setText(MessageFormat.format("Replaced {0} occurrences", nbReplacements));
        }
    }

    private JMeterTreeNode doNavigateToSearchResult(boolean isNext) {
        boolean doSearchAgain = 
                lastSearchConditions == null || 
                !Triple.of(searchTF.getText(), isCaseSensitiveCB.isSelected(), isRegexpCB.isSelected())
                .equals(lastSearchConditions);
        if(doSearchAgain) {
            String wordToSearch = searchTF.getText();
            if (StringUtils.isEmpty(wordToSearch)) {
                this.lastSearchConditions = null;
                return null;
            } else {
                this.lastSearchConditions = Triple.of(wordToSearch, isCaseSensitiveCB.isSelected(), isRegexpCB.isSelected());
            }
            Searcher searcher = createSearcher(wordToSearch);
            searchInTree(GuiPackage.getInstance(), searcher, wordToSearch);
        }
        if(!lastSearchResult.isEmpty()) {
            if(isNext) {
                currentSearchIndex = ++currentSearchIndex % lastSearchResult.size();
            } else {
                currentSearchIndex = currentSearchIndex > 0 ? --currentSearchIndex : lastSearchResult.size()-1;
            }
            JMeterTreeNode selectedNode = lastSearchResult.get(currentSearchIndex);
            TreePath selection = new TreePath(selectedNode.getPath());
            GuiPackage.getInstance().getMainFrame().getTree().setSelectionPath(selection);
            GuiPackage.getInstance().getMainFrame().getTree().scrollPathToVisible(selection);
            return selectedNode;
        }
        return null;
    }

    /**
     * @param e {@link ActionEvent}
     */
    private void doSearch(ActionEvent e) {
        boolean expand = e.getSource()==searchAndExpandButton;
        String wordToSearch = searchTF.getText();
        if (StringUtils.isEmpty(wordToSearch)) {
            this.lastSearchConditions = null;
            return;
        } else {
            this.lastSearchConditions = Triple.of(wordToSearch, isCaseSensitiveCB.isSelected(), isRegexpCB.isSelected());
        }

        // reset previous result
        ActionRouter.getInstance().doActionNow(new ActionEvent(e.getSource(), e.getID(), ActionNames.SEARCH_RESET));
        // do search
        Searcher searcher = createSearcher(wordToSearch);
        if (isRegexpCB.isSelected()) {
            searcher = new RegexpSearcher(isCaseSensitiveCB.isSelected(), searchTF.getText());
        } else {
            searcher = new RawTextSearcher(isCaseSensitiveCB.isSelected(), searchTF.getText());
        }
        GuiPackage guiPackage = GuiPackage.getInstance();
        guiPackage.beginUndoTransaction();
        int numberOfMatches = 0;
        try {
            Pair<Integer, Set<JMeterTreeNode>> result = searchInTree(guiPackage, searcher, wordToSearch);
            numberOfMatches = result.getLeft();
            markConcernedNodes(expand, result.getRight());
            for (JMeterTreeNode jMeterTreeNode : jMeterTreeModel.getNodesOfType(Searchable.class)) {
                try {
                    Searchable searchable = (Searchable) jMeterTreeNode.getUserObject();
                    List<String> searchableTokens = searchable.getSearchableTokens();
                    boolean result = searcher.search(searchableTokens);
                    if (result) {
                        numberOfMatches++;
                        nodes.add(jMeterTreeNode);
                    }
                } catch (Exception ex) {
                    logger.error("Error occurred searching for word:"+ wordToSearch+ " in node:"+jMeterTreeNode.getName(), ex);
                }
            }
            markConcernedNodes(expand, nodes);
        } finally {
            guiPackage.endUndoTransaction();
        }

    }

    /**
     * @param wordToSearch
     * @return
     */
    private Searcher createSearcher(String wordToSearch) {
        if (isRegexpCB.isSelected()) {
            return new RegexpSearcher(isCaseSensitiveCB.isSelected(), wordToSearch);
        } else {
            return new RawTextSearcher(isCaseSensitiveCB.isSelected(), wordToSearch);
        }
    }
    
    private Pair<Integer, Set<JMeterTreeNode>> searchInTree(GuiPackage guiPackage, Searcher searcher, String wordToSearch) {
        int numberOfMatches = 0;
        JMeterTreeModel jMeterTreeModel = guiPackage.getTreeModel();
        Set<JMeterTreeNode> nodes = new LinkedHashSet<>();
        for (JMeterTreeNode jMeterTreeNode : jMeterTreeModel.getNodesOfType(Searchable.class)) {
            try {
                Searchable searchable = (Searchable) jMeterTreeNode.getUserObject();
                List<String> searchableTokens = searchable.getSearchableTokens();
                boolean result = searcher.search(searchableTokens);
                if (result) {
                    numberOfMatches++;
                    nodes.add(jMeterTreeNode);
                }
            } catch (Exception ex) {
                logger.error("Error occurred searching for word:{} in node:{}", wordToSearch, jMeterTreeNode.getName(), ex);
            }
        }
        this.currentSearchIndex = -1;
        this.lastSearchResult.clear();
        this.lastSearchResult.addAll(nodes);
        return Pair.of(numberOfMatches, nodes);
    }

    /**
     * @param expand true if we want to expand
     * @param nodes Set of {@link JMeterTreeNode} to mark
     */

        boolean expand = e.getSource()==searchAndExpandButton;
        String wordToSearch = searchTF.getText();
        String wordToReplace = replaceTF.getText();

        if (StringUtils.isEmpty(wordToReplace)) {
            return;
        }

        GuiPackage.getInstance().updateCurrentNode();
        // reset previous result
        ActionRouter.getInstance().doActionNow(new ActionEvent(e.getSource(), e.getID(), ActionNames.SEARCH_RESET));
        Searcher searcher = createSearcher(wordToSearch);
        String regex = isRegexpCB.isSelected() ? wordToSearch : Pattern.quote(wordToSearch);
        if (isRegexpCB.isSelected()) {
            regex = wordToSearch;
            searcher = new RegexpSearcher(isCaseSensitiveCB.isSelected(), wordToSearch);
        } else {
            regex = Pattern.quote(wordToSearch);
            searcher = new RawTextSearcher(isCaseSensitiveCB.isSelected(), wordToSearch);
        }
        GuiPackage guiPackage = GuiPackage.getInstance();
        JMeterTreeModel jMeterTreeModel = guiPackage.getTreeModel();
        Set<JMeterTreeNode> nodes = new HashSet<>();
        boolean caseSensitiveReplacement = isCaseSensitiveCB.isSelected();
        int totalReplaced = 0;
        Pair<Integer, Set<JMeterTreeNode>> result = searchInTree(guiPackage, searcher, wordToSearch);
        Set<JMeterTreeNode> matchingNodes = result.getRight();
        Set<JMeterTreeNode> replacedNodes = new HashSet<>();
        for (JMeterTreeNode jMeterTreeNode : matchingNodes) {
            Pair<Integer, JMeterTreeNode> pair = doReplacementInCurrentNode(jMeterTreeNode, regex, wordToReplace, caseSensitiveReplacement);
            if(pair != null) {
                totalReplaced += pair.getLeft();
                replacedNodes.add(pair.getRight());
                    if (logger.isInfoEnabled()) {
                        logger.info("Replaced " + numberOfReplacements + " in element:"
                                + ((TestElement) jMeterTreeNode.getUserObject()).getName());
                    }
                    totalReplaced += numberOfReplacements;
                    if (numberOfReplacements > 0) {
                        nodes.add(jMeterTreeNode);
                    }
                }
            } catch (Exception ex) {
                logger.error("Error occurred replacing data in node:" + jMeterTreeNode.getName(), ex);
            }
        }
        statusLabel.setText(MessageFormat.format("Replaced {0} occurrences", totalReplaced));
        markConcernedNodes(expand, replacedNodes);
        // Update GUI as current node may be concerned by changes
        if (totalReplaced > 0) {
            GuiPackage.getInstance().refreshCurrentGui();

        searchTF.requestFocusInWindow();
    }

    /**
     * Replace in jMeterTreeNode regex by replaceBy
     * @param jMeterTreeNode Current {@link JMeterTreeNode}
     * @param regex Text to search (can be regex)
     * @param replaceBy Replacement text
     * @param caseSensitiveReplacement boolean if search is case sensitive
     * @return null if no replacement occurred or Pair of (number of replacement, current tree node)
     */
    private Pair<Integer, JMeterTreeNode> doReplacementInCurrentNode(JMeterTreeNode jMeterTreeNode,
            String regex, String replaceBy, boolean caseSensitiveReplacement) {
        try {
            if (jMeterTreeNode.getUserObject() instanceof Replaceable) {
                Replaceable replaceable = (Replaceable) jMeterTreeNode.getUserObject();
                int numberOfReplacements = replaceable.replace(regex, replaceBy, caseSensitiveReplacement);
                if (numberOfReplacements > 0) {
                    if (logger.isInfoEnabled()) {
                        logger.info("Replaced {} in element:{}", numberOfReplacements,
                                ((TestElement) jMeterTreeNode.getUserObject()).getName());
                    }
                    return Pair.of(numberOfReplacements, jMeterTreeNode);
                }
            }
        } catch (Exception ex) {
            logger.error("Error occurred replacing data in node:{}", jMeterTreeNode.getName(), ex);
        }
        return null;
    }

    /* (non-Javadoc)
     * @see java.awt.Dialog#setVisible(boolean)
     */




scope=Scope
search=Search
search_base=Search base
search_expand=Search & Expand
search_filter=Search Filter
search_matching=Matching
search_next=Next
search_previous=Previous
search_replace=Replace
search_replace_all=Replace All
search_replace_and_find=Replace & Find
search_search_all=Search All
search_search_all_expand=Search All & Expand
search_test=Search Test
search_text_button_close=Close
search_text_button_find=Find
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
searchbase=Search base




scheduler=Programmateur de d\u00E9marrage
scheduler_configuration=Configuration du programmateur
scope=Port\u00E9e
search=Rechercher\:
search_base=Base de recherche
search_expand=Rechercher & D\u00E9plier
search_filter=Filtre de recherche
search_matching=Correspondance
search_next=Suivant
search_previous=Pr\u00E9c\u00E9dent
search_replace=Remplacer dans noeud s\u00E9lectionn\u00E9\:
search_replace_all=Tout remplacer
search_replace_and_find=Remplacer & Rechercher
search_search_all=Tout Rechercher
search_search_all_expand=Tout Rechercher & D\u00E9plier
search_test=Recherche
search_text_button_close=Fermer
search_text_button_find=Rechercher
search_text_button_next=Suivant
search_text_chkbox_case=Consid\u00E9rer la casse
search_text_chkbox_regexp=Exp. r\u00E9guli\u00E8re
search_text_field=Rechercher \:
search_text_replace=Remplacer par
search_text_title_not_found=Pas trouv\u00E9

Return to bug 62234

Lines 55-69 Link Here

(-)src/core/org/apache/jmeter/gui/action/RawTextSearcher.java (-11 lines)
55	.map(token -> caseSensitive ? token : token.toLowerCase())	55	.map(token -> caseSensitive ? token : token.toLowerCase())
56	.anyMatch(token -> token.contains(textToSearch));	56	.anyMatch(token -> token.contains(textToSearch));
57	}	57	}
58
59	/**
60	* Returns true if searchedTextLowerCase is in value
61	* @param value string in which the search will be done
62	* @param searchedTextLowerCase string which will be searched for
63	* @return true if searchedTextLowerCase is in value
64	*/
65	protected boolean testField(String value, String searchedTextLowerCase) {
66	return !StringUtils.isEmpty(value)
67	&& value.toLowerCase().contains(searchedTextLowerCase);
68	}
69	}	58	}

Lines 1029-1046 Link Here

(-)src/core/org/apache/jmeter/resources/messages.properties (-3 / +9 lines)
1029	scope=Scope	1029	scope=Scope
1030	search=Search	1030	search=Search
1031	search_base=Search base	1031	search_base=Search base
1032	search_expand=Search & Expand
1033	search_filter=Search Filter	1032	search_filter=Search Filter
		1033	search_matching=Matching
		1034	search_next=Next
		1035	search_previous=Previous
		1036	search_replace=Replace
1034	search_replace_all=Replace All	1037	search_replace_all=Replace All
		1038	search_replace_and_find=Replace & Find
		1039	search_search_all=Search All
		1040	search_search_all_expand=Search All & Expand
1035	search_test=Search Test	1041	search_test=Search Test
1036	search_text_button_close=Close	1042	search_text_button_close=Close
1037	search_text_button_find=Find	1043	search_text_button_find=Find
1038	search_text_button_next=Find next	1044	search_text_button_next=Find next
1039	search_text_chkbox_case=Case sensitive	1045	search_text_chkbox_case=Case sensitive
1040	search_text_chkbox_regexp=Regular exp.	1046	search_text_chkbox_regexp=Regular exp.
1041	search_text_field=Search:	1047	search_text_field=Search\:
1042	search_tree_matches={0} node(s) match the search	1048	search_tree_matches={0} node(s) match the search
1043	search_text_replace=Replace by	1049	search_text_replace=Replace by\:
1044	search_text_title_not_found=Not found	1050	search_text_title_not_found=Not found
1045	search_tree_title=Search Tree	1051	search_tree_title=Search Tree
1046	searchbase=Search base	1052	searchbase=Search base

Lines 1016-1032 Link Here

(-)src/core/org/apache/jmeter/resources/messages_fr.properties (-3 / +9 lines)
1016	scheduler=Programmateur de d\u00E9marrage	1016	scheduler=Programmateur de d\u00E9marrage
1017	scheduler_configuration=Configuration du programmateur	1017	scheduler_configuration=Configuration du programmateur
1018	scope=Port\u00E9e	1018	scope=Port\u00E9e
1019	search=Rechercher	1019	search=Rechercher\:
1020	search_base=Base de recherche	1020	search_base=Base de recherche
1021	search_expand=Rechercher & D\u00E9plier
1022	search_filter=Filtre de recherche	1021	search_filter=Filtre de recherche
		1022	search_matching=Correspondance
		1023	search_next=Suivant
		1024	search_previous=Pr\u00E9c\u00E9dent
		1025	search_replace=Remplacer dans noeud s\u00E9lectionn\u00E9\:
1023	search_replace_all=Tout remplacer	1026	search_replace_all=Tout remplacer
		1027	search_replace_and_find=Remplacer & Rechercher
		1028	search_search_all=Tout Rechercher
		1029	search_search_all_expand=Tout Rechercher & D\u00E9plier
1024	search_test=Recherche	1030	search_test=Recherche
1025	search_text_button_close=Fermer	1031	search_text_button_close=Fermer
1026	search_text_button_find=Rechercher	1032	search_text_button_find=Rechercher
1027	search_text_button_next=Suivant	1033	search_text_button_next=Suivant
1028	search_text_chkbox_case=Consid\u00E9rer la casse	1034	search_text_chkbox_case=Consid\u00E9rer la casse
1029	search_text_chkbox_regexp=Exp. reguli\u00E8re	1035	search_text_chkbox_regexp=Exp. r\u00E9guli\u00E8re
1030	search_text_field=Rechercher \:	1036	search_text_field=Rechercher \:
1031	search_text_replace=Remplacer par	1037	search_text_replace=Remplacer par
1032	search_text_title_not_found=Pas trouv\u00E9	1038	search_text_title_not_found=Pas trouv\u00E9