mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-29 19:45:01 +02:00
Code Issues Wiki Activity

bug 401255: LSP userdef entries: Cannot add macro after adding a workspace include path

Browse source
This commit is contained in:
Andrew Gvozdev 2013-02-19 23:00:21 -05:00
parent 9c88bbc509
commit c48e321ea3
1 changed files with 16 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/settings/providers/LanguageSettingEntryDialog.java
View file

@ -489,21 +489,25 @@ public class LanguageSettingEntryDialog extends AbstractPropertyDialog {
inputValue.setEnabled(isMacroSelected); inputValue.setEnabled(isMacroSelected);
int indexPathKind = comboPathCategory.getSelectionIndex(); if (isMacroSelected) {
boolean isProjectSelected = (indexPathKind == COMBO_PATH_INDEX_PROJECT); buttonOk.setEnabled(!inputName.getText().trim().isEmpty());
boolean isWorkspaceSelected = (indexPathKind == COMBO_PATH_INDEX_WORKSPACE);
boolean isFilesystemSelected = (indexPathKind == COMBO_PATH_INDEX_FILESYSTEM);
String path = inputName.getText().trim();
if (path.isEmpty()) {
buttonOk.setEnabled(false);
} else { } else {
buttonOk.setEnabled((isProjectSelected && !path.startsWith(SLASH)) || int indexPathKind = comboPathCategory.getSelectionIndex();
(isWorkspaceSelected && path.startsWith(SLASH)) || isFilesystemSelected); boolean isProjectSelected = (indexPathKind == COMBO_PATH_INDEX_PROJECT);
boolean isWorkspaceSelected = (indexPathKind == COMBO_PATH_INDEX_WORKSPACE);
boolean isFilesystemSelected = (indexPathKind == COMBO_PATH_INDEX_FILESYSTEM);
String path = inputName.getText().trim();
if (path.isEmpty()) {
buttonOk.setEnabled(false);
} else {
buttonOk.setEnabled((isProjectSelected && !path.startsWith(SLASH)) ||
(isWorkspaceSelected && path.startsWith(SLASH)) || isFilesystemSelected);
}
buttonVars.setEnabled(isFilesystemSelected);
} }
buttonVars.setEnabled(isFilesystemSelected);
compositeArea.layout(true); compositeArea.layout(true);
} }