From 6c57d8f72e0dabbeb1758712d08c39396e1b4e47 Mon Sep 17 00:00:00 2001 From: Andrew Gvozdev Date: Tue, 6 Dec 2011 17:52:18 -0500 Subject: [PATCH] Renamed LanguageSettingsProviderAssociation -> LanguageSettingsProviderAssociationManager --- .../scannerconfig/ScannerDiscoveryConsole.java | 4 ++-- .../ScannerDiscoveryGlobalConsole.java | 4 ++-- ...guageSettingsProviderAssociationManager.java} | 16 ++++++++-------- .../providers/LanguageSettingsProviderTab.java | 2 +- .../LanguageSettingsProvidersLabelProvider.java | 4 ++-- 5 files changed, 15 insertions(+), 15 deletions(-) rename core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/settings/providers/{LanguageSettingsProviderAssociation.java => LanguageSettingsProviderAssociationManager.java} (93%) diff --git a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/scannerconfig/ScannerDiscoveryConsole.java b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/scannerconfig/ScannerDiscoveryConsole.java index e5590d9fd43..7b2b9627727 100644 --- a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/scannerconfig/ScannerDiscoveryConsole.java +++ b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/scannerconfig/ScannerDiscoveryConsole.java @@ -14,7 +14,7 @@ package org.eclipse.cdt.make.internal.ui.scannerconfig; import java.net.URL; import org.eclipse.cdt.internal.ui.buildconsole.CBuildConsole; -import org.eclipse.cdt.internal.ui.language.settings.providers.LanguageSettingsProviderAssociation; +import org.eclipse.cdt.internal.ui.language.settings.providers.LanguageSettingsProviderAssociationManager; public class ScannerDiscoveryConsole extends CBuildConsole { @@ -27,7 +27,7 @@ public class ScannerDiscoveryConsole extends CBuildConsole { */ @Override public void init(String consoleId, String name, URL defaultIconUrl) { - URL iconUrl = LanguageSettingsProviderAssociation.getImageUrl(consoleId); + URL iconUrl = LanguageSettingsProviderAssociationManager.getImageUrl(consoleId); if (iconUrl==null) { iconUrl = defaultIconUrl; } diff --git a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/scannerconfig/ScannerDiscoveryGlobalConsole.java b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/scannerconfig/ScannerDiscoveryGlobalConsole.java index 4ccf5f183b8..ed415ca66e9 100644 --- a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/scannerconfig/ScannerDiscoveryGlobalConsole.java +++ b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/scannerconfig/ScannerDiscoveryGlobalConsole.java @@ -16,7 +16,7 @@ import java.net.URL; import org.eclipse.cdt.core.ConsoleOutputStream; import org.eclipse.cdt.internal.core.ICConsole; -import org.eclipse.cdt.internal.ui.language.settings.providers.LanguageSettingsProviderAssociation; +import org.eclipse.cdt.internal.ui.language.settings.providers.LanguageSettingsProviderAssociationManager; import org.eclipse.cdt.ui.CDTSharedImages; import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.Assert; @@ -91,7 +91,7 @@ public class ScannerDiscoveryGlobalConsole implements ICConsole { } if (console==null) { - URL iconUrl = LanguageSettingsProviderAssociation.getImageUrl(consoleId); + URL iconUrl = LanguageSettingsProviderAssociationManager.getImageUrl(consoleId); if (iconUrl==null) { iconUrl = defaultIconUrl; } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/settings/providers/LanguageSettingsProviderAssociation.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/settings/providers/LanguageSettingsProviderAssociationManager.java similarity index 93% rename from core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/settings/providers/LanguageSettingsProviderAssociation.java rename to core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/settings/providers/LanguageSettingsProviderAssociationManager.java index 76537635cd5..d936509f9c9 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/settings/providers/LanguageSettingsProviderAssociation.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/settings/providers/LanguageSettingsProviderAssociationManager.java @@ -20,7 +20,7 @@ import org.eclipse.cdt.ui.CDTSharedImages; import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.cdt.ui.dialogs.ICOptionPage; -public class LanguageSettingsProviderAssociation { +public class LanguageSettingsProviderAssociationManager { public static final String LANGUAGE_SETTINGS_PROVIDER_UI = "LanguageSettingsProviderAssociation"; //$NON-NLS-1$ private static final String ELEM_ID_ASSOCIATION = "id-association"; //$NON-NLS-1$ @@ -47,7 +47,7 @@ public class LanguageSettingsProviderAssociation { if (fRegisteredClasses==null) fRegisteredClasses = new ArrayList(); IExtensionRegistry registry = Platform.getExtensionRegistry(); - IExtensionPoint extension = registry.getExtensionPoint(CUIPlugin.PLUGIN_ID, LanguageSettingsProviderAssociation.LANGUAGE_SETTINGS_PROVIDER_UI); + IExtensionPoint extension = registry.getExtensionPoint(CUIPlugin.PLUGIN_ID, LANGUAGE_SETTINGS_PROVIDER_UI); if (extension != null) { IExtension[] extensions = extension.getExtensions(); for (IExtension ext : extensions) { @@ -85,12 +85,12 @@ public class LanguageSettingsProviderAssociation { return url; } } catch (MalformedURLException exception) {} - + loadedIcons.add(url); if (url!=null) { CDTSharedImages.register(url); } - + return url; } @@ -107,7 +107,7 @@ public class LanguageSettingsProviderAssociation { } if (fRegirestedIds.contains(providerId)) { IExtensionRegistry registry = Platform.getExtensionRegistry(); - IExtensionPoint extension = registry.getExtensionPoint(CUIPlugin.PLUGIN_ID, LanguageSettingsProviderAssociation.LANGUAGE_SETTINGS_PROVIDER_UI); + IExtensionPoint extension = registry.getExtensionPoint(CUIPlugin.PLUGIN_ID, LANGUAGE_SETTINGS_PROVIDER_UI); if (extension != null) { IExtension[] extensions = extension.getExtensions(); for (IExtension ext : extensions) { @@ -141,7 +141,7 @@ public class LanguageSettingsProviderAssociation { } if (fRegisteredClasses.contains(providerClassName)) { IExtensionRegistry registry = Platform.getExtensionRegistry(); - IExtensionPoint extension = registry.getExtensionPoint(CUIPlugin.PLUGIN_ID, LanguageSettingsProviderAssociation.LANGUAGE_SETTINGS_PROVIDER_UI); + IExtensionPoint extension = registry.getExtensionPoint(CUIPlugin.PLUGIN_ID, LANGUAGE_SETTINGS_PROVIDER_UI); if (extension != null) { IExtension[] extensions = extension.getExtensions(); for (IExtension ext : extensions) { @@ -178,12 +178,12 @@ public class LanguageSettingsProviderAssociation { */ public static URL getImage(Class clazz) { URL url = null; - + outer: for (Class cl=clazz;cl!=null;cl=cl.getSuperclass()) { url = getImageURL(cl); if (url!=null) break; - + // this does not check for superinterfaces, feel free to implement as needed for (Class in : cl.getInterfaces()) { url = getImageURL(in); 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 cacf3443028..7bb4f148bf7 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 @@ -558,7 +558,7 @@ public class LanguageSettingsProviderTab extends AbstractCPropertyTab { if (provider!=null) { ILanguageSettingsProvider rawProvider = LanguageSettingsManager.getRawProvider(provider); if (rawProvider!=null) { - optionsPage = LanguageSettingsProviderAssociation.createOptionsPage(rawProvider); + optionsPage = LanguageSettingsProviderAssociationManager.createOptionsPage(rawProvider); } if (optionsPage instanceof AbstractLanguageSettingProviderOptionPage) { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/settings/providers/LanguageSettingsProvidersLabelProvider.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/settings/providers/LanguageSettingsProvidersLabelProvider.java index a64766e8811..829e23aea60 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/settings/providers/LanguageSettingsProvidersLabelProvider.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/settings/providers/LanguageSettingsProvidersLabelProvider.java @@ -38,12 +38,12 @@ class LanguageSettingsProvidersLabelProvider extends LabelProvider { String imageKey = null; // try id-association String id = provider.getId(); - URL url = LanguageSettingsProviderAssociation.getImageUrl(id); + URL url = LanguageSettingsProviderAssociationManager.getImageUrl(id); // try class-association if (url==null) { ILanguageSettingsProvider rawProvider = LanguageSettingsManager.getRawProvider(provider); if (rawProvider!=null) { - url = LanguageSettingsProviderAssociation.getImage(rawProvider.getClass()); + url = LanguageSettingsProviderAssociationManager.getImage(rawProvider.getClass()); } } if (url!=null) {