Feature: Find function in cell data popup and Object tree's text detail tabs:

  The "Mark all" toggle button now writes the number of occurrences to SQuirreL's message panel.

Author: GWA

sql12/core/doc/changes.txt

@@ -6,6 +6,9 @@ Not yet released, available in our GIT repository, snapshots and future releases
 
 Enhancements:
 
+Find function in cell data popup and Object tree's text detail tabs:
+  The "Mark all" toggle button now writes the number of occurrences to SQuirreL's message panel.
+
 Introduced Java 23 compatibility.
 
 https://github.com/squirrel-sql-client/squirrel-sql-code/issues/47

sql12/core/src/net/sourceforge/squirrel_sql/fw/gui/textfind/I18NStrings.properties

@@ -12,3 +12,5 @@ TextFindCtrl.last.occurrence.reached=Last occurrence reached. Next search will r
 TextFindMode.contains=Contains
 TextFindMode.contains.ignore.case=Contains ignore case
 TextFindMode.contains.regexp=Contains regular expression
+
+TextFindCtrl.mark.count=Marked {0} occurrences

sql12/core/src/net/sourceforge/squirrel_sql/fw/gui/textfind/TextFindCtrl.java

@@ -1,5 +1,23 @@
 package net.sourceforge.squirrel_sql.fw.gui.textfind;
 
+import java.awt.BorderLayout;
+import java.awt.Color;
+import java.awt.event.ActionEvent;
+import java.awt.event.InputEvent;
+import java.awt.event.KeyEvent;
+import javax.swing.AbstractAction;
+import javax.swing.Action;
+import javax.swing.ButtonGroup;
+import javax.swing.JComponent;
+import javax.swing.JPanel;
+import javax.swing.JPopupMenu;
+import javax.swing.JRadioButtonMenuItem;
+import javax.swing.JScrollPane;
+import javax.swing.KeyStroke;
+import javax.swing.text.BadLocationException;
+import javax.swing.text.DefaultHighlighter;
+import javax.swing.text.JTextComponent;
+
 import net.sourceforge.squirrel_sql.client.Main;
 import net.sourceforge.squirrel_sql.fw.gui.EditableComboBoxHandler;
 import net.sourceforge.squirrel_sql.fw.props.Props;
@@ -8,15 +26,6 @@
 import net.sourceforge.squirrel_sql.fw.util.StringUtilities;
 import net.sourceforge.squirrel_sql.fw.util.Utilities;
 
-import javax.swing.*;
-import javax.swing.text.BadLocationException;
-import javax.swing.text.DefaultHighlighter;
-import javax.swing.text.JTextComponent;
-import java.awt.*;
-import java.awt.event.ActionEvent;
-import java.awt.event.InputEvent;
-import java.awt.event.KeyEvent;
-
 public class TextFindCtrl
 {
    public static final String PREF_KEY_TEXT_FIND_PREF_PREFIX = "TextFindCtrl.PREF_KEY_TEXT_FIND_PREF_PREFIX";
@@ -197,9 +206,11 @@ private void onToggleMarkAll()
          MatchBounds matchBounds =
                TextFinder.findNthOccurrence(_textComponentToSearch.getText(), _editableComboBoxHandler.getItem(), nextOccurrenceToFind, getSelectedFindMode());
 
+         int matchCount = 0;
          boolean firstMatch = true;
          while (null != matchBounds)
          {
+            ++matchCount;
             //////////////////////////////////////////////////////////////////////
             // Scrolls correctly and does not interfere with highlighting.
             if (firstMatch)
@@ -217,6 +228,8 @@ private void onToggleMarkAll()
             matchBounds =
                   TextFinder.findNthOccurrence(_textComponentToSearch.getText(), _editableComboBoxHandler.getItem(), nextOccurrenceToFind, getSelectedFindMode());
          }
+
+         Main.getApplication().getMessageHandler().showMessage(s_stringMgr.getString("TextFindCtrl.mark.count", matchCount));
       }
       catch (BadLocationException e)
       {