Skip to content

Commit 17cbdb9

Browse files
jisedlacthurka
authored andcommitted
Fixed sampler & profiler snapshots.
1 parent ab5d594 commit 17cbdb9

File tree

3 files changed

+44
-13
lines changed

3 files changed

+44
-13
lines changed

visualvm/appui/src/com/sun/tools/visualvm/modules/appui/toolbar/ToolbarProvider.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
package com.sun.tools.visualvm.modules.appui.toolbar;
2626

2727
import javax.swing.JComponent;
28+
import org.netbeans.lib.profiler.ui.UIUtils;
2829
import org.netbeans.lib.profiler.ui.components.ProfilerToolbar;
2930
import org.openide.util.lookup.ServiceProvider;
3031

@@ -49,7 +50,9 @@ private VisualVMImpl(boolean showSeparator) {
4950
JComponent comp = component;
5051
if (showSeparator) comp = (JComponent)comp.getComponent(0);
5152

52-
comp.setOpaque(false);
53+
// comp.setOpaque(false);
54+
comp.setOpaque(true);
55+
comp.setBackground(UIUtils.getProfilerResultsBackground());
5356
}
5457

5558
}

visualvm/profiler/src/com/sun/tools/visualvm/profiler/ProfilingResultsSupport.java

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,15 @@
2626

2727
import com.sun.tools.visualvm.core.ui.components.DataViewComponent;
2828
import java.awt.BorderLayout;
29+
import java.io.IOException;
2930
import java.util.ArrayList;
3031
import java.util.List;
3132
import javax.swing.JComponent;
3233
import javax.swing.JPanel;
3334
import org.netbeans.modules.profiler.ResultsListener;
35+
import org.netbeans.modules.profiler.spi.ProfilerStorageProvider;
36+
import org.openide.filesystems.FileObject;
37+
import org.openide.filesystems.FileUtil;
3438
import org.openide.util.Lookup;
3539
import org.openide.util.NbBundle;
3640
import org.openide.util.lookup.ServiceProvider;
@@ -99,4 +103,31 @@ public void resultsReset() {
99103

100104
}
101105

106+
107+
@ServiceProvider(service=ProfilerStorageProvider.class)
108+
public static class VisualVMStorageProvider extends ProfilerStorageProvider.Abstract {
109+
110+
private static final String PROFILER_FOLDER = "NBProfiler/Config"; // NOI18N
111+
private static final String SETTINGS_FOLDER = "Settings"; // NOI18N
112+
113+
public FileObject getGlobalFolder(boolean create) throws IOException {
114+
FileObject folder = FileUtil.getConfigFile(PROFILER_FOLDER);
115+
FileObject settingsFolder = folder.getFileObject(SETTINGS_FOLDER, null);
116+
117+
if ((settingsFolder == null) && create)
118+
settingsFolder = folder.createFolder(SETTINGS_FOLDER);
119+
120+
return settingsFolder;
121+
}
122+
123+
public FileObject getProjectFolder(Lookup.Provider project, boolean create) throws IOException {
124+
return null;
125+
}
126+
127+
public Lookup.Provider getProjectFromFolder(FileObject settingsFolder) {
128+
return null;
129+
}
130+
131+
}
132+
102133
}

visualvm/profiling/src/com/sun/tools/visualvm/profiling/snapshot/ProfilerSnapshotNPS.java

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -32,17 +32,14 @@
3232
import java.lang.reflect.Method;
3333
import java.util.logging.Level;
3434
import java.util.logging.Logger;
35-
import javax.swing.BorderFactory;
3635
import javax.swing.JComponent;
37-
import javax.swing.JTabbedPane;
3836
import javax.swing.SwingUtilities;
3937
import org.netbeans.lib.profiler.global.CommonConstants;
4038
import org.netbeans.modules.profiler.LoadedSnapshot;
4139
import org.netbeans.modules.profiler.ResultsManager;
4240
import org.netbeans.modules.profiler.SnapshotResultsWindow;
4341
import org.openide.filesystems.FileObject;
4442
import org.openide.filesystems.FileUtil;
45-
import org.openide.util.Exceptions;
4643
import org.openide.util.ImageUtilities;
4744
import org.openide.windows.TopComponent;
4845

@@ -102,15 +99,15 @@ protected Image resolveIcon() {
10299
JComponent getUIComponent() {
103100
if (srw == null) {
104101
srw = SnapshotResultsWindow.get(loadedSnapshot, CommonConstants.SORTING_COLUMN_DEFAULT, false);
105-
try {
106-
JComponent cpuResPanel = (JComponent) srw.getComponent(0);
107-
cpuResPanel.setOpaque(false);
108-
JTabbedPane tabbedPane = (JTabbedPane) cpuResPanel.getComponent(0);
109-
JComponent infoPanel = (JComponent) tabbedPane.getComponentAt(tabbedPane.getTabCount() - 1);
110-
infoPanel.setBorder(BorderFactory.createEmptyBorder());
111-
} catch (Exception e) {
112-
Exceptions.printStackTrace(e);
113-
}
102+
// try {
103+
// JComponent cpuResPanel = (JComponent) srw.getComponent(0);
104+
// cpuResPanel.setOpaque(false);
105+
// JTabbedPane tabbedPane = (JTabbedPane) cpuResPanel.getComponent(0);
106+
// JComponent infoPanel = (JComponent) tabbedPane.getComponentAt(tabbedPane.getTabCount() - 1);
107+
// infoPanel.setBorder(BorderFactory.createEmptyBorder());
108+
// } catch (Exception e) {
109+
// Exceptions.printStackTrace(e);
110+
// }
114111
srw.setPreferredSize(new Dimension(1, 1));
115112
}
116113
return srw;

0 commit comments

Comments
 (0)