preparations for merge to master

build/org.eclipse.cdt.make.ui/plugin.properties

@@ -43,6 +43,8 @@ LastTargetBuild.description=Rebuild the last make target for the selected contai
 PreferenceBuildSettings.name=Settings
 ErrorParsersTab.name=Error Parsers
 ErrorParsersTab.tooltip=Error Parsers scan build output and report errors in Problems view
+LanguageSettingsProvidersTab.name=Discovery
+LanguageSettingsProvidersTab.tooltip=Language settings providers
 
 PreferenceMakeProject.name=New Make Projects
 PreferenceMake.name=Make Targets

build/org.eclipse.cdt.make.ui/plugin.xml

@@ -461,6 +461,7 @@
            helpId="cdt_u_prop_pns_sym"
            parent="org.eclipse.cdt.make.internal.ui.properties.PathAndSymbolPage"
            tooltip="%Symbols.tooltip"/>
+     <!-- AG FIXME - rather use managedbuilder page ??? -->
      <tab
            class="org.eclipse.cdt.ui.newui.ErrorParsTab"
            helpId="cdt_u_prop_build_setting_errparser"
@@ -470,6 +471,14 @@
            tooltip="%ErrorParsersTab.tooltip"
            weight="020">
      </tab>
+     <tab
+           class="org.eclipse.cdt.internal.ui.language.settings.providers.LanguageSettingsProviderTab"
+           icon="icons/obj16/search.gif"
+           name="%LanguageSettingsProvidersTab.name"
+           parent="org.eclipse.cdt.make.internal.ui.preferences.BuildSettingsPreferencePage"
+           tooltip="%LanguageSettingsProvidersTab.tooltip"
+           weight="040">
+     </tab>
    </extension>
 
      <extension

build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/language/settings/providers/AbstractBuiltinSpecsDetector.java

@@ -79,7 +79,7 @@ public abstract class AbstractBuiltinSpecsDetector extends AbstractLanguageSetti
 	private static final String CDT_MANAGEDBUILDER_UI_PLUGIN_ID = "org.eclipse.cdt.managedbuilder.ui"; //$NON-NLS-1$
 	private static final String SCANNER_DISCOVERY_CONSOLE = "org.eclipse.cdt.managedbuilder.ScannerDiscoveryConsole"; //$NON-NLS-1$
 	private static final String SCANNER_DISCOVERY_GLOBAL_CONSOLE = "org.eclipse.cdt.managedbuilder.ScannerDiscoveryGlobalConsole"; //$NON-NLS-1$
-	private static final String DEFAULT_CONSOLE_ICON = "icons/obj16/inspect_system.gif"; //$NON-NLS-1$
+	private static final String DEFAULT_CONSOLE_ICON = "icons/obj16/inspect_sys.gif"; //$NON-NLS-1$
 	private static final String GMAKE_ERROR_PARSER_ID = "org.eclipse.cdt.core.GmakeErrorParser"; //$NON-NLS-1$
 
 	private static final String ATTR_PARAMETER = "parameter"; //$NON-NLS-1$

build/org.eclipse.cdt.managedbuilder.ui/plugin.properties

@@ -92,9 +92,6 @@ Source.location=Source Location
 Output.location=Output Location
 Binary.parsers=Binary Parsers
 Error.parsers=Error Parsers
-Language.settings.providers=Discovery
-LanguageSettingsProvidersTab.name=Discovery
-LanguageSettingsProvidersTab.tooltip=Language settings providers
 Data.hierarchy=Data Hierarchy
 Preferred.toolchains=Preferred Toolchains
 Wizard.defaults=Wizard Defaults

build/org.eclipse.cdt.managedbuilder.ui/plugin.xml

@@ -456,15 +456,6 @@
            helpId="cdt_u_pref_multi_cfg"
            parent="org.eclipse.cdt.managedbuilder.ui.preferences.PrefPage_MultiConfig">
      </tab>
-     <!-- AG FIXME - rather use managedbuilder page ??? -->
-     <tab
-           class="org.eclipse.cdt.internal.ui.language.settings.providers.LanguageSettingsProviderTab"
-           icon="icons/obj16/search.gif"
-           name="%LanguageSettingsProvidersTab.name"
-           parent="org.eclipse.cdt.make.internal.ui.preferences.BuildSettingsPreferencePage"
-           tooltip="%LanguageSettingsProvidersTab.tooltip"
-           weight="000">
-     </tab>
   </extension>   
 
       <extension
@@ -634,7 +625,6 @@
             name="%MBSPerProjectProfile.name"
             profileId="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP"/>
    </extension>
-
      <extension
            point="org.eclipse.cdt.ui.workingSetConfigurations">
         <projectConfigurationFactory
@@ -658,45 +648,6 @@
            </description>
         </wizard>
      </extension>
-
-   <extension
-            point="org.eclipse.cdt.ui.LanguageSettingsProviderAssociation">
-         <id-association
-              id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider"
-              icon="icons/obj16/mbs.gif"
-              ui-clear-entries="false"
-              ui-edit-entries="false">
-         </id-association>
-      <class-association
-            class="org.eclipse.cdt.managedbuilder.language.settings.providers.AbstractBuildCommandParser"
-            icon="icons/obj16/log_obj.gif"
-            page="org.eclipse.cdt.managedbuilder.internal.ui.language.settings.providers.GCCBuildCommandParserOptionPage"
-            ui-clear-entries="true"
-            ui-edit-entries="false">
-      </class-association>
-      <class-association
-            class="org.eclipse.cdt.managedbuilder.language.settings.providers.AbstractBuiltinSpecsDetector"
-            icon="icons/obj16/inspect_system.gif"
-            page="org.eclipse.cdt.managedbuilder.internal.ui.language.settings.providers.BuiltinSpecsDetectorOptionPage"
-            ui-clear-entries="true"
-            ui-edit-entries="false">
-      </class-association>
-   </extension>
-   <extension
-         point="org.eclipse.cdt.core.CBuildConsole">
-      <CBuildConsole
-            id="org.eclipse.cdt.managedbuilder.ScannerDiscoveryConsole"
-            class="org.eclipse.cdt.managedbuilder.internal.ui.language.settings.providers.ScannerDiscoveryConsole">
-      </CBuildConsole>
-   </extension>
-   <extension
-         point="org.eclipse.cdt.core.CBuildConsole">
-      <CBuildConsole
-            id="org.eclipse.cdt.managedbuilder.ScannerDiscoveryGlobalConsole"
-            class="org.eclipse.cdt.managedbuilder.internal.ui.language.settings.providers.ScannerDiscoveryGlobalConsole">
-      </CBuildConsole>
-   </extension>
-
      <extension
            point="org.eclipse.cdt.ui.projectTypePages">
         <projectTypePage
@@ -720,5 +671,42 @@
               projectType="org.eclipse.cdt.build.makefile.projectType">
         </projectTypePage>
      </extension>
+   <extension
+            point="org.eclipse.cdt.ui.LanguageSettingsProviderAssociation">
+         <id-association
+              id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider"
+              icon="icons/obj16/mbs.gif"
+              ui-clear-entries="false"
+              ui-edit-entries="false">
+         </id-association>
+      <class-association
+            class="org.eclipse.cdt.managedbuilder.language.settings.providers.AbstractBuildCommandParser"
+            icon="icons/obj16/log_obj.gif"
+            page="org.eclipse.cdt.managedbuilder.internal.ui.language.settings.providers.GCCBuildCommandParserOptionPage"
+            ui-clear-entries="true"
+            ui-edit-entries="false">
+      </class-association>
+      <class-association
+            class="org.eclipse.cdt.managedbuilder.language.settings.providers.AbstractBuiltinSpecsDetector"
+            icon="icons/obj16/inspect_sys.gif"
+            page="org.eclipse.cdt.managedbuilder.internal.ui.language.settings.providers.BuiltinSpecsDetectorOptionPage"
+            ui-clear-entries="true"
+            ui-edit-entries="false">
+      </class-association>
+   </extension>
+   <extension
+         point="org.eclipse.cdt.core.CBuildConsole">
+      <CBuildConsole
+            id="org.eclipse.cdt.managedbuilder.ScannerDiscoveryConsole"
+            class="org.eclipse.cdt.managedbuilder.internal.ui.language.settings.providers.ScannerDiscoveryConsole">
+      </CBuildConsole>
+   </extension>
+   <extension
+         point="org.eclipse.cdt.core.CBuildConsole">
+      <CBuildConsole
+            id="org.eclipse.cdt.managedbuilder.ScannerDiscoveryGlobalConsole"
+            class="org.eclipse.cdt.managedbuilder.internal.ui.language.settings.providers.ScannerDiscoveryGlobalConsole">
+      </CBuildConsole>
+   </extension>
 
 </plugin>

core/org.eclipse.cdt.ui/plugin.properties

@@ -620,7 +620,6 @@ ActionDefinition.selectPrevious.description = Expand the selection to enclosing
 ActionDefinition.selectPrevious.name = Select Previous C/C++ Element
 ActionDefinition.selectLast.description = Restore last selection in C/C++ editor
 ActionDefinition.selectLast.name = Restore Last C/C++ Selection
-LanguageSettingsProviderUIExtensionPoint=Language Settings Provider UI
 LanguageSettingsProviderAssociationExtensionPoint=Language Settings Provider UI
 overrideAnnotation.label = C/C++ Override indicators
 

core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/ProblemsLabelDecorator.java

@@ -385,7 +385,7 @@ public class ProblemsLabelDecorator implements ILabelDecorator, ILightweightLabe
 		}
 	}
 
-	public static boolean isCustomizedResource(ICConfigurationDescription cfgDescription, IResource rc) {
+	private static boolean isCustomizedResource(ICConfigurationDescription cfgDescription, IResource rc) {
 		if (rc instanceof IProject)
 			return false;
 
@@ -398,7 +398,7 @@ public class ProblemsLabelDecorator implements ILabelDecorator, ILightweightLabe
 			for (ILanguageSettingsProvider provider: ((ILanguageSettingsProvidersKeeper) cfgDescription).getLanguageSettingProviders()) {
 				for (String languageId : LanguageSettingsManager.getLanguages(rc, cfgDescription)) {
 					List<ICLanguageSettingEntry> list = provider.getSettingEntries(cfgDescription, rc, languageId);
-					if (list!=null) {
+					if (list != null) {
 						List<ICLanguageSettingEntry> listDefault = provider.getSettingEntries(cfgDescription, rc.getParent(), languageId);
 						// != is OK here due as the equal lists will have the same reference in WeakHashSet
 						if (list != listDefault)

core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CDTSharedImages.java

@@ -172,6 +172,8 @@ public class CDTSharedImages {
 	public static final String IMG_OBJS_CORRECTION_RENAME = "icons/obj16/correction_rename.gif"; //$NON-NLS-1$
 	public static final String IMG_OBJS_CORRECTION_LINKED_RENAME = "icons/obj16/correction_linked_rename.gif"; //$NON-NLS-1$
 
+	/** @since 5.4 */
+	public static final String IMG_ETOOL_PROJECT = "icons/etool16/prj_obj.gif"; //$NON-NLS-1$
 	public static final String IMG_VIEW_BUILD_CONSOLE = "icons/view16/buildconsole.gif"; //$NON-NLS-1$
 
 	// Images for file list control
@@ -186,6 +188,12 @@ public class CDTSharedImages {
 	public static final String IMG_OVR_ERROR = "icons/ovr16/error_co.gif"; //$NON-NLS-1$
 	public static final String IMG_OVR_SETTING = "icons/ovr16/setting_nav.gif"; //$NON-NLS-1$
 	public static final String IMG_OVR_INACTIVE = "icons/ovr16/inactive_co.gif"; //$NON-NLS-1$
+	/** @since 5.4 */
+	public static final String IMG_OVR_PARENT = "icons/ovr16/path_inherit_co.gif"; //$NON-NLS-1$
+	/** @since 5.4 */
+	public static final String IMG_OVR_EDITED = "icons/ovr16/edited_ovr.gif"; //$NON-NLS-1$
+	/** @since 5.4 */
+	public static final String IMG_OVR_USER = "icons/ovr16/person_ovr.gif"; //$NON-NLS-1$
 
 	// Pin & Clone
     public static final String IMG_THREAD_SUSPENDED_R_PINNED = "icons/obj16/threads_obj_r.gif"; //$NON-NLS-1$
@@ -210,12 +218,7 @@ public class CDTSharedImages {
     public static final String IMG_VIEW_PIN_ACTION_B = "icons/obj16/toolbar_pinned_b.gif"; //$NON-NLS-1$
     public static final String IMG_VIEW_PIN_ACTION_MULTI = "icons/obj16/toolbar_pinned_multi.gif"; //$NON-NLS-1$
 
-	// Language Settings Images
+	// Language Settings Images extras
-	/** @since 5.4 */
-	public static final String IMG_OBJS_LANG_SETTINGS_PROVIDER = "icons/obj16/ls_entries_provider.gif"; //$NON-NLS-1$
-	/** @since 5.4 */
-	public static final String IMG_ETOOL_PROJECT = "icons/etool16/prj_obj.gif"; //$NON-NLS-1$
-
 	/** @since 5.4 */
 	public static final String IMG_OVR_GLOBAL = "icons/ovr16/global_ovr.gif"; //$NON-NLS-1$
 	/** @since 5.4 */
@@ -225,8 +228,6 @@ public class CDTSharedImages {
 	/** @since 5.4 */
 	public static final String IMG_OVR_CONFIGURATION = "icons/ovr16/cfg_ovr.gif"; //$NON-NLS-1$
 	/** @since 5.4 */
-	public static final String IMG_OVR_PARENT = "icons/ovr16/path_inherit_co.gif"; //$NON-NLS-1$
-	/** @since 5.4 */
 	public static final String IMG_OVR_INDEXED = "icons/ovr16/indexedFile.gif"; //$NON-NLS-1$
 	/** @since 5.4 */
 	public static final String IMG_OVR_REFERENCE = "icons/ovr16/referencedby_co.gif"; //$NON-NLS-1$
@@ -237,11 +238,7 @@ public class CDTSharedImages {
 	/** @since 5.4 */
 	public static final String IMG_OVR_LOCK = "icons/ovr16/lock_ovr.gif"; //$NON-NLS-1$
 	/** @since 5.4 */
-	public static final String IMG_OVR_EDITED = "icons/ovr16/edited_ov.gif"; //$NON-NLS-1$
-	/** @since 5.4 */
 	public static final String IMG_OVR_EMPTY = "icons/ovr16/empty_ovr.png"; //$NON-NLS-1$
-	/** @since 5.4 */
-	public static final String IMG_OVR_USER = "icons/ovr16/person_ovr.gif"; //$NON-NLS-1$
 
 	/**
 	 * The method finds URL of the image corresponding to the key which could be project-relative path