From fb4ed64d56f82a4cbb3c685ae3a5858ae2366307 Mon Sep 17 00:00:00 2001 From: ricklon Date: Sat, 26 Mar 2011 22:03:34 -0400 Subject: [PATCH] Fixed missing iterator for boardPreferences. Former-commit-id: 5f189588fb423a8d0b05f3de453123589822ceff --- app/src/processing/app/debug/Compiler.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/src/processing/app/debug/Compiler.java b/app/src/processing/app/debug/Compiler.java index 826a33816..4e2942b1c 100644 --- a/app/src/processing/app/debug/Compiler.java +++ b/app/src/processing/app/debug/Compiler.java @@ -134,7 +134,7 @@ public boolean compile(Sketch sketch, String buildPath,String primaryClassName, this.objectFiles = new ArrayList(); //Put all the global preference configuration into one Master configpreferences - configPreferences = mergePreferences( Preferences.getMap(), platformPreferences, this.boardPreferences); + configPreferences = mergePreferences( Preferences.getMap(), platformPreferences, Base.getBoardPreferences()); // 0. include paths for core + all libraries this.includePaths = new ArrayList(); @@ -765,8 +765,8 @@ HashMap mergePreferences(Map Preferences, Map platformPreferences, Map boardPre } System.out.println("Done: platformPreferences"); - boardPreferences.entrySet().iterator(); - + iterator = boardPreferences.entrySet().iterator(); + while(iterator.hasNext()) { Map.Entry pair = (Map.Entry)iterator.next(); @@ -779,7 +779,7 @@ HashMap mergePreferences(Map Preferences, Map platformPreferences, Map boardPre { _map.put(pair.getKey(), pair.getValue()); } - System.out.println(pair.getKey() + " = " + pair.getValue()); + //System.out.println(pair.getKey() + " = " + pair.getValue()); } System.out.println("Done: boardPreferences");