Skip to content

Commit 7207ac2

Browse files
committed
cleanup of java core classes filter; new jdk.** package added
1 parent 58b1af2 commit 7207ac2

File tree

3 files changed

+6
-12
lines changed

3 files changed

+6
-12
lines changed

visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/results/PackageColorer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ private static void createDefaultFilters(List<ColoredFilter> colors) {
197197
String reflection = new String("java.lang.reflect., sun.reflect., com.sun.proxy."); // NOI18N
198198
colors.add(new ColoredFilter(FILTERS_REFLECTION, reflection, new Color(180, 180, 180)));
199199

200-
String javase = new String("apple.laf., apple.awt., com.apple., com.sun., java., javax., sun., sunw., org.omg."); // NOI18N
200+
String javase = new String("apple.laf., apple.awt., com.apple., com.sun., java., javax., jdk., sun., sunw., org.omg.CORBA., org.omg.CosNaming., COM.rsa."); // NOI18N
201201
colors.add(new ColoredFilter(FILTERS_JAVASE, javase, new Color(135, 135, 135)));
202202
}
203203

visualvm/libs.profiler/profiler/src/org/graalvm/visualvm/lib/profiler/v2/features/MethodsFeatureModes.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -429,7 +429,7 @@ private static abstract class InstrMethodsMode extends MethodsMode {
429429

430430

431431
// --- API implementation ----------------------------------------------
432-
private static final String CORE_JAVA_FILTER = "apple.laf.**, apple.awt.**, com.apple.**, com.sun.**, java.**, javax.**, sun.**, sunw.**, org.omg.CORBA.**, org.omg.CosNaming.**, COM.rsa.**"; // NOI18N
432+
private static final String CORE_JAVA_FILTER = "apple.laf.**, apple.awt.**, com.apple.**, com.sun.**, java.**, javax.**, jdk.**, sun.**, sunw.**, org.omg.CORBA.**, org.omg.CosNaming.**, COM.rsa.**"; // NOI18N
433433

434434
private static final String OUTGOING_CALLS_ENABLED_FLAG = "OUTGOING_CALLS_ENABLED_FLAG"; // NOI18N
435435
private static final String OUTGOING_CALLS_FLAG = "OUTGOING_CALLS_FLAG"; // NOI18N

visualvm/profiling/src/org/graalvm/visualvm/profiling/presets/ProfilerPresets.java

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@
5252
import org.openide.util.NbBundle;
5353
import org.openide.util.NbPreferences;
5454
import org.openide.util.RequestProcessor;
55-
import org.openide.util.Utilities;
5655

5756
/**
5857
*
@@ -76,6 +75,8 @@ public final class ProfilerPresets {
7675

7776
static final String DEFINE_CLASSES = NbBundle.getMessage(ProfilerPresets.class, "HINT_Define_roots"); // NOI18N
7877

78+
private static final String INTERNAL_JAVA_FILTER = "com.sun.**, sun.**, sunw.**,\napple.laf.**, apple.awt.**, com.apple.**,\norg.omg.CORBA.**, org.omg.CosNaming.**, COM.rsa.**"; // NOI18N
79+
private static final String CORE_JAVA_FILTER = "java.**, javax.**, jdk.**,\n"+INTERNAL_JAVA_FILTER; // NOI18N
7980

8081
public static synchronized ProfilerPresets getInstance() {
8182
if (INSTANCE == null) INSTANCE = new ProfilerPresets();
@@ -298,9 +299,7 @@ private static String getMainClass(Application application) {
298299
}
299300

300301
private static String getDefaultFiltersS() {
301-
return Utilities.isMac() ?
302-
"java.**, javax.**,\nsun.**, sunw.**, com.sun.**,\ncom.apple.**, apple.awt.**, apple.laf.**" : // NOI18N
303-
"java.**, javax.**,\nsun.**, sunw.**, com.sun.**"; // NOI18N
302+
return CORE_JAVA_FILTER;
304303
}
305304

306305
private static String getDefaultRootsP(Application application) {
@@ -313,12 +312,7 @@ private static String getDefaultRootsP(Application application) {
313312
}
314313

315314
private static String getDefaultFiltersP(String defaultRoots) {
316-
if (defaultRoots.isEmpty())
317-
return !Utilities.isMac() ? "sun.**, sunw.**, com.sun.**" : // NOI18N
318-
"sun.**, sunw.**, com.sun.**,\ncom.apple.**, apple.awt.**, apple.laf.**"; // NOI18N
319-
else
320-
return !Utilities.isMac() ? "java.**, javax.**,\nsun.**, sunw.**, com.sun.**" : // NOI18N
321-
"java.**, javax.**,\nsun.**, sunw.**, com.sun.**,\ncom.apple.**, apple.awt.**, apple.laf.**"; // NOI18N
315+
return defaultRoots.isEmpty() ? INTERNAL_JAVA_FILTER : CORE_JAVA_FILTER;
322316
}
323317

324318
private static String getDefaultMemoryFilterP(Application application) {

0 commit comments

Comments
 (0)