diff --git a/jumpto/src/org/netbeans/modules/jumpto/common/HighlightingNameFormatter.java b/jumpto/src/org/netbeans/modules/jumpto/common/HighlightingNameFormatter.java --- a/jumpto/src/org/netbeans/modules/jumpto/common/HighlightingNameFormatter.java +++ b/jumpto/src/org/netbeans/modules/jumpto/common/HighlightingNameFormatter.java @@ -98,7 +98,7 @@ */ public class HighlightingNameFormatter { - private static final String COLOR_FORMAT_PATTERN = "%s"; //NOI18N + private static final String COLOR_FORMAT_PATTERN = "%s"; //NOI18N private static final String BOLD_FORMAT_PATTERN = "%s"; //NOI18N private String formatPattern; @@ -175,12 +175,10 @@ @NonNull public static HighlightingNameFormatter createColorFormatter( - @NonNull final Color bgColor, @NonNull final Color fgColor) { - final String bgColorHighlight = Integer.toHexString(bgColor.getRGB()).substring(2); final String fgColorHighlight = Integer.toHexString(fgColor.getRGB()).substring(2); return new HighlightingNameFormatter( - String.format(COLOR_FORMAT_PATTERN, bgColorHighlight, fgColorHighlight, "%s")); //NOI18N + String.format(COLOR_FORMAT_PATTERN, fgColorHighlight, "%s")); //NOI18N } @NonNull diff --git a/jumpto/src/org/netbeans/modules/jumpto/type/GoToTypeAction.java b/jumpto/src/org/netbeans/modules/jumpto/type/GoToTypeAction.java --- a/jumpto/src/org/netbeans/modules/jumpto/type/GoToTypeAction.java +++ b/jumpto/src/org/netbeans/modules/jumpto/type/GoToTypeAction.java @@ -657,7 +657,7 @@ private JList jList; private String searchText = ""; private boolean caseSensitive; - private final HighlightingNameFormatter typeNameFormatter; + private HighlightingNameFormatter typeNameFormatter; @SuppressWarnings("LeakingThisInConstructor") public Renderer( @@ -735,7 +735,6 @@ ); bgSelectionColor = list.getSelectionBackground(); fgSelectionColor = list.getSelectionForeground(); - this.typeNameFormatter = HighlightingNameFormatter.createBoldFormatter(); nameFieldDocument.addDocumentListener(this); caseSensitive.addActionListener(this); } @@ -764,12 +763,14 @@ jlPkg.setForeground(fgSelectionColor); jlPrj.setForeground(fgSelectionColor); rendererComponent.setBackground(bgSelectionColor); + this.typeNameFormatter = HighlightingNameFormatter.createColorFormatter(fgSelectionColor); } else { jlName.setForeground(fgColor); jlPkg.setForeground(fgColorLighter); jlPrj.setForeground(fgColor); rendererComponent.setBackground( index % 2 == 0 ? bgColor : bgColorDarker ); + this.typeNameFormatter = HighlightingNameFormatter.createColorFormatter(bgSelectionColor); } if ( value instanceof TypeDescriptor ) {