Optimize resolving JTable foreground color

Author: jisedlac

visualvm/heapviewer/nbproject/project.xml

@@ -57,7 +57,7 @@
                     <compile-dependency/>
                     <run-dependency>
                         <release-version>2</release-version>
-                        <specification-version>2.0</specification-version>
+                        <specification-version>2.1</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>

visualvm/heapviewer/src/org/graalvm/visualvm/heapviewer/java/ThreadNodeRenderer.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,7 +34,7 @@
 import org.graalvm.visualvm.heapviewer.ui.HeapViewerRenderer;
 import java.awt.Color;
 import java.util.Objects;
-import javax.swing.JTable;
+import org.graalvm.visualvm.lib.ui.UIUtils;
 
 /**
  *
@@ -44,8 +44,6 @@ public class ThreadNodeRenderer extends LabelRenderer implements HeapViewerRende
 
     private static final Icon ICON = Icons.getIcon(ProfilerIcons.THREAD);
 
-    private static final Color REPLACEABLE_FOREGROUND = new JTable().getForeground();
-    
     protected final Heap heap;
 
     private Color customForeground;
@@ -74,7 +72,7 @@ public String getShortName() {
 
 
     public void setForeground(Color foreground) {
-        if (customForeground != null && Objects.equals(foreground, REPLACEABLE_FOREGROUND)) {
+        if (customForeground != null && Objects.equals(foreground, UIUtils.getDefaultTableForeground())) {
             super.setForeground(customForeground);
         } else {
             super.setForeground(foreground);

visualvm/libs.profiler/lib.profiler.ui/manifest.mf

@@ -1,5 +1,5 @@
 Manifest-Version: 1.0
 OpenIDE-Module: org.graalvm.visualvm.lib.ui/2
 OpenIDE-Module-Localizing-Bundle: org/graalvm/visualvm/lib/ui/Bundle.properties
-OpenIDE-Module-Specification-Version: 2.0
+OpenIDE-Module-Specification-Version: 2.1
 

visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/UIUtils.java

@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+ * Copyright 1997-2020 Oracle and/or its affiliates. All rights reserved.
  *
  * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
  * Other names may be trademarks of their respective owners.
@@ -55,9 +55,12 @@
 import javax.swing.*;
 import javax.swing.border.Border;
 import javax.swing.border.CompoundBorder;
+import javax.swing.event.TableModelListener;
 import javax.swing.event.TreeExpansionEvent;
 import javax.swing.event.TreeExpansionListener;
+import javax.swing.plaf.TableUI;
 import javax.swing.table.JTableHeader;
+import javax.swing.table.TableModel;
 import javax.swing.tree.TreeModel;
 import javax.swing.tree.TreePath;
 
@@ -344,6 +347,32 @@ public static Color getUnfocusedSelectionForeground() {
         return unfocusedSelFg;
     }
 
+    private static Color defaultTableForeground;
+    
+    public static Color getDefaultTableForeground() {
+        if (defaultTableForeground == null) {
+            defaultTableForeground = new JTable() {
+                @Override protected void initializeLocalVars() {}
+                @Override protected void createDefaultRenderers() {}
+                @Override protected void createDefaultEditors() {}
+                @Override protected TableModel createDefaultDataModel() {
+                    return new TableModel() {
+                        @Override public int getRowCount() { return 0; }
+                        @Override public int getColumnCount() { return 0; }
+                        @Override public String getColumnName(int columnIndex) { throw new UnsupportedOperationException("Not supported."); } // NOI18N
+                        @Override public Class<?> getColumnClass(int columnIndex) { throw new UnsupportedOperationException("Not supported."); } // NOI18N
+                        @Override public boolean isCellEditable(int rowIndex, int columnIndex){ throw new UnsupportedOperationException("Not supported."); } // NOI18N
+                        @Override public Object getValueAt(int rowIndex, int columnIndex) { throw new UnsupportedOperationException("Not supported."); } // NOI18N
+                        @Override public void setValueAt(Object aValue, int rowIndex, int columnIndex) { throw new UnsupportedOperationException("Not supported."); } // NOI18N
+                        @Override public void addTableModelListener(TableModelListener l) {}
+                        @Override public void removeTableModelListener(TableModelListener l) {}
+                    };
+                }
+                @Override public void updateUI() { setUI((TableUI)UIManager.getUI(this)); }
+            }.getForeground();
+        }
+        return defaultTableForeground;
+    }
 
     private static Color profilerResultsBackground;
 

visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/swing/renderer/NormalBoldGrayRenderer.java

@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright 1997-2014 Oracle and/or its affiliates. All rights reserved.
+ * Copyright 1997-2020 Oracle and/or its affiliates. All rights reserved.
  *
  * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
  * Other names may be trademarks of their respective owners.
@@ -47,7 +47,6 @@
 import java.awt.Font;
 import java.util.Objects;
 import javax.swing.Icon;
-import javax.swing.JTable;
 import javax.swing.SwingConstants;
 import org.graalvm.visualvm.lib.ui.UIUtils;
 
@@ -57,16 +56,14 @@
  */
 public class NormalBoldGrayRenderer extends MultiRenderer {
 
-    private static final Color REPLACEABLE_FOREGROUND = new JTable().getForeground();
-    
     private final LabelRenderer normalRenderer;
     private final LabelRenderer boldRenderer;
     private final LabelRenderer grayRenderer;
 
     private final ProfilerRenderer[] renderers;
 
     private Color customForeground;
-    private Color replaceableForeground = REPLACEABLE_FOREGROUND;
+    private Color replaceableForeground = UIUtils.getDefaultTableForeground();
 
 
     public NormalBoldGrayRenderer() {