Merge branch 'master' of https://github.com/amorellgarcia/arduino-eclipse-plugin into amorellgarcia-master

Conflicts:
	it.baeyens.arduino.core/src/it/baeyens/arduino/tools/ShouldHaveBeenInCDT.java

Author: jantje

it.baeyens.arduino.common/.classpath

@@ -2,6 +2,6 @@
 <classpath>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry excluding="it/baeyens/arduino/arduino/SerialMonitor.java" kind="src" path="src"/>
+	<classpathentry excluding="it/baeyens/arduino/arduino/SerialMonitor.java|it/baeyens/arduino/arduino/mytest.java" kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

it.baeyens.arduino.core/plugin.xml

@@ -267,7 +267,7 @@
           allPopups="true"
           locationURI="toolbar:org.eclipse.ui.main.toolbar">
        <toolbar
-             id="it.baeyens.arduino.toolbar.main">
+             id="it.baeyens.arduino.toolbar.main" label="Arduino">
           <command
                 commandId="it.baeyens.arduino.actions.ArduinoBuildAction"
                 disabledIcon="icons/check_disabled.png"

it.baeyens.arduino.core/src/it/baeyens/arduino/tools/ShouldHaveBeenInCDT.java

@@ -1,16 +1,23 @@
 package it.baeyens.arduino.tools;
 
+<<<<<<< HEAD
 import it.baeyens.arduino.ui.BuildConfigurationsPage.ConfigurationDescriptor;
 
 import java.util.ArrayList;
 
+=======
+import org.eclipse.cdt.core.language.settings.providers.ILanguageSettingsProvider;
+>>>>>>> 900a472803717354280efa2760da613018fee890
 import org.eclipse.cdt.core.language.settings.providers.ILanguageSettingsProvidersKeeper;
+import org.eclipse.cdt.core.language.settings.providers.LanguageSettingsManager;
+import org.eclipse.cdt.core.language.settings.providers.ScannerDiscoveryLegacySupport;
 import org.eclipse.cdt.core.model.CoreModel;
 import org.eclipse.cdt.core.settings.model.ICConfigurationDescription;
 import org.eclipse.cdt.core.settings.model.ICProjectDescription;
 import org.eclipse.cdt.core.settings.model.ICProjectDescriptionManager;
 import org.eclipse.cdt.core.settings.model.extension.CConfigurationData;
 import org.eclipse.cdt.managedbuilder.core.IBuilder;
+import org.eclipse.cdt.managedbuilder.core.IConfiguration;
 import org.eclipse.cdt.managedbuilder.core.IToolChain;
 import org.eclipse.cdt.managedbuilder.core.ManagedBuildManager;
 import org.eclipse.cdt.managedbuilder.internal.core.Configuration;
@@ -22,20 +29,28 @@
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IProgressMonitor;
 
+<<<<<<< HEAD
+=======
+import it.baeyens.arduino.ui.BuildConfigurationsPage.ConfigurationDescriptor;
+
+import java.util.ArrayList;
+import java.util.List;
+
+>>>>>>> 900a472803717354280efa2760da613018fee890
 @SuppressWarnings("restriction")
 // TOFIX Get this code in CDT so I should not have to do this
 public class ShouldHaveBeenInCDT {
     /*
      * Copied from wizard STDWizardHandler package package org.eclipse.cdt.managedbuilder.ui.wizards;; This method creates the .cProject file in your
      * project.
-     * 
+     *
      * BK: modified this and made it work for multiple configs.
      */
     /**
      * This method creates the .cProject file in your project. it is intended to be used with newly created projects. Using this method with project
      * that have existed for some time is unknown
-     * 
-     * 
+     *
+     *
      * @param project
      *            The newly created project that needs a .cproject file.
      * @param alCfgs
@@ -103,16 +118,60 @@ public static void setCProjectDescription(IProject project, ArrayList<Configurat
 	    CConfigurationData data = cfg.getConfigurationData();
 	    ICConfigurationDescription cfgDes = des.createConfiguration(ManagedBuildManager.CFG_DATA_PROVIDER_ID, data);
 
+<<<<<<< HEAD
 	    if (cfgDes instanceof ILanguageSettingsProvidersKeeper) {
 		ILanguageSettingsProvidersKeeper lspk = (ILanguageSettingsProvidersKeeper) cfgDes;
 		lspk.setDefaultLanguageSettingsProvidersIds(new String[] { alCfgs.get(i).ToolchainID });
 	    }
 	    // without this line the indexer doesn't work properly in juno
 	    ConfigurationDataProvider.setDefaultLanguageSettingsProviders(project, cfg, cfgDes);
+=======
+	    setDefaultLanguageSettingsProviders(project, alCfgs.get(i), cfg, cfgDes);
+>>>>>>> 900a472803717354280efa2760da613018fee890
 	}
 	monitor.worked(50);
 	mngr.setProjectDescription(project, des);
 
     }
 
+	private static void setDefaultLanguageSettingsProviders(IProject project, ConfigurationDescriptor cfgDes, IConfiguration cfg, ICConfigurationDescription cfgDescription) {
+		// propagate the preference to project properties
+		boolean isPreferenceEnabled = ScannerDiscoveryLegacySupport.isLanguageSettingsProvidersFunctionalityEnabled(null);
+		ScannerDiscoveryLegacySupport.setLanguageSettingsProvidersFunctionalityEnabled(project, isPreferenceEnabled);
+
+		if (cfgDescription instanceof ILanguageSettingsProvidersKeeper) {
+	    	ILanguageSettingsProvidersKeeper lspk = (ILanguageSettingsProvidersKeeper)cfgDescription;
+
+	    	lspk.setDefaultLanguageSettingsProvidersIds(new String[] {cfgDes.ToolchainID});
+
+			List<ILanguageSettingsProvider> providers = getDefaultLanguageSettingsProviders(cfg, cfgDescription);
+			lspk.setLanguageSettingProviders(providers);
+		}
+	}
+
+	private static List<ILanguageSettingsProvider> getDefaultLanguageSettingsProviders(IConfiguration cfg, ICConfigurationDescription cfgDescription) {
+		List<ILanguageSettingsProvider> providers = new ArrayList<ILanguageSettingsProvider>();
+		String[] ids = cfg != null ? cfg.getDefaultLanguageSettingsProviderIds() : null;
+
+		if (ids == null) {
+			// Try with legacy providers
+			ids = ScannerDiscoveryLegacySupport.getDefaultProviderIdsLegacy(cfgDescription);
+		}
+
+		if (ids != null) {
+			for (String id : ids) {
+				ILanguageSettingsProvider provider = null;
+				if (!LanguageSettingsManager.isPreferShared(id)) {
+					provider = LanguageSettingsManager.getExtensionProviderCopy(id, false);
+				}
+				if (provider == null) {
+					provider = LanguageSettingsManager.getWorkspaceProvider(id);
+				}
+				providers.add(provider);
+			}
+		}
+
+		return providers;
+	}
+
 }