GH-308 use class selector in header instead of direct style attribute

thurka · thurka · commit ef456787ecd8 · 2021-05-31T09:26:49.000+02:00
diff --git a/visualvm/heapviewer/src/org/graalvm/visualvm/heapviewer/java/impl/JavaThreadsProvider.java b/visualvm/heapviewer/src/org/graalvm/visualvm/heapviewer/java/impl/JavaThreadsProvider.java
@@ -198,6 +198,7 @@ static String getThreadsHTML(HeapContext context) {
         JavaClass javaClassClass = heap.getJavaClassByName(Class.class.getName());
         // Use this to enable VisualVM color scheme for threads dumps:
         // sw.append("<pre style='color: #cc3300;'>"); // NOI18N
+        sb.append("<head><style>span.g {color: #666666;}</style></head>");
         sb.append("<pre>"); // NOI18N
         for (GCRoot root : roots) {
             if(root.getKind().equals(GCRoot.THREAD_OBJECT)) {
@@ -255,15 +256,15 @@ static String getThreadsHTML(HeapContext context) {
                                             } else if (GCRoot.JNI_LOCAL.equals(local.getKind())) {
                                                 text = Bundle.JavaThreadsProvider_JniLocal();
                                             }
-                                            sb.append("       <span style=\"color: #666666\">" + text + ":</span> ").append(HeapUtils.instanceToHtml(localInstance, false, javaClassClass)).append("<br>"); // NOI18N
+                                            sb.append("       <span class=\"g\">" + text + ":</span> ").append(HeapUtils.instanceToHtml(localInstance, false, javaClassClass)).append("<br>"); // NOI18N
                                         } else {
                                             String text = "";
                                             if (GCRoot.JAVA_FRAME.equals(local.getKind())) {
                                                 text = Bundle.JavaThreadsProvider_UnknownLocalVariable();
                                             } else if (GCRoot.JNI_LOCAL.equals(local.getKind())) {
                                                 text = Bundle.JavaThreadsProvider_UnknownJniLocal();
                                             }
-                                            sb.append("       <span style=\"color: #666666\">" + text + "</span><br>"); // NOI18N
+                                            sb.append("       <span class=\"g\">" + text + "</span><br>"); // NOI18N
                                         }
                                     }
                                 }
diff --git a/visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/components/HTMLTextArea.java b/visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/components/HTMLTextArea.java
@@ -653,8 +653,14 @@ public void setText(String value) {
             value = value.replaceAll("\\n\\r|\\r\\n|\\n|\\r", "<br>"); //NOI18N
             value = value.replace("<code>", "<code style=\"font-size: " + font.getSize() + "pt;\">"); //NOI18N
 
+            int index = getHeaderEndIndex(value);
+            String header = "";
+            if (index != -1) {
+                header = value.substring(0, index);
+                value = value.substring(index);
+            }
             String colorText = "rgb(" + textColor.getRed() + "," + textColor.getGreen() + "," + textColor.getBlue() + ")"; //NOI18N
-            String newText = "<html><body text=\"" + colorText + "\" style=\"font-size: " + font.getSize() + //NOI18N
+            String newText = "<html>" + header + "<body text=\"" + colorText + "\" style=\"font-size: " + font.getSize() + //NOI18N
                              "pt; font-family: " + font.getName() + ";\">" + value + "</body></html>"; //NOI18N
 
             setDocument(getEditorKit().createDefaultDocument()); // Workaround for http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=5042872
@@ -866,4 +872,10 @@ protected void showURL(URL url) {
         // override to react to URL clicks
     }
     
+    private static int getHeaderEndIndex(String htmlText) {
+        if (htmlText.startsWith("<head>")) {
+            return htmlText.indexOf("</head>")+"</head>".length();
+        }
+        return -1;
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -198,6 +198,7 @@ static String getThreadsHTML(HeapContext context) {`
`198`	`198`	`JavaClass javaClassClass = heap.getJavaClassByName(Class.class.getName());`
`199`	`199`	`// Use this to enable VisualVM color scheme for threads dumps:`
`200`	`200`	`// sw.append("<pre style='color: #cc3300;'>"); // NOI18N`
	`201`	`+ sb.append("<head><style>span.g {color: #666666;}</style></head>");`
`201`	`202`	`sb.append("<pre>"); // NOI18N`
`202`	`203`	`for (GCRoot root : roots) {`
`203`	`204`	`if(root.getKind().equals(GCRoot.THREAD_OBJECT)) {`
`@@ -255,15 +256,15 @@ static String getThreadsHTML(HeapContext context) {`
`255`	`256`	`} else if (GCRoot.JNI_LOCAL.equals(local.getKind())) {`
`256`	`257`	`text = Bundle.JavaThreadsProvider_JniLocal();`
`257`	`258`	`}`
`258`		`- sb.append(" <span style=\"color: #666666\">" + text + ":</span> ").append(HeapUtils.instanceToHtml(localInstance, false, javaClassClass)).append("<br>"); // NOI18N`
	`259`	`+ sb.append(" <span class=\"g\">" + text + ":</span> ").append(HeapUtils.instanceToHtml(localInstance, false, javaClassClass)).append("<br>"); // NOI18N`
`259`	`260`	`} else {`
`260`	`261`	`String text = "";`
`261`	`262`	`if (GCRoot.JAVA_FRAME.equals(local.getKind())) {`
`262`	`263`	`text = Bundle.JavaThreadsProvider_UnknownLocalVariable();`
`263`	`264`	`} else if (GCRoot.JNI_LOCAL.equals(local.getKind())) {`
`264`	`265`	`text = Bundle.JavaThreadsProvider_UnknownJniLocal();`
`265`	`266`	`}`
`266`		`- sb.append(" <span style=\"color: #666666\">" + text + "</span><br>"); // NOI18N`
	`267`	`+ sb.append(" <span class=\"g\">" + text + "</span><br>"); // NOI18N`
`267`	`268`	`}`
`268`	`269`	`}`
`269`	`270`	`}`