mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-06-06 17:26:01 +02:00
Code Issues Wiki Activity

Erase code_formatter preference when disabling project specific settings

Browse source
This commit is contained in:
Sergey Prigogin 2013-11-07 20:23:28 -08:00
parent e363ba7f04
commit c98b965760
2 changed files with 15 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/CodeFormatterConfigurationBlock.java
View file

@ -173,4 +173,12 @@ public class CodeFormatterConfigurationBlock extends ProfileConfigurationBlock {
} }
return super.performOk(); return super.performOk();
} }
@Override
public void enableProjectSpecificSettings(boolean useProjectSpecificSettings) {
if (fCustomCodeFormatterBlock != null) {
fCustomCodeFormatterBlock.enableProjectSpecificSettings(useProjectSpecificSettings);
}
super.enableProjectSpecificSettings(useProjectSpecificSettings);
}
} }

7
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/CustomCodeFormatterBlock.java
View file

@ -116,6 +116,13 @@ public class CustomCodeFormatterBlock extends Observable {
handleFormatterChanged(); handleFormatterChanged();
} }
public void enableProjectSpecificSettings(boolean useProjectSpecificSettings) {
if (useProjectSpecificSettings) {
fPrefs.put(CCorePreferenceConstants.CODE_FORMATTER, fDefaultFormatterId);
} else {
initDefault();
}
}
/** /**
* Get the currently selected formatter id. * Get the currently selected formatter id.