Skip to content

Commit a495358

Browse files
committed
Replace RequestProcessor.getDefault().post() and new RequestProcessor().post() by VisualVM.getInstance().runTask()
1 parent 0d30078 commit a495358

File tree

37 files changed

+116
-124
lines changed

37 files changed

+116
-124
lines changed

visualvm/application/src/org/graalvm/visualvm/application/ApplicationSupport.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,13 @@
2525

2626
package org.graalvm.visualvm.application;
2727

28-
import org.graalvm.visualvm.application.jvm.Jvm;
2928
import org.graalvm.visualvm.core.datasource.descriptor.DataSourceDescriptor;
3029
import org.graalvm.visualvm.core.datasource.descriptor.DataSourceDescriptorFactory;
3130
import org.graalvm.visualvm.core.properties.PropertiesSupport;
3231
import org.graalvm.visualvm.host.Host;
3332
import org.graalvm.visualvm.host.LocalHostDescriptor;
3433
import java.lang.management.ManagementFactory;
35-
import org.openide.util.RequestProcessor;
34+
import org.graalvm.visualvm.core.VisualVM;
3635
import org.openide.windows.WindowManager;
3736

3837
/**
@@ -57,7 +56,7 @@ Application createCurrentApplication() {
5756
private void initCurrentApplication() {
5857
WindowManager.getDefault().invokeWhenUIReady(new Runnable() {
5958
public void run() {
60-
RequestProcessor.getDefault().post(new Runnable() {
59+
VisualVM.getInstance().runTask(new Runnable() {
6160
public void run() {
6261
// Initialize sorting
6362
DataSourceDescriptor localHostDescriptor =

visualvm/application/src/org/graalvm/visualvm/application/snapshot/ApplicationSnapshot.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,10 @@
3232
import java.io.File;
3333
import javax.swing.JFileChooser;
3434
import javax.swing.SwingUtilities;
35+
import org.graalvm.visualvm.core.VisualVM;
3536
import org.netbeans.api.progress.ProgressHandle;
3637
import org.netbeans.api.progress.ProgressHandleFactory;
3738
import org.openide.util.NbBundle;
38-
import org.openide.util.RequestProcessor;
3939
import org.openide.windows.WindowManager;
4040

4141
/**
@@ -80,7 +80,7 @@ public void saveAs() {
8080
String filePath = chooser.getSelectedFile().getAbsolutePath();
8181
if (!filePath.endsWith(categorySuffix)) filePath += categorySuffix;
8282
final File file = new File(filePath);
83-
RequestProcessor.getDefault().post(new Runnable() {
83+
VisualVM.getInstance().runTask(new Runnable() {
8484
public void run() {
8585
ProgressHandle pHandle = null;
8686
try {

visualvm/application/src/org/graalvm/visualvm/application/snapshot/ApplicationSnapshotProvider.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,12 +42,12 @@
4242
import java.util.logging.Level;
4343
import java.util.logging.Logger;
4444
import javax.swing.SwingUtilities;
45+
import org.graalvm.visualvm.core.VisualVM;
4546
import org.netbeans.api.progress.ProgressHandle;
4647
import org.netbeans.api.progress.ProgressHandleFactory;
4748
import org.openide.DialogDisplayer;
4849
import org.openide.NotifyDescriptor;
4950
import org.openide.util.NbBundle;
50-
import org.openide.util.RequestProcessor;
5151

5252
/**
5353
*
@@ -77,7 +77,7 @@ private ApplicationSnapshotProvider() {
7777
}
7878

7979
void createSnapshot(final Application application, final boolean openSnapshot) {
80-
RequestProcessor.getDefault().post(new Runnable() {
80+
VisualVM.getInstance().runTask(new Runnable() {
8181
public void run() {
8282
ProgressHandle pHandle = null;
8383
try {
@@ -181,7 +181,7 @@ private void processApplicationSnapshotImpl(final File archive, final boolean de
181181
final boolean openSnapshot) {
182182
// TODO: check if the same snapshot isn't already imported
183183

184-
RequestProcessor.getDefault().post(new Runnable() {
184+
VisualVM.getInstance().runTask(new Runnable() {
185185
public void run() {
186186
ProgressHandle pHandle = null;
187187
try {
@@ -252,7 +252,7 @@ private void loadSnapshots() {
252252

253253

254254
void initialize() {
255-
RequestProcessor.getDefault().post(new Runnable() {
255+
VisualVM.getInstance().runTask(new Runnable() {
256256
public void run() { loadSnapshots(); }
257257
});
258258
}

visualvm/applicationviews/src/org/graalvm/visualvm/application/views/monitor/ApplicationMonitorModel.java

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -47,15 +47,14 @@
4747
import java.io.InputStream;
4848
import java.io.OutputStream;
4949
import java.lang.management.MemoryMXBean;
50-
import java.lang.management.OperatingSystemMXBean;
5150
import java.util.ArrayList;
5251
import java.util.Collections;
5352
import java.util.List;
5453
import javax.swing.SwingUtilities;
5554
import javax.swing.event.ChangeEvent;
5655
import javax.swing.event.ChangeListener;
56+
import org.graalvm.visualvm.core.VisualVM;
5757
import org.openide.util.NbBundle;
58-
import org.openide.util.RequestProcessor;
5958

6059

6160
/**
@@ -226,7 +225,7 @@ public synchronized void initialize() {
226225
public void registerCpuChartSupport(final SimpleXYChartSupport cpuChartSupport) {
227226
this.cpuChartSupport = cpuChartSupport;
228227
if (cpuChartSupport != null && source instanceof Snapshot)
229-
RequestProcessor.getDefault().post(new Runnable() {
228+
VisualVM.getInstance().runTask(new Runnable() {
230229
public void run() {
231230
File file = new File(source.getStorage().getDirectory(), CPU_CHART_STORAGE);
232231
if (file.isFile()) loadChartSupport(cpuChartSupport, file);
@@ -237,7 +236,7 @@ public void run() {
237236
public void registerHeapChartSupport(final SimpleXYChartSupport heapChartSupport) {
238237
this.heapChartSupport = heapChartSupport;
239238
if (heapChartSupport != null && source instanceof Snapshot)
240-
RequestProcessor.getDefault().post(new Runnable() {
239+
VisualVM.getInstance().runTask(new Runnable() {
241240
public void run() {
242241
File file = new File(source.getStorage().getDirectory(), HEAP_CHART_STORAGE);
243242
if (file.isFile()) loadChartSupport(heapChartSupport, file);
@@ -248,7 +247,7 @@ public void run() {
248247
public void registerPermGenChartSupport(final SimpleXYChartSupport permgenChartSupport) {
249248
this.permGenChartSupport = permgenChartSupport;
250249
if (permGenChartSupport != null && source instanceof Snapshot)
251-
RequestProcessor.getDefault().post(new Runnable() {
250+
VisualVM.getInstance().runTask(new Runnable() {
252251
public void run() {
253252
File file = new File(source.getStorage().getDirectory(), PERMGEN_CHART_STORAGE);
254253
if (file.isFile()) loadChartSupport(permGenChartSupport, file);
@@ -259,7 +258,7 @@ public void run() {
259258
public void registerClassesChartSupport(final SimpleXYChartSupport classesChartSupport) {
260259
this.classesChartSupport = classesChartSupport;
261260
if (classesChartSupport != null && source instanceof Snapshot)
262-
RequestProcessor.getDefault().post(new Runnable() {
261+
VisualVM.getInstance().runTask(new Runnable() {
263262
public void run() {
264263
File file = new File(source.getStorage().getDirectory(), CLASSES_CHART_STORAGE);
265264
if (file.isFile()) loadChartSupport(classesChartSupport, file);
@@ -270,7 +269,7 @@ public void run() {
270269
public void registerThreadsChartSupport(final SimpleXYChartSupport threadsChartSupport) {
271270
this.threadsChartSupport = threadsChartSupport;
272271
if (threadsChartSupport != null && source instanceof Snapshot)
273-
RequestProcessor.getDefault().post(new Runnable() {
272+
VisualVM.getInstance().runTask(new Runnable() {
274273
public void run() {
275274
File file = new File(source.getStorage().getDirectory(), THREADS_CHART_STORAGE);
276275
if (file.isFile()) loadChartSupport(threadsChartSupport, file);

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

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,6 @@
6868
import org.graalvm.visualvm.lib.profiler.api.ProfilerDialogs;
6969
import org.openide.util.ImageUtilities;
7070
import org.openide.util.NbBundle;
71-
import org.openide.util.RequestProcessor;
7271
import org.openide.util.WeakListeners;
7372

7473
/**
@@ -185,8 +184,6 @@ public void run() {
185184

186185
private static class MasterViewSupport extends JPanel implements DataRemovedListener<Application>, PropertyChangeListener {
187186

188-
private static RequestProcessor worker = null;
189-
190187
private Application application;
191188
private HTMLTextArea area;
192189
private HTMLTextArea alertArea;
@@ -298,11 +295,6 @@ private void updateThreadsCounts(int liveThreads, int daemonThreads) {
298295
area.select(selStart, selEnd);
299296
}
300297

301-
private static synchronized RequestProcessor getWorker() {
302-
if (worker == null) worker = new RequestProcessor("ThreadsWorker", 1); // NOI18N
303-
return worker;
304-
}
305-
306298
}
307299

308300
// --- Timeline ------------------------------------------------------------

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,10 @@
3535
import java.util.Set;
3636
import java.util.logging.Logger;
3737
import javax.swing.SwingUtilities;
38+
import org.graalvm.visualvm.core.VisualVM;
3839
import org.graalvm.visualvm.lib.jfluid.client.MonitoredData;
3940
import org.graalvm.visualvm.lib.jfluid.global.CommonConstants;
4041
import org.graalvm.visualvm.lib.jfluid.wireprotocol.MonitoredNumbersResponse;
41-
import org.openide.util.RequestProcessor;
4242

4343
/**
4444
*
@@ -72,7 +72,7 @@ void refreshThreadsAsync() {
7272
if (refreshRunning) return;
7373
refreshRunning = true;
7474
}
75-
RequestProcessor.getDefault().post(new Runnable() {
75+
VisualVM.getInstance().runTask(new Runnable() {
7676
public void run() {
7777
long[] oldDeadlockThreadIds = deadlockThreadIds;
7878

visualvm/appui/src/org/graalvm/visualvm/modules/appui/about/AboutDialogControls.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,11 @@
4343
import javax.swing.JOptionPane;
4444
import javax.swing.JPanel;
4545
import javax.swing.SwingUtilities;
46+
import org.graalvm.visualvm.core.VisualVM;
4647
import org.netbeans.api.progress.ProgressHandle;
4748
import org.netbeans.api.progress.ProgressHandleFactory;
4849
import org.openide.awt.Mnemonics;
4950
import org.openide.util.NbBundle;
50-
import org.openide.util.RequestProcessor;
5151
import org.openide.windows.WindowManager;
5252

5353
/**
@@ -245,7 +245,7 @@ private void saveFileAs(final File file) {
245245
final File copy = chooser.getSelectedFile();
246246
// if (copy.isFile()) // TODO: show a confirmation dialog for already existing file
247247
lastLogfileSave = copy.getAbsolutePath();
248-
RequestProcessor.getDefault().post(new Runnable() {
248+
VisualVM.getInstance().runTask(new Runnable() {
249249
public void run() {
250250
ProgressHandle pHandle = null;
251251
try {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,12 @@
3333
import java.util.Date;
3434
import javax.swing.JFileChooser;
3535
import javax.swing.SwingUtilities;
36+
import org.graalvm.visualvm.core.VisualVM;
3637
import org.netbeans.api.progress.ProgressHandle;
3738
import org.netbeans.api.progress.ProgressHandleFactory;
3839
import org.graalvm.visualvm.lib.profiler.api.ProfilerDialogs;
3940
import org.openide.util.ImageUtilities;
4041
import org.openide.util.NbBundle;
41-
import org.openide.util.RequestProcessor;
4242
import org.openide.windows.WindowManager;
4343

4444
/**
@@ -86,7 +86,7 @@ public void saveAs(final Snapshot snapshot, String dialogTitle) {
8686
String filePath = chooser.getSelectedFile().getAbsolutePath();
8787
if (!filePath.endsWith(categorySuffix)) filePath += categorySuffix;
8888
final File copy = new File(filePath);
89-
RequestProcessor.getDefault().post(new Runnable() {
89+
VisualVM.getInstance().runTask(new Runnable() {
9090
public void run() {
9191
ProgressHandle pHandle = null;
9292
try {

visualvm/core/src/org/graalvm/visualvm/core/ui/actions/LoadRecentSnapshot.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,12 @@
3636
import javax.swing.JMenuItem;
3737
import javax.swing.SwingUtilities;
3838
import javax.swing.filechooser.FileFilter;
39+
import org.graalvm.visualvm.core.VisualVM;
3940
import org.graalvm.visualvm.lib.profiler.api.ProfilerDialogs;
4041
import org.openide.awt.Mnemonics;
4142
import org.openide.awt.StatusDisplayer;
4243
import org.openide.util.NbBundle;
4344
import org.openide.util.NbPreferences;
44-
import org.openide.util.RequestProcessor;
4545
import org.openide.util.actions.Presenter;
4646

4747
/**
@@ -163,7 +163,7 @@ protected void fireStateChanged() {
163163

164164
@Override
165165
protected void fireActionPerformed(ActionEvent e) {
166-
RequestProcessor.getDefault().post(new Runnable() {
166+
VisualVM.getInstance().runTask(new Runnable() {
167167
public void run() {
168168
if (file.exists()) {
169169
List<SnapshotCategory> categories = RegisteredSnapshotCategories.sharedInstance().getOpenSnapshotCategories();

visualvm/coredump/src/org/graalvm/visualvm/coredump/impl/CoreDumpProvider.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,13 +48,13 @@
4848
import javax.swing.JPanel;
4949
import javax.swing.JScrollPane;
5050
import javax.swing.SwingUtilities;
51+
import org.graalvm.visualvm.core.VisualVM;
5152
import org.netbeans.api.progress.ProgressHandle;
5253
import org.netbeans.api.progress.ProgressHandleFactory;
5354
import org.graalvm.visualvm.lib.ui.SwingWorker;
5455
import org.openide.DialogDisplayer;
5556
import org.openide.NotifyDescriptor;
5657
import org.openide.util.NbBundle;
57-
import org.openide.util.RequestProcessor;
5858
import org.openide.windows.WindowManager;
5959

6060
/**
@@ -116,7 +116,7 @@ protected void done() {
116116
}
117117

118118
static void createCoreDump(final String coreDumpFile, final String displayName, final String jdkHome, final boolean deleteCoreDump) {
119-
RequestProcessor.getDefault().post(new Runnable() {
119+
VisualVM.getInstance().runTask(new Runnable() {
120120
public void run() {
121121
createCoreDumpImpl(coreDumpFile, displayName, jdkHome, deleteCoreDump);
122122
}
@@ -237,7 +237,7 @@ public boolean accept(File dir, String name) {
237237
}
238238

239239
private static void notifyUnresolvedCoreDumps(final Set<File> unresolvedCoreDumpsF, final Set<String> unresolvedCoreDumpsS) {
240-
RequestProcessor.getDefault().post(new Runnable() {
240+
VisualVM.getInstance().runTask(new Runnable() {
241241
public void run() {
242242
JPanel messagePanel = new JPanel(new BorderLayout(5, 5));
243243
messagePanel.add(new JLabel(NbBundle.getMessage(CoreDumpProvider.class, "MSG_Unresolved_CoreDumps")), BorderLayout.NORTH); // NOI18N
@@ -265,7 +265,7 @@ public static void register() {
265265
final CoreDumpProvider provider = new CoreDumpProvider();
266266
WindowManager.getDefault().invokeWhenUIReady(new Runnable() {
267267
public void run() {
268-
RequestProcessor.getDefault().post(new Runnable() {
268+
VisualVM.getInstance().runTask(new Runnable() {
269269
public void run() {
270270
provider.initPersistedCoreDumps();
271271
}

0 commit comments

Comments
 (0)