#504

Author: jantje

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

@@ -818,7 +818,7 @@ public static void setTheEnvironmentVariables(IProject project, ICConfigurationD
 	File localPlatformFilename = new Path(
 		Common.getBuildEnvironmentVariable(confDesc, Const.ENV_KEY_JANTJE_PLATFORM_FILE, EMPTY_STRING))
 			.toFile();
-	Programmers localProgrammers = Programmers.fromBoards(boardFileName);
+	Programmers localProgrammers[] = Programmers.fromBoards(boardFileName);
 
 	String boardID = Common.getBuildEnvironmentVariable(confDesc, Const.ENV_KEY_JANTJE_BOARD_ID, EMPTY_STRING);
 	String architecture = Common.getBuildEnvironmentVariable(confDesc, Const.ENV_KEY_JANTJE_ARCITECTURE_ID,
@@ -870,8 +870,10 @@ public static void setTheEnvironmentVariables(IProject project, ICConfigurationD
 
 	// Then add the programmers file
 	String programmer = contribEnv.getVariable(get_Jantje_KEY_PROTOCOL(ACTION_UPLOAD), confDesc).getValue();
-	setTheEnvironmentVariablesAddtheBoardsTxt(contribEnv, confDesc, localProgrammers,
-		localProgrammers.getIDFromName(programmer), false);
+	for (Programmers curProgrammer : localProgrammers) {
+	    setTheEnvironmentVariablesAddtheBoardsTxt(contribEnv, confDesc, curProgrammer,
+		    curProgrammer.getIDFromName(programmer), false);
+	}
 
 	// add the stuff that comes with the plugin that is marked as post
 	setTheEnvironmentVariablesAddAFile(contribEnv, confDesc, pluginPostProcessingPlatformTxt);

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

@@ -7,7 +7,8 @@
 import it.baeyens.arduino.common.Const;
 
 public class Programmers extends TxtFile {
-    private static final String programmersFileName = "programmers.txt";//$NON-NLS-1$
+    private static final String programmersFileName1 = "programmers.txt";//$NON-NLS-1$
+    private static final String programmersFileName2 = "externalprogrammers.txt";//$NON-NLS-1$
 
     Programmers(String programmersFileName) {
 	super(new File(programmersFileName));
@@ -17,19 +18,46 @@ public class Programmers extends TxtFile {
 	super(programmersFile);
     }
 
-    public static Programmers fromBoards(String boardsFileName) {
+    public static Programmers[] fromBoards(String boardsFileName) {
 	return fromBoards(new File(boardsFileName));
     }
 
-    public static Programmers fromBoards(File boardsFile) {
-	File BoardsFile = new Path(boardsFile.getParentFile().toString()).append(programmersFileName).toFile();
-	return new Programmers(BoardsFile);
+    public static Programmers[] fromBoards(File boardsFile) {
+	File BoardsFile1 = new Path(boardsFile.getParentFile().toString()).append(programmersFileName1).toFile();
+
+	File BoardsFile2 = new Path(boardsFile.getParentFile().toString()).append(programmersFileName2).toFile();
+	if (BoardsFile1.exists() & BoardsFile2.exists()) {
+	    Programmers ret[] = new Programmers[2];
+
+	    ret[0] = new Programmers(BoardsFile1);
+	    ret[1] = new Programmers(BoardsFile2);
+	    return ret;
+	}
+	if (BoardsFile1.exists()) {
+	    Programmers ret[] = new Programmers[1];
+
+	    ret[0] = new Programmers(BoardsFile1);
+	    return ret;
+	}
+	if (BoardsFile2.exists()) {
+	    Programmers ret[] = new Programmers[1];
+
+	    ret[0] = new Programmers(BoardsFile2);
+	    return ret;
+
+	}
+	return new Programmers[0];
+
     }
 
-    public String[] GetUploadProtocols() {
-	String[] defaultValue = new String[1];
-	defaultValue[0] = Const.DEFAULT;
-	return getAllNames(defaultValue);
+    public static String[] getUploadProtocols(String boardsFileName) {
+	String[] ret = new String[1];
+	ret[0] = Const.DEFAULT;
+	Programmers allProgrammers[] = fromBoards(new File(boardsFileName));
+	for (Programmers curprogrammer : allProgrammers) {
+	    ret = curprogrammer.getAllNames(ret);
+	}
+	return ret;
 
     }
 

it.baeyens.arduino.core/src/it/baeyens/arduino/ui/BoardSelectionPage.java

@@ -140,8 +140,7 @@ public void handleEvent(Event e) {
 	     */
 	    String CurrentUploadProtocol = BoardSelectionPage.this.mControlUploadProtocol.getText();
 	    BoardSelectionPage.this.mControlUploadProtocol.removeAll();
-	    BoardSelectionPage.this.mControlUploadProtocol
-		    .setItems(Programmers.fromBoards(boardFile).GetUploadProtocols());
+	    BoardSelectionPage.this.mControlUploadProtocol.setItems(Programmers.getUploadProtocols(CurrentBoard));
 	    BoardSelectionPage.this.mControlUploadProtocol.setText(CurrentUploadProtocol);
 
 	    if (BoardSelectionPage.this.mControlUploadProtocol.getText().isEmpty()) {
@@ -459,7 +458,7 @@ private void setValues(ICConfigurationDescription confdesc) {
 
 	String CurrentUploadProtocol = BoardSelectionPage.this.mControlUploadProtocol.getText();
 	BoardSelectionPage.this.mControlUploadProtocol.removeAll();
-	BoardSelectionPage.this.mControlUploadProtocol.setItems(Programmers.fromBoards(boardFile).GetUploadProtocols());
+	BoardSelectionPage.this.mControlUploadProtocol.setItems(Programmers.getUploadProtocols(boardFile));
 	BoardSelectionPage.this.mControlUploadProtocol.setText(CurrentUploadProtocol);
 	if (this.mControlUploadProtocol.getText().isEmpty()) {
 	    this.mControlUploadProtocol.setText(uploadProtocol);