import classes

Author: thurka

visualvm/applicationviews/src/org/graalvm/visualvm/application/views/threads/ApplicationThreadsView.java

@@ -55,6 +55,7 @@
 import org.graalvm.visualvm.lib.profiler.api.ProfilerDialogs;
 import org.graalvm.visualvm.lib.ui.components.ProfilerToolbar;
 import org.graalvm.visualvm.lib.ui.swing.ActionPopupButton;
+import org.graalvm.visualvm.lib.ui.swing.FilterUtils;
 import org.graalvm.visualvm.lib.ui.swing.GrayLabel;
 import org.graalvm.visualvm.lib.ui.swing.SearchUtils;
 import org.graalvm.visualvm.lib.ui.threads.ThreadsPanel;
@@ -347,7 +348,7 @@ protected void filterSelected(ThreadsPanel.Filter filter) {
             InputMap inputMap = getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT);
             ActionMap actionMap = getActionMap();
 
-            final String filterKey = org.graalvm.visualvm.lib.ui.swing.FilterUtils.FILTER_ACTION_KEY;
+            final String filterKey = FilterUtils.FILTER_ACTION_KEY;
             Action filterAction = new AbstractAction() {
                 public void actionPerformed(ActionEvent e) {
                     Action action = threadsPanel.getActionMap().get(filterKey);

visualvm/core/src/org/graalvm/visualvm/core/snapshot/SnapshotsSupport.java

@@ -34,6 +34,7 @@
 import javax.swing.JFileChooser;
 import javax.swing.SwingUtilities;
 import org.graalvm.visualvm.core.VisualVM;
+import org.graalvm.visualvm.lib.jfluid.utils.StringUtils;
 import org.netbeans.api.progress.ProgressHandle;
 import org.graalvm.visualvm.lib.profiler.api.ProfilerDialogs;
 import org.openide.util.ImageUtilities;
@@ -112,7 +113,7 @@ public void run() {
      * @return timestamp String (typically used in Snaphshot filename).
      */
     public String getTimeStamp(long time) {
-        return org.graalvm.visualvm.lib.jfluid.utils.StringUtils.formatUserDate(new Date(time));
+        return StringUtils.formatUserDate(new Date(time));
     }
 
     /**

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

@@ -65,6 +65,7 @@
 import org.graalvm.visualvm.heapviewer.utils.HeapUtils;
 import org.graalvm.visualvm.lib.jfluid.heap.Heap;
 import org.graalvm.visualvm.lib.profiler.api.ActionsSupport;
+import org.graalvm.visualvm.lib.ui.swing.FilterUtils;
 import org.graalvm.visualvm.lib.ui.swing.ProfilerTableContainer;
 import org.graalvm.visualvm.lib.ui.swing.ProfilerTreeTableModel;
 import org.graalvm.visualvm.lib.ui.swing.renderer.LabelRenderer;
@@ -692,7 +693,7 @@ private void registerActions() {
         InputMap inputMap = treeTable.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT);
         ActionMap actionMap = treeTable.getActionMap();
 
-        final String filterKey = org.graalvm.visualvm.lib.ui.swing.FilterUtils.FILTER_ACTION_KEY;
+        final String filterKey = FilterUtils.FILTER_ACTION_KEY;
         Action filterAction = new AbstractAction() {
             public void actionPerformed(ActionEvent e) { activateFilter(); }
         };

visualvm/jfr/src/org/graalvm/visualvm/jfr/views/sampler/MemorySamplerViewSupport.java

@@ -232,7 +232,7 @@ protected void populatePopup(JPopupMenu popup, Object value, Object userValue) {
                 InputMap inputMap = getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT);
                 ActionMap actionMap = getActionMap();
 
-                final String filterKey = org.graalvm.visualvm.lib.ui.swing.FilterUtils.FILTER_ACTION_KEY;
+                final String filterKey = FilterUtils.FILTER_ACTION_KEY;
                 Action filterAction = new AbstractAction() {
                     public void actionPerformed(ActionEvent e) {
                         HeapViewSupport.this.activateFilter();

visualvm/libs.profiler/profiler.heapwalker/src/org/graalvm/visualvm/lib/profiler/heapwalk/ui/icons/impl/HeapWalkerIconsProviderImpl.java

@@ -27,12 +27,13 @@
 import org.graalvm.visualvm.lib.profiler.heapwalk.ui.icons.HeapWalkerIcons;
 import java.util.Map;
 import org.graalvm.visualvm.lib.profiler.spi.IconsProvider;
+import org.openide.util.lookup.ServiceProvider;
 
 /**
  *
  * @author Jiri Sedlacek
  */
-@org.openide.util.lookup.ServiceProvider(service=org.graalvm.visualvm.lib.profiler.spi.IconsProvider.class)
+@ServiceProvider(service=IconsProvider.class)
 public final class HeapWalkerIconsProviderImpl extends IconsProvider.Basic {
 
     @Override

visualvm/libs.profiler/profiler.snaptracer/src/org/graalvm/visualvm/lib/profiler/snaptracer/impl/IdeSnapshotAction.java

@@ -42,6 +42,7 @@
 import org.graalvm.visualvm.lib.profiler.ResultsManager;
 import org.graalvm.visualvm.lib.profiler.api.ActionsSupport;
 import org.graalvm.visualvm.lib.profiler.api.ProfilerDialogs;
+import org.graalvm.visualvm.lib.ui.swing.FilterUtils;
 import org.openide.filesystems.FileObject;
 import org.openide.filesystems.FileUtil;
 import org.openide.util.NbBundle;
@@ -103,7 +104,7 @@ private static TopComponent ui(TracerModel model, TracerController controller, F
         InputMap inputMap = tc.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT);
         ActionMap actionMap = tc.getActionMap();
 
-        final String filterKey = org.graalvm.visualvm.lib.ui.swing.FilterUtils.FILTER_ACTION_KEY;
+        final String filterKey = FilterUtils.FILTER_ACTION_KEY;
         Action filterAction = new AbstractAction() {
             public void actionPerformed(ActionEvent e) {
                 Action action = tracer.getActionMap().get(filterKey);

visualvm/libs.profiler/profiler.snaptracer/src/org/graalvm/visualvm/lib/profiler/snaptracer/impl/icons/TracerIconsProviderImpl.java

@@ -26,12 +26,13 @@
 
 import java.util.Map;
 import org.graalvm.visualvm.lib.profiler.spi.IconsProvider;
+import org.openide.util.lookup.ServiceProvider;
 
 /**
  *
  * @author Jiri Sedlacek
  */
-@org.openide.util.lookup.ServiceProvider(service=org.graalvm.visualvm.lib.profiler.spi.IconsProvider.class)
+@ServiceProvider(service=IconsProvider.class)
 public final class TracerIconsProviderImpl extends IconsProvider.Basic {
 
     @Override

visualvm/libs.profiler/profiler/src/org/graalvm/visualvm/lib/profiler/SnapshotResultsWindow.java

@@ -61,6 +61,7 @@
 import org.graalvm.visualvm.lib.profiler.api.icons.ProfilerIcons;
 import org.graalvm.visualvm.lib.profiler.v2.ProfilerFeature;
 import org.graalvm.visualvm.lib.profiler.v2.ProfilerSession;
+import org.graalvm.visualvm.lib.ui.swing.FilterUtils;
 import org.netbeans.spi.actions.AbstractSavable;
 import org.openide.DialogDescriptor;
 import org.openide.DialogDisplayer;
@@ -680,7 +681,7 @@ private void registerActions(final JComponent view) {
         InputMap inputMap = getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT);
         ActionMap actionMap = getActionMap();
 
-        final String filterKey = org.graalvm.visualvm.lib.ui.swing.FilterUtils.FILTER_ACTION_KEY;
+        final String filterKey = FilterUtils.FILTER_ACTION_KEY;
         Action filterAction = new AbstractAction() {
             public void actionPerformed(ActionEvent e) {
                 Action action = view.getActionMap().get(filterKey);

visualvm/libs.profiler/profiler/src/org/graalvm/visualvm/lib/profiler/impl/ProfilerDialogsProviderImpl.java

@@ -28,12 +28,13 @@
 import org.graalvm.visualvm.lib.profiler.ui.NBHTMLLabel;
 import org.openide.DialogDisplayer;
 import org.openide.NotifyDescriptor;
+import org.openide.util.lookup.ServiceProvider;
 
 /**
  *
  * @author Jiri Sedlacek
  */
-@org.openide.util.lookup.ServiceProvider(service=org.graalvm.visualvm.lib.profiler.spi.ProfilerDialogsProvider.class)
+@ServiceProvider(service=ProfilerDialogsProvider.class)
 public final class ProfilerDialogsProviderImpl extends ProfilerDialogsProvider {
 
     @Override

visualvm/libs.profiler/profiler/src/org/graalvm/visualvm/lib/profiler/v2/ProfilerWindow.java

@@ -91,6 +91,7 @@
 import org.graalvm.visualvm.lib.profiler.v2.impl.WelcomePanel;
 import org.graalvm.visualvm.lib.profiler.v2.ui.DropdownButton;
 import org.graalvm.visualvm.lib.profiler.v2.ui.ToggleButtonMenuItem;
+import org.graalvm.visualvm.lib.ui.swing.FilterUtils;
 import org.openide.filesystems.FileObject;
 import org.openide.util.Exceptions;
 import org.openide.util.HelpCtx;
@@ -314,7 +315,7 @@ private void registerActions() {
         InputMap inputMap = getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT);
         ActionMap actionMap = getActionMap();
 
-        final String filterKey = org.graalvm.visualvm.lib.ui.swing.FilterUtils.FILTER_ACTION_KEY;
+        final String filterKey = FilterUtils.FILTER_ACTION_KEY;
         Action filterAction = new AbstractAction() {
             public void actionPerformed(ActionEvent e) {
                 ProfilerFeature feature = featuresView.getSelectedFeature();