1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-08-13 19:25:38 +02:00

Bug 425595 - Opening 'C/C++ General-> Formatter' of a project properties

cuases NPE
This commit is contained in:
Sergey Prigogin 2014-01-13 11:37:41 -08:00
parent 6891ce8e0f
commit 74c0954dc8

View file

@ -116,6 +116,7 @@ public class CustomCodeFormatterBlock extends Observable {
public void enableProjectSpecificSettings(boolean useProjectSpecificSettings) { public void enableProjectSpecificSettings(boolean useProjectSpecificSettings) {
if (useProjectSpecificSettings) { if (useProjectSpecificSettings) {
if (fDefaultFormatterId != null)
fPrefs.put(CCorePreferenceConstants.CODE_FORMATTER, fDefaultFormatterId); fPrefs.put(CCorePreferenceConstants.CODE_FORMATTER, fDefaultFormatterId);
} else { } else {
initDefault(); initDefault();
@ -125,7 +126,7 @@ public class CustomCodeFormatterBlock extends Observable {
/** /**
* Returns the currently selected formatter id. * Returns the currently selected formatter id.
* *
* @return the selected formatter id or <code>null</code> if the default is selected. * @return the selected formatter id or {@code null} if the default is selected.
*/ */
public String getFormatterId() { public String getFormatterId() {
if (fFormatterCombo == null) { if (fFormatterCombo == null) {