Various cleanups. Introduced class PreferencesMap to replace/simplify Map<String, String>.

Author: cmaglie

app/src/processing/app/Base.java

@@ -26,6 +26,7 @@
 import java.awt.event.*;
 import java.io.*;
 import java.util.*;
+import java.util.List;
 
 import javax.swing.*;
 
@@ -48,7 +49,7 @@ public class Base {
   /** Set true if this a proper release rather than a numbered revision. */
   static public boolean RELEASE = false;
 
-  static HashMap<Integer, String> platformNames = new HashMap<Integer, String>();
+  static Map<Integer, String> platformNames = new HashMap<Integer, String>();
   static {
     platformNames.put(PConstants.WINDOWS, "windows");
     platformNames.put(PConstants.MACOSX, "macosx");
@@ -78,19 +79,18 @@ public class Base {
   static private File examplesFolder;
   static private File librariesFolder;
   static private File toolsFolder;
-  static private File hardwareFolder;
 
-  static HashSet<File> libraries;
+  static Set<File> libraries;
 
   // maps imported packages to their library folder
-  static HashMap<String, File> importToLibraryTable;
+  static Map<String, File> importToLibraryTable;
 
   // classpath for all known libraries for p5
   // (both those in the p5/libs folder and those with lib subfolders
   // found in the sketchbook)
   static public String librariesClassPath;
 
-  static public HashMap<String, Target> targetsTable;
+  static public Map<String, Target> targetsTable;
 
   // Location for untitled items
   static File untitledFolder;
@@ -99,10 +99,7 @@ public class Base {
 //  static Image icon;
 
 //  int editorCount;
-//  Editor[] editors;
-  java.util.List<Editor> editors =
-    Collections.synchronizedList(new ArrayList<Editor>());
-//  ArrayList editors = Collections.synchronizedList(new ArrayList<Editor>());
+  List<Editor> editors = Collections.synchronizedList(new ArrayList<Editor>());
   Editor activeEditor;
 
 
@@ -956,17 +953,19 @@ public void rebuildImportMenu(JMenu importMenu) {
     //Choose which library to add by chip platform
 
     try {
-		//Find the current target. Get the platform, and then select the correct name and core path.
-	    	String platformname = this.getBoardPreferences().get("platform");
-	    	String targetname = this.getPlatformPreferences(platformname).get("name");
-	        String libraryPath = this.getPlatformPreferences(platformname).get("library.core.path");
+		// Find the current target. Get the platform, and then select the
+		// correct name and core path.
+		String platformname = getBoardPreferences().get("platform");
+		String targetname = getPlatformPreferences(platformname)
+				.get("name");
+		String libraryPath = getPlatformPreferences(platformname).get(
+				"library.core.path");
 
 		JMenuItem platformItem = new JMenuItem(targetname);
 		platformItem.setEnabled(false);
 		importMenu.add(platformItem);
 		importMenu.addSeparator();
 		addLibraries(importMenu, getCoreLibraries(libraryPath));
-    	
     } catch (IOException e) {
       e.printStackTrace();
     }
@@ -1574,91 +1573,28 @@ static public Target getTarget() {
   }
 
 
-static public Map<String, String> getPlatformPreferences() {
-	System.out.println("getPlatformPreferences() no arguments: start");
+  static public PreferencesMap getPlatformPreferences() {
     Target target = getTarget();
-    //if (target == null) return new LinkedHashMap();
-    Map map = target.getPlatforms();
-    /*
-    if (map == null)
-    {
-    	System.err.println("Error loading platforms preference from Target");
-    	System.exit(0);	
-    }
-    */
-    //if (map == null) return new LinkedHashMap();
-    map =  (Map) map.get(Preferences.get("platform"));
-    //if (map == null) return new LinkedHashMap();
-    return map;
+    Map<String, PreferencesMap> platforms = target.getPlatforms();
+    return platforms.get(Preferences.get("platform"));
   }
 
   //Get a specific platform
-  static public Map<String, String> getPlatformPreferences(String platformname) {
-	if (platformname == null) {
-		platformname = Preferences.get("platform");
-		
-	}
-	System.out.println("getlatformPreferences(String platformname)): start: platformname = " + platformname );
+  static public PreferencesMap getPlatformPreferences(String platformName) {
+	if (platformName == null)
+		platformName = Preferences.get("platform");
   	Target target = getTarget();
-	if (target == null ) {
-		System.out.println("get target is null. trouble! ");
-	}
-        Map map = target.getPlatforms();
-        map =  (Map) map.get(platformname);
-
-	//What if null or defaults to nonexisent platform
-	System.out.println("PlatformName: " + platformname);
-	 if (map == null)
-    	{   
-        	System.err.println("Error loading platforms preference from Target");
-        	System.exit(0);
-    	}
-
-    	return map;
-  }
- 
-  static public Map<String, String> bogusgetBoardPreferences() {
-    System.out.println("getBoardPrefences method: start");
-    Target target = getTarget();
-    if (target == null) {
-	    System.out.println("getBoardPrefereces  method: target == null");
-	 return new LinkedHashMap();
-	}
-    Map map = target.getBoards();
-    if (map == null) {
-	System.out.println("getBoardPrefereces  method: target.getBoards() == null");
-	return new LinkedHashMap();
-	}
-    map = (Map) map.get(Preferences.get("board"));
-    if (map == null) {
-	System.out.println("getBoardPrefereces  method: Preferences.get(board)  == null");
-	return new LinkedHashMap();
-	}
-   //Debug iterate the map
-   Iterator iterator = map.entrySet().iterator();
-   while(iterator.hasNext())
-  	    {
-  	    	Map.Entry pair = (Map.Entry)iterator.next();
-  	    	if (pair.getValue() == null)
-  	    	{
-  	    		System.out.println("KeyName: " + pair.getKey() + " val: null");
-  	    	}
-  	    	else
-  	    	{
-			System.out.println("KeyName: " + pair.getKey() + " val"  +  pair.getValue());
-  	    	}
-	    }
-
-    return map;
+    Map<String, PreferencesMap> platforms = target.getPlatforms();
+    return platforms.get(platformName);
   }
 
-static public Map<String, String> getBoardPreferences() {
+  static public PreferencesMap getBoardPreferences() {
     Target target = getTarget();
 	if (target != null) {
 		String board = Preferences.get("board");
 	    return target.getBoards().get(board);
 	}
-    return new HashMap<String, String>();
+    return new PreferencesMap();
   } 
 
   static public File getSketchbookFolder() {

app/src/processing/app/Preferences.java

@@ -782,17 +782,16 @@ static public SyntaxStyle getStyle(String what /*, String dflt*/) {
   }
 
   //get a Map of the Preferences
-  static public Map<String, String> getMap() 
+  static public PreferencesMap getMap() 
   {
-  	Map globalpreferences = new LinkedHashMap();
-    Enumeration e = table.keys();
+  	PreferencesMap globalpreferences = new PreferencesMap();
+    Enumeration<String> e = table.keys();
 
     while (e.hasMoreElements()) 
     {
 		String key = (String) e.nextElement();
-		//System.out.println("Key: " + key + "Val: " + table.get(key));
 		String value = (String) table.get(key);
-        globalpreferences.put(key, value );              
+        globalpreferences.put(key, value);              
     }
 
 	return globalpreferences;	

app/src/processing/app/PreferencesMap.java

@@ -0,0 +1,88 @@
+/*
+ PreferencesMap - A Map<String, String> with some useful features 
+ to handle preferences.
+ Part of the Arduino project - http://www.arduino.cc/
+
+ Copyright (c) 2011 Cristian Maglie
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software Foundation,
+ Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+ $Id$
+ */
+package processing.app;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.HashMap;
+import java.util.Map;
+
+import processing.core.PApplet;
+
+public class PreferencesMap extends HashMap<String, String> {
+
+	/**
+	 * Parse a property list file and put kev/value pairs into the Map
+	 * 
+	 * @param file
+	 * @throws FileNotFoundException
+	 * @throws IOException
+	 */
+	public void load(File file) throws FileNotFoundException, IOException {
+		load(new FileInputStream(file));
+	}
+
+	/**
+	 * Parse a property list stream and put key/value pairs into the Map
+	 * 
+	 * @param input
+	 * @throws IOException
+	 */
+	public void load(InputStream input) throws IOException {
+		String[] lines = PApplet.loadStrings(input);
+		for (String line : lines) {
+			if (line.length() == 0 || line.charAt(0) == '#')
+				continue;
+
+			int equals = line.indexOf('=');
+			if (equals != -1) {
+				String key = line.substring(0, equals);
+				String value = line.substring(equals + 1);
+				put(key.trim(), value.trim());
+			}
+		}
+	}
+
+	public Map<String, PreferencesMap> createFirstLevelMap() {
+		Map<String, PreferencesMap> res = new HashMap<String, PreferencesMap>();
+		for (String key : keySet()) {
+			int dot = key.indexOf('.');
+			if (dot == -1)
+				continue;
+
+			String parent = key.substring(0, dot);
+			String child = key.substring(dot + 1);
+
+			if (!res.containsKey(parent))
+				res.put(parent, new PreferencesMap());
+			res.get(parent).put(child, get(key));
+		}
+		return res;
+	}
+
+	private static final long serialVersionUID = 2330591567444282843L;
+}