mirror of
https://github.com/eclipse-cdt/cdt
synced 2025-04-29 19:45:01 +02:00
Added some checks to the indexer timeout field to make sure a sane value is entered
This commit is contained in:
parent
29fdfabb37
commit
5630808394
1 changed files with 16 additions and 3 deletions
|
@ -50,9 +50,12 @@ public class WorkInProgressPreferencePage extends PreferencePage
|
||||||
private Button fBackgroundTypeCacheEnabled;
|
private Button fBackgroundTypeCacheEnabled;
|
||||||
private Button fEditorCorrection;
|
private Button fEditorCorrection;
|
||||||
|
|
||||||
|
|
||||||
protected OverlayPreferenceStore fOverlayStore;
|
protected OverlayPreferenceStore fOverlayStore;
|
||||||
private Text fTextControl;
|
private Text fTextControl;
|
||||||
|
|
||||||
|
private static final String TIMEOUT_VALUE = "20000"; //$NON-NLS-1$
|
||||||
|
|
||||||
public WorkInProgressPreferencePage(){
|
public WorkInProgressPreferencePage(){
|
||||||
setPreferenceStore(CUIPlugin.getDefault().getPreferenceStore());
|
setPreferenceStore(CUIPlugin.getDefault().getPreferenceStore());
|
||||||
fOverlayStore = createOverlayStore();
|
fOverlayStore = createOverlayStore();
|
||||||
|
@ -230,13 +233,23 @@ public class WorkInProgressPreferencePage extends PreferencePage
|
||||||
* @see IPreferencePage#performOk()
|
* @see IPreferencePage#performOk()
|
||||||
*/
|
*/
|
||||||
public boolean performOk() {
|
public boolean performOk() {
|
||||||
fOverlayStore.setValue(SourceIndexer.CDT_INDEXER_TIMEOUT, fTextControl.getText());
|
|
||||||
|
String timeOut = fTextControl.getText();
|
||||||
|
try{
|
||||||
|
Integer timeInt = new Integer(timeOut);
|
||||||
|
}
|
||||||
|
catch (NumberFormatException ex){
|
||||||
|
timeOut = TIMEOUT_VALUE;
|
||||||
|
}
|
||||||
|
|
||||||
|
fOverlayStore.setValue(SourceIndexer.CDT_INDEXER_TIMEOUT, timeOut);
|
||||||
|
|
||||||
fOverlayStore.propagate();
|
fOverlayStore.propagate();
|
||||||
|
|
||||||
// Store IProblem Marker value in CCorePlugin Preferences
|
// Store IProblem Marker value in CCorePlugin Preferences
|
||||||
Preferences prefs = CCorePlugin.getDefault().getPluginPreferences();
|
Preferences prefs = CCorePlugin.getDefault().getPluginPreferences();
|
||||||
prefs.setValue(SourceIndexer.CDT_INDEXER_TIMEOUT,fOverlayStore.getString(SourceIndexer.CDT_INDEXER_TIMEOUT));
|
|
||||||
|
prefs.setValue(SourceIndexer.CDT_INDEXER_TIMEOUT,timeOut);
|
||||||
|
|
||||||
prefs.setValue(AllTypesCache.ENABLE_BACKGROUND_TYPE_CACHE, fOverlayStore.getString(AllTypesCache.ENABLE_BACKGROUND_TYPE_CACHE));
|
prefs.setValue(AllTypesCache.ENABLE_BACKGROUND_TYPE_CACHE, fOverlayStore.getString(AllTypesCache.ENABLE_BACKGROUND_TYPE_CACHE));
|
||||||
|
|
||||||
|
@ -253,7 +266,7 @@ public class WorkInProgressPreferencePage extends PreferencePage
|
||||||
public static void initDefaults(IPreferenceStore store) {
|
public static void initDefaults(IPreferenceStore store) {
|
||||||
store.setDefault(CSearchPage.EXTERNALMATCH_ENABLED, false);
|
store.setDefault(CSearchPage.EXTERNALMATCH_ENABLED, false);
|
||||||
store.setDefault(CSearchPage.EXTERNALMATCH_VISIBLE, 0);
|
store.setDefault(CSearchPage.EXTERNALMATCH_VISIBLE, 0);
|
||||||
store.setDefault(SourceIndexer.CDT_INDEXER_TIMEOUT, "20000"); //$NON-NLS-1$
|
store.setDefault(SourceIndexer.CDT_INDEXER_TIMEOUT,TIMEOUT_VALUE);
|
||||||
store.setDefault(AllTypesCache.ENABLE_BACKGROUND_TYPE_CACHE, true);
|
store.setDefault(AllTypesCache.ENABLE_BACKGROUND_TYPE_CACHE, true);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue