Initial implementation of Find sidebar for text components (thread dump viewers)

Author: jisedlac

visualvm/heapviewer/nbproject/project.xml

@@ -56,7 +56,7 @@
                     <compile-dependency/>
                     <run-dependency>
                         <release-version>1</release-version>
-                        <specification-version>1.147</specification-version>
+                        <specification-version>1.149</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>

visualvm/heapviewer/src/org/graalvm/visualvm/heapviewer/java/impl/JavaThreadsView.java

@@ -25,7 +25,6 @@
 
 package org.graalvm.visualvm.heapviewer.java.impl;
 
-import org.graalvm.visualvm.core.ui.components.ScrollableContainer;
 import java.awt.CardLayout;
 import java.awt.event.ActionEvent;
 import java.awt.event.ItemEvent;
@@ -60,7 +59,6 @@
 import org.graalvm.visualvm.heapviewer.ui.PluggableTreeTableView;
 import org.graalvm.visualvm.heapviewer.ui.TreeTableViewColumn;
 import javax.swing.AbstractAction;
-import javax.swing.BorderFactory;
 import javax.swing.JPopupMenu;
 import javax.swing.SwingUtilities;
 import org.openide.util.NbBundle;
@@ -259,9 +257,7 @@ protected void fireItemStateChanged(ItemEvent e) {
 
         component = new JPanel(new CardLayout());
         component.add(objectsView.getComponent());
-        JComponent html = htmlView.getComponent();
-        html.setBorder(BorderFactory.createEmptyBorder(0, 10, 0, 10));
-        component.add(new ScrollableContainer(html));
+        component.add(htmlView.getComponent());
     }
 
 

visualvm/heapviewer/src/org/graalvm/visualvm/heapviewer/ui/HTMLView.java

@@ -36,6 +36,7 @@
 import java.util.Collection;
 import java.util.Objects;
 import java.util.concurrent.ExecutionException;
+import javax.swing.BorderFactory;
 import javax.swing.JComponent;
 import javax.swing.JPanel;
 import javax.swing.JPopupMenu;
@@ -50,6 +51,8 @@
 import org.graalvm.visualvm.heapviewer.model.HeapViewerNode;
 import org.graalvm.visualvm.heapviewer.swing.HTMLTextComponent;
 import javax.swing.text.DefaultCaret;
+import org.graalvm.visualvm.core.ui.components.ScrollableContainer;
+import org.graalvm.visualvm.lib.ui.components.HTMLTextAreaSearchUtils;
 import org.openide.util.Exceptions;
 import org.openide.util.Lookup;
 
@@ -104,6 +107,7 @@ public void setText(String text) {
         currentText = text;
         if (htmlComponent != null) {
             htmlComponent.setText(currentText);
+            HTMLTextAreaSearchUtils.textChanged(htmlComponent);
             String _text = htmlComponent.getText();
             if (_text != null && _text.length() > 0) try {
                 htmlComponent.setCaretPosition(0);
@@ -229,9 +233,14 @@ public void setSelectionVisible(boolean visible) {
 
         if (currentText != null) htmlComponent.setText(currentText);
 
+        JPanel container = new JPanel(new BorderLayout());
+        container.setBackground(htmlComponent.getBackground());
+        container.add(htmlComponent, BorderLayout.CENTER);
+        container.setBorder(BorderFactory.createEmptyBorder(0, 10, 0, 10));
+        
         component = new JPanel(new BorderLayout());
-        component.setBackground(htmlComponent.getBackground());
-        component.add(htmlComponent, BorderLayout.CENTER);
+        component.add(new ScrollableContainer(container), BorderLayout.CENTER);
+        component.add(HTMLTextAreaSearchUtils.createSearchPanel(htmlComponent), BorderLayout.SOUTH);
     }
 
 

visualvm/libs.profiler/lib.profiler.ui/manifest.mf

@@ -1,5 +1,5 @@
 Manifest-Version: 1.0
 OpenIDE-Module: org.graalvm.visualvm.lib.ui/1
 OpenIDE-Module-Localizing-Bundle: org/graalvm/visualvm/lib/ui/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.148
+OpenIDE-Module-Specification-Version: 1.149
 

visualvm/libs.profiler/lib.profiler.ui/nbproject/project.xml

@@ -83,7 +83,7 @@ made subject to such option by the copyright holder.
                     <compile-dependency/>
                     <run-dependency>
                         <release-version>1</release-version>
-                        <specification-version>1.45</specification-version>
+                        <specification-version>1.52</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
@@ -128,6 +128,7 @@ made subject to such option by the copyright holder.
                 <friend>org.graalvm.visualvm.profiler</friend>
                 <friend>org.graalvm.visualvm.profiling</friend>
                 <friend>org.graalvm.visualvm.sampler</friend>
+                <friend>org.graalvm.visualvm.threaddump</friend>
                 <friend>org.graalvm.visualvm.uisupport</friend>
                 <package>org.graalvm.visualvm.lib.ui</package>
                 <package>org.graalvm.visualvm.lib.ui.charts</package>