Added some error checking to avoid exceptions

Author: jantje

it.baeyens.arduino.common/src/it/baeyens/arduino/common/Const.java

@@ -132,15 +132,13 @@ public class Const {
     public static final String ENV_KEY_JANTJE_SIZE_SWITCH = ENV_KEY_JANTJE_START + "SIZE.SWITCH";//$NON-NLS-1$
     public static final String ENV_KEY_JANTJE_BOARDS_FILE = ENV_KEY_JANTJE_START + "BOARDS_FILE";//$NON-NLS-1$
     public static final String ENV_KEY_JANTJE_PLATFORM_FILE = ENV_KEY_JANTJE_START + "PLATFORM_FILE";//$NON-NLS-1$
-    public static final String ENV_KEY_JANTJE_REFERENCED_PLATFORM_FILE = ENV_KEY_JANTJE_START
-	    + "REFERENCED_PLATFORM_FILE";//$NON-NLS-1$
+    public static final String ENV_KEY_JANTJE_REFERENCED_PLATFORM_FILE = ENV_KEY_JANTJE_START + "REFERENCED_PLATFORM_FILE";//$NON-NLS-1$
     public static final String ENV_KEY_JANTJE_COM_PORT = ENV_KEY_JANTJE_START + "COM_PORT";//$NON-NLS-1$
     public static final String ENV_KEY_JANTJE_BOARD_NAME = ENV_KEY_JANTJE_START + "BOARD_NAME";//$NON-NLS-1$
 
     public static final String ENV_KEY_JANTJE_ADDITIONAL_COMPILE_OPTIONS = ENV_KEY_JANTJE_START + "EXTRA.COMPILE";//$NON-NLS-1$
     public static final String ENV_KEY_JANTJE_ADDITIONAL_C_COMPILE_OPTIONS = ENV_KEY_JANTJE_START + "EXTRA.C.COMPILE";//$NON-NLS-1$
-    public static final String ENV_KEY_JANTJE_ADDITIONAL_CPP_COMPILE_OPTIONS = ENV_KEY_JANTJE_START
-	    + "EXTRA.CPP.COMPILE";//$NON-NLS-1$
+    public static final String ENV_KEY_JANTJE_ADDITIONAL_CPP_COMPILE_OPTIONS = ENV_KEY_JANTJE_START + "EXTRA.CPP.COMPILE";//$NON-NLS-1$
     public static final String ENV_KEY_JANTJE_PACKAGE_ID = ENV_KEY_JANTJE_START + "PACKAGE_ID";//$NON-NLS-1$
     public static final String ENV_KEY_JANTJE_ARCITECTURE_ID = ENV_KEY_JANTJE_START + "ARCHITECTURE_ID";//$NON-NLS-1$
     public static final String ENV_KEY_JANTJE_BOARD_ID = ENV_KEY_JANTJE_START + "BOARD_ID";//$NON-NLS-1$
@@ -152,16 +150,15 @@ public class Const {
     // template Sketch information
 
     public static final String ENV_KEY_JANTJE_SKETCH_TEMPLATE_FOLDER = ENV_KEY_JANTJE_START + "TEMPLATE_FOLDER";//$NON-NLS-1$
-    public static final String ENV_KEY_JANTJE_SKETCH_TEMPLATE_USE_DEFAULT = ENV_KEY_JANTJE_START
-	    + "TEMPLATE_USE_DEFAULT";//$NON-NLS-1$
+    public static final String ENV_KEY_JANTJE_SKETCH_TEMPLATE_USE_DEFAULT = ENV_KEY_JANTJE_START + "TEMPLATE_USE_DEFAULT";//$NON-NLS-1$
 
     public static final String ENV_KEY_WARNING_LEVEL_OFF = " -w ";//$NON-NLS-1$
     public static final String ENV_KEY_WARNING_LEVEL_ON = " -Wall ";//$NON-NLS-1$
 
     public static final String ENV_KEY_GNU_SERIAL_PORTS = "gnu.io.rxtx.SerialPorts";//$NON-NLS-1$
     public static final String ENV_VALUE_GNU_SERIAL_PORTS_LINUX = "/dev/ttyACM0:/dev/ttyACM1:/dev/ttyACM2:/dev/ttyACM3:/dev/ttyUSB0::/dev/ttyUSB1::/dev/ttyUSB2::/dev/ttyUSB3::/dev/ttyUSB4";//$NON-NLS-1$
     // scope stuff
-    public static final short SCOPE_START_DATA = (short) 0xCDAB;// This is the
+    public static final short SCOPE_START_DATA = (short) 0xCDAB;// This is the 205 171 or -85 -51
 								// flag that
 								// indicates
 								// scope data is

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

@@ -264,23 +264,29 @@ private static Set<String> getUnresolvedProjectIncludes(IProject iProject) {
 
     public static void checkLibraries(IProject affectedProject) {
 	ICProjectDescriptionManager mngr = CoreModel.getDefault().getProjectDescriptionManager();
-	ICProjectDescription projectDescription = mngr.getProjectDescription(affectedProject, true);
-	ICConfigurationDescription configurationDescription = projectDescription.getActiveConfiguration();
-
-	Set<String> UnresolvedIncludedHeaders = getUnresolvedProjectIncludes(affectedProject);
-	Set<String> alreadyAddedLibs = getAllLibrariesFromProject(affectedProject);
-	HashMap<String, IPath> availableLibs = getAllInstalledLibraries(configurationDescription);
-	UnresolvedIncludedHeaders.removeAll(alreadyAddedLibs);
-	availableLibs.keySet().retainAll(UnresolvedIncludedHeaders);
-	if (!availableLibs.isEmpty()) {
-	    // there are possible libraries to add
-	    Common.log(new Status(IStatus.INFO, Const.CORE_PLUGIN_ID, "list of libraries to add to project " //$NON-NLS-1$
-		    + affectedProject.getName() + ": " + availableLibs.keySet().toString())); //$NON-NLS-1$
-	    addLibrariesToProject(affectedProject, configurationDescription, availableLibs);
-	    try {
-		mngr.setProjectDescription(affectedProject, projectDescription, true, null);
-	    } catch (CoreException e) {
-		e.printStackTrace();
+	if (mngr != null) {
+	    ICProjectDescription projectDescription = mngr.getProjectDescription(affectedProject, true);
+	    if (projectDescription != null) {
+		ICConfigurationDescription configurationDescription = projectDescription.getActiveConfiguration();
+		if (configurationDescription != null) {
+
+		    Set<String> UnresolvedIncludedHeaders = getUnresolvedProjectIncludes(affectedProject);
+		    Set<String> alreadyAddedLibs = getAllLibrariesFromProject(affectedProject);
+		    HashMap<String, IPath> availableLibs = getAllInstalledLibraries(configurationDescription);
+		    UnresolvedIncludedHeaders.removeAll(alreadyAddedLibs);
+		    availableLibs.keySet().retainAll(UnresolvedIncludedHeaders);
+		    if (!availableLibs.isEmpty()) {
+			// there are possible libraries to add
+			Common.log(new Status(IStatus.INFO, Const.CORE_PLUGIN_ID, "list of libraries to add to project " //$NON-NLS-1$
+				+ affectedProject.getName() + ": " + availableLibs.keySet().toString())); //$NON-NLS-1$
+			addLibrariesToProject(affectedProject, configurationDescription, availableLibs);
+			try {
+			    mngr.setProjectDescription(affectedProject, projectDescription, true, null);
+			} catch (CoreException e) {
+			    e.printStackTrace();
+			}
+		    }
+		}
 	    }
 	}
     }