HeapViewer UI cleanup - use ScrollableContainer where possible

Author: jisedlac

visualvm/heapviewer/nbproject/genfiles.properties

@@ -1,8 +1,8 @@
-build.xml.data.CRC32=af541590
+build.xml.data.CRC32=6fac9eed
 build.xml.script.CRC32=018997e7
 build.xml.stylesheet.CRC32=[email protected]
 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
-nbproject/build-impl.xml.data.CRC32=af541590
+nbproject/build-impl.xml.data.CRC32=6fac9eed
 nbproject/build-impl.xml.script.CRC32=98bf6af8
 nbproject/build-impl.xml.stylesheet.CRC32=[email protected]

visualvm/heapviewer/nbproject/project.xml

@@ -6,6 +6,15 @@
             <code-name-base>com.sun.tools.visualvm.heapviewer</code-name-base>
             <suite-component/>
             <module-dependencies>
+                <dependency>
+                    <code-name-base>com.sun.tools.visualvm.core</code-name-base>
+                    <build-prerequisite/>
+                    <compile-dependency/>
+                    <run-dependency>
+                        <release-version>0</release-version>
+                        <specification-version>1.0</specification-version>
+                    </run-dependency>
+                </dependency>
                 <dependency>
                     <code-name-base>org.netbeans.api.progress</code-name-base>
                     <build-prerequisite/>

visualvm/heapviewer/src/com/sun/tools/visualvm/heapviewer/java/impl/JavaHeapSummaryView.java

@@ -25,16 +25,15 @@
 
 package com.sun.tools.visualvm.heapviewer.java.impl;
 
+import com.sun.tools.visualvm.core.ui.components.ScrollableContainer;
 import java.text.NumberFormat;
 import java.util.Collection;
 import javax.swing.BorderFactory;
 import javax.swing.JComponent;
-import javax.swing.JScrollPane;
 import org.netbeans.lib.profiler.heap.Heap;
 import org.netbeans.lib.profiler.heap.HeapSummary;
 import org.netbeans.lib.profiler.heap.Instance;
 import org.netbeans.lib.profiler.heap.JavaClass;
-import org.netbeans.lib.profiler.ui.UIUtils;
 import org.netbeans.lib.profiler.ui.components.HTMLTextArea;
 import org.netbeans.lib.profiler.ui.components.ProfilerToolbar;
 import org.netbeans.modules.profiler.api.icons.Icons;
@@ -111,14 +110,9 @@ private void init() {
         HTMLTextArea text = new HTMLTextArea();
         text.setText(createSummary());
         text.setCaretPosition(0);
+        text.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
 
-        JScrollPane textScroll = new JScrollPane(text);
-        textScroll.setBorder(BorderFactory.createMatteBorder(5, 5, 5, 5, UIUtils.getProfilerResultsBackground()));
-        textScroll.setViewportBorder(BorderFactory.createEmptyBorder());
-        textScroll.getHorizontalScrollBar().setUnitIncrement(16);
-        textScroll.getVerticalScrollBar().setUnitIncrement(16);
-        
-        component = textScroll;
+        component = new ScrollableContainer(text);
     }
 
 

visualvm/heapviewer/src/com/sun/tools/visualvm/heapviewer/java/impl/JavaThreadsView.java

@@ -25,16 +25,15 @@
 
 package com.sun.tools.visualvm.heapviewer.java.impl;
 
+import com.sun.tools.visualvm.core.ui.components.ScrollableContainer;
 import java.awt.CardLayout;
 import java.awt.event.ActionEvent;
 import java.awt.event.ItemEvent;
 import java.net.URL;
 import java.util.List;
-import javax.swing.BorderFactory;
 import javax.swing.ButtonGroup;
 import javax.swing.JComponent;
 import javax.swing.JPanel;
-import javax.swing.JScrollPane;
 import javax.swing.JToggleButton;
 import javax.swing.SortOrder;
 import org.netbeans.lib.profiler.heap.GCRoot;
@@ -184,17 +183,9 @@ protected void fireItemStateChanged(ItemEvent e) {
             toolbar.add(pluginsToolbar);
         }
 
-        JScrollPane htmlViewScroll = new JScrollPane(htmlView.getComponent(),
-                                JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED,
-                                JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED);
-        htmlViewScroll.setBorder(BorderFactory.createEmptyBorder());
-        htmlViewScroll.setViewportBorder(BorderFactory.createEmptyBorder());
-        htmlViewScroll.getVerticalScrollBar().setUnitIncrement(10);
-        htmlViewScroll.getHorizontalScrollBar().setUnitIncrement(10);
-
         component = new JPanel(new CardLayout());
         component.add(objectsView.getComponent());
-        component.add(htmlViewScroll);
+        component.add(new ScrollableContainer(htmlView.getComponent()));
     }
 
 

visualvm/heapviewer/src/com/sun/tools/visualvm/heapviewer/oql/OQLConsoleView.java

@@ -25,6 +25,7 @@
 
 package com.sun.tools.visualvm.heapviewer.oql;
 
+import com.sun.tools.visualvm.core.ui.components.ScrollableContainer;
 import java.awt.BorderLayout;
 import java.awt.CardLayout;
 import java.awt.Color;
@@ -56,7 +57,6 @@
 import javax.swing.JLabel;
 import javax.swing.JPanel;
 import javax.swing.JProgressBar;
-import javax.swing.JScrollPane;
 import javax.swing.JTextField;
 import javax.swing.JToggleButton;
 import javax.swing.SortOrder;
@@ -97,6 +97,7 @@
 import com.sun.tools.visualvm.heapviewer.ui.PluggableTreeTableView;
 import com.sun.tools.visualvm.heapviewer.ui.TreeTableViewColumn;
 import com.sun.tools.visualvm.heapviewer.utils.HeapUtils;
+import javax.swing.JScrollPane;
 import org.netbeans.modules.profiler.oql.engine.api.OQLEngine;
 import org.netbeans.modules.profiler.oql.engine.api.OQLEngine.ObjectVisitor;
 import org.netbeans.modules.profiler.oql.engine.api.OQLException;
@@ -682,6 +683,7 @@ public void setBackground(Color c) {
             editorScroll.getHorizontalScrollBar().setUnitIncrement(10);
 
             add(editorScroll, BorderLayout.CENTER);
+//            add(new ScrollableContainer(editorContainer), BorderLayout.CENTER);
         }
 
     }
@@ -691,15 +693,7 @@ private class ResultsView extends JPanel {
         ResultsView(JComponent results) {
             super(new BorderLayout());
 
-            JScrollPane resultsAreaScroll = new JScrollPane(results,
-                                    JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED,
-                                    JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED);
-            resultsAreaScroll.setBorder(BorderFactory.createEmptyBorder());
-            resultsAreaScroll.setViewportBorder(BorderFactory.createEmptyBorder());
-            resultsAreaScroll.getVerticalScrollBar().setUnitIncrement(10);
-            resultsAreaScroll.getHorizontalScrollBar().setUnitIncrement(10);
-            
-            add(resultsAreaScroll, BorderLayout.CENTER);
+            add(new ScrollableContainer(results), BorderLayout.CENTER);
         }
 
     }

visualvm/heapviewer/src/com/sun/tools/visualvm/heapviewer/ui/HeapDumpInfoAction.java

@@ -25,6 +25,7 @@
 
 package com.sun.tools.visualvm.heapviewer.ui;
 
+import com.sun.tools.visualvm.core.ui.components.ScrollableContainer;
 import java.awt.Dimension;
 import org.openide.util.NbBundle;
 import java.awt.event.ActionEvent;
@@ -42,20 +43,18 @@
 import java.util.concurrent.TimeoutException;
 import javax.swing.AbstractAction;
 import javax.swing.Action;
-import javax.swing.BorderFactory;
 import javax.swing.JComponent;
-import javax.swing.JScrollPane;
 import javax.swing.SwingWorker;
 import org.netbeans.lib.profiler.heap.Heap;
 import org.netbeans.lib.profiler.heap.HeapSummary;
 import org.netbeans.lib.profiler.heap.Instance;
 import org.netbeans.lib.profiler.heap.JavaClass;
-import org.netbeans.lib.profiler.ui.UIUtils;
 import org.netbeans.lib.profiler.ui.components.HTMLTextArea;
 import org.netbeans.modules.profiler.api.icons.GeneralIcons;
 import org.netbeans.modules.profiler.api.icons.Icons;
 import org.netbeans.modules.profiler.heapwalk.ui.icons.HeapWalkerIcons;
 import com.sun.tools.visualvm.heapviewer.HeapViewer;
+import javax.swing.BorderFactory;
 import org.openide.DialogDescriptor;
 import org.openide.DialogDisplayer;
 import org.openide.util.Exceptions;
@@ -122,18 +121,11 @@ public void actionPerformed(ActionEvent e) {
 
     private static JComponent infoComponent(final HeapViewer heapViewer) {
         HTMLTextArea text = new HTMLTextArea();
+        text.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
         createInfo(text, heapViewer);
-//        SwingUtilities.invokeLater(new Runnable() {
-//            public void run() { createInfo(text, heapViewer); }
-//        });
 
-        JScrollPane textScroll = new JScrollPane(text);
-        textScroll.setBorder(BorderFactory.createEmptyBorder());
-        textScroll.setViewportBorder(BorderFactory.createMatteBorder(5, 5, 5, 5, UIUtils.getProfilerResultsBackground()));
-        textScroll.getHorizontalScrollBar().setUnitIncrement(16);
-        textScroll.getVerticalScrollBar().setUnitIncrement(16);
+        ScrollableContainer textScroll = new ScrollableContainer(text);
         textScroll.setPreferredSize(new Dimension(750, 400));
-        
         return textScroll;
     }