Prevent language change from affecting category selection in options for FontColor syntax diff --git a/options.editor/src/org/netbeans/modules/options/colors/ColorModel.java b/options.editor/src/org/netbeans/modules/options/colors/ColorModel.java --- a/options.editor/src/org/netbeans/modules/options/colors/ColorModel.java +++ b/options.editor/src/org/netbeans/modules/options/colors/ColorModel.java @@ -97,6 +97,7 @@ public static final String ALL_LANGUAGES = NbBundle.getMessage(ColorModel.class, "CTL_All_Languages"); //NOI18N private static final String [] EMPTY_MIMEPATH = new String[0]; + private boolean isInitializing; // schemes ................................................................. @@ -289,7 +290,12 @@ SwingUtilities.invokeLater (new Runnable () { public void run () { - updateMimeType(mimeType); + try { + isInitializing = true; + updateMimeType(mimeType); + } finally { + isInitializing = false; + } } }); setCursor (Cursor.getPredefinedCursor (Cursor.HAND_CURSOR)); @@ -305,10 +311,12 @@ SwingUtilities.invokeLater (new Runnable () { public void run () { + try { + isInitializing = true; if (!mimeType.equals(currentMimeType)) { updateMimeType(mimeType); } - + if (defaults != null) { EditorSettings.getDefault().getFontColorSettings(EMPTY_MIMEPATH).setAllFontColors( testProfileName, @@ -328,6 +336,9 @@ syntaxColorings ); } + } finally { + isInitializing = false; + } } }); } @@ -380,7 +391,7 @@ } } - if (elementName != null) { + if (elementName != null && !isInitializing) { firePropertyChange(PROP_CURRENT_ELEMENT, null, elementName); } }