Attachment 224140 Details for Bug 395259 – Patch

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] Patch

395259.patch (text/plain), 2.11 KB, created by Caroline Klausecker

on 2012-11-30 04:51:20 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Caroline Klausecker

Created: 2012-11-30 04:51:20 EST

Size: 2.11 KB

patch

obsolete

>diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/settings/providers/LanguageSettingsProviderTab.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/settings/providers/LanguageSettingsProviderTab.java
>index 5b9f010..28a2dab 100644
>--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/settings/providers/LanguageSettingsProviderTab.java
>+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/settings/providers/LanguageSettingsProviderTab.java
>@@ -290,20 +290,22 @@
> 		List<ILanguageSettingsProvider> initialProviders = initialProvidersByCfg.get(cfgDescription.getId());
> 		List<ILanguageSettingsProvider> providers = getCheckedProviders();
> 
>-		// check for the provider mismatch in configuration list vs. initial list
>-		ILanguageSettingsProvider initialProvider = findProvider(id, initialProviders);
>-		if ((initialProvider != null) != providers.contains(provider)) {
>-			return true;
>-		}
>+		if(initialProviders != null) {
>+			// check for the provider mismatch in configuration list vs. initial list
>+			ILanguageSettingsProvider initialProvider = findProvider(id, initialProviders);
>+			if ((initialProvider != null) != providers.contains(provider)) {
>+				return true;
>+			}
> 
>-		// check if "shared" flag matches that of initial provider
>-		if (providers.contains(provider) && LanguageSettingsManager.isWorkspaceProvider(initialProvider) != LanguageSettingsManager.isWorkspaceProvider(provider)) {
>-			return true;
>-		}
>+			// check if "shared" flag matches that of initial provider
>+			if (providers.contains(provider) && LanguageSettingsManager.isWorkspaceProvider(initialProvider) != LanguageSettingsManager.isWorkspaceProvider(provider)) {
>+				return true;
>+			}
> 
>-		// check if configuration provider equals to the initial one
>-		if (!LanguageSettingsManager.isWorkspaceProvider(provider) && !provider.equals(initialProvider)) {
>-			return true;
>+			// check if configuration provider equals to the initial one
>+			if (!LanguageSettingsManager.isWorkspaceProvider(provider) && !provider.equals(initialProvider)) {
>+				return true;
>+			}
> 		}
> 
> 		return false;

Flags:

cdtdoug: iplog+

Actions: View | Diff

Attachments on bug 395259: 224140