From 3c01c5ff77b4d43b4cf582fcc497a5f32c7bd629 Mon Sep 17 00:00:00 2001 From: Cristian Maglie Date: Sat, 2 Mar 2013 13:24:59 +0100 Subject: [PATCH] A lot of refactoring on Preferences, custom menus and Boards: - Merged MapWithSubkeys into PreferencesMap. - Added TargetBoard class. - Simplified a bit submenu generation. --- app/src/processing/app/Base.java | 132 ++++++++------- app/src/processing/app/debug/TargetBoard.java | 47 ++++++ .../processing/app/debug/TargetPackage.java | 30 ++-- .../processing/app/debug/TargetPlatform.java | 102 ++++++++---- .../app/debug/TargetPlatformException.java | 22 +++ app/src/processing/app/helpers/Maps.java | 15 -- .../app/helpers/PreferencesMap.java | 153 ++++++++++++++++-- .../processing/app/tools/MapWithSubkeys.java | 66 -------- .../app/tools/MapWithSubkeysTest.java | 59 ------- 9 files changed, 366 insertions(+), 260 deletions(-) create mode 100644 app/src/processing/app/debug/TargetBoard.java create mode 100644 app/src/processing/app/debug/TargetPlatformException.java delete mode 100644 app/src/processing/app/helpers/Maps.java delete mode 100644 app/src/processing/app/tools/MapWithSubkeys.java delete mode 100644 app/test/processing/app/tools/MapWithSubkeysTest.java diff --git a/app/src/processing/app/Base.java b/app/src/processing/app/Base.java index eb4545958..3057a1da9 100644 --- a/app/src/processing/app/Base.java +++ b/app/src/processing/app/Base.java @@ -30,16 +30,16 @@ import java.util.List; import javax.swing.*; +import processing.app.debug.TargetBoard; import processing.app.debug.TargetPackage; import processing.app.debug.TargetPlatform; +import processing.app.debug.TargetPlatformException; import processing.app.helpers.FileUtils; -import processing.app.helpers.Maps; import processing.app.helpers.PreferencesMap; import processing.app.helpers.filefilters.OnlyDirs; import processing.app.helpers.filefilters.OnlyFilesWithExtension; import processing.app.javax.swing.filechooser.FileNameExtensionFilter;import processing.app.packages.Library; import processing.app.packages.LibraryList; -import processing.app.tools.MapWithSubkeys; import processing.app.tools.ZipDeflater; import processing.core.*; import static processing.app.I18n._; @@ -116,7 +116,6 @@ public class Base { static File portableFolder = null; static final String portableSketchbookFolder = "sketchbook"; - static public void main(String args[]) throws Exception { initPlatform(); @@ -290,6 +289,11 @@ public class Base { packages = new HashMap(); loadHardware(getHardwareFolder()); loadHardware(getSketchbookHardwareFolder()); + if (packages.size() == 0) { + System.out.println(_("No valid configured cores found! Exiting...")); + System.exit(3); + } + // Setup board-dependent variables. onBoardOrPortChange(); @@ -1180,7 +1184,7 @@ public class Base { try { libraries = scanLibraries(librariesFolders); } catch (IOException e) { - showWarning(_("Error"), _("Error reading preferences"), e); + showWarning(_("Error"), _("Error loading libraries"), e); } String currentArch = Base.getTargetPlatform().getName(); libraries = libraries.filterByArchitecture(currentArch); @@ -1224,16 +1228,15 @@ public class Base { // For every package cycle through all platform for (TargetPlatform targetPlatform : targetPackage.platforms()) { String platformName = targetPlatform.getName(); - Map boards = targetPlatform.getBoards(); + PreferencesMap customMenus = targetPlatform.getCustomMenus(); if (targetPlatform.getPreferences().get("name") == null || targetPlatform.getBoards().isEmpty()) { continue; } // Add a title for each group of boards - if (!first) { + if (!first) boardsMenu.add(new JSeparator()); - } first = false; JMenuItem separator = new JMenuItem(_(targetPlatform.getPreferences().get("name"))); @@ -1241,70 +1244,70 @@ public class Base { boardsMenu.add(separator); // For every platform cycle through all boards - for (final String boardID : targetPlatform.getBoards().keySet()) { + for (TargetBoard board : targetPlatform.getBoards().values()) { // Setup a menu item for the current board - String boardName = boards.get(boardID).get("name"); + String boardName = board.getName(); + String boardId = board.getId(); @SuppressWarnings("serial") Action action = new AbstractAction(boardName) { public void actionPerformed(ActionEvent actionevent) { selectBoard((String) getValue("b"), editor); } }; - action.putValue("b", packageName + ":" + platformName + ":" + boardID); + action.putValue("b", packageName + ":" + platformName + ":" + boardId); JRadioButtonMenuItem item = new JRadioButtonMenuItem(action); boardsMenu.add(item); boardsButtonGroup.add(item); - if (selBoard.equals(boardID) && selPackage.equals(packageName) + if (selBoard.equals(boardId) && selPackage.equals(packageName) && selPlatform.equals(platformName)) { menuItemsToClickAfterStartup.add(item); } - if (targetPlatform.getCustomMenus() != null) { - List customMenuIDs = new LinkedList(targetPlatform.getCustomMenus().getKeys()); - for (int i = 0; i < customMenuIDs.size(); i++) { - final String customMenuID = customMenuIDs.get(i); - JMenu menu = makeOrGetBoardMenu(toolsMenu, _(targetPlatform.getCustomMenus().getValueOf(customMenuID))); - MapWithSubkeys customMenu = targetPlatform.getCustomMenus().get(customMenuID); - if (customMenu.getKeys().contains(boardID)) { - MapWithSubkeys boardCustomMenu = customMenu.get(boardID); - final int currentIndex = i + 1 + 1; //plus 1 to skip the first board menu, plus 1 to keep the custom menu next to this one - for (final String customMenuOption : boardCustomMenu.getKeys()) { - @SuppressWarnings("serial") - Action subAction = new AbstractAction(_(boardCustomMenu.getValueOf(customMenuOption))) { + int i = 0; + for (final String customMenuId : customMenus.topLevelKeySet()) { + String title = customMenus.get(customMenuId); + JMenu menu = makeOrGetBoardMenu(toolsMenu, _(title)); + + Map customMenu = customMenus.subTree(customMenuId).firstLevelMap(); + if (customMenu.containsKey(boardId)) { + PreferencesMap boardCustomMenu = customMenu.get(boardId); + final int currentIndex = i + 1 + 1; //plus 1 to skip the first board menu, plus 1 to keep the custom menu next to this one + i++; + for (String customMenuOption : boardCustomMenu.topLevelKeySet()) { + @SuppressWarnings("serial") + Action subAction = new AbstractAction(_(boardCustomMenu.get(customMenuOption))) { + public void actionPerformed(ActionEvent e) { + Preferences.set("target_package", (String) getValue("package")); + Preferences.set("target_platform", (String) getValue("platform")); + Preferences.set("board", (String) getValue("board")); + Preferences.set("custom_" + customMenuId, (String) getValue("board") + "_" + (String) getValue("custom_menu_option")); - public void actionPerformed(ActionEvent e) { - Preferences.set("target_package", (String) getValue("package")); - Preferences.set("target_platform", (String) getValue("platform")); - Preferences.set("board", (String) getValue("board")); - Preferences.set("custom_" + customMenuID, boardID + "_" + (String) getValue("custom_menu_option")); + filterVisibilityOfSubsequentBoardMenus((String) getValue("board"), currentIndex); - filterVisibilityOfSubsequentBoardMenus((String) getValue("board"), currentIndex); - - onBoardOrPortChange(); - Sketch.buildSettingChanged(); - rebuildImportMenu(Editor.importMenu, editor); - rebuildExamplesMenu(Editor.examplesMenu); - } - }; - subAction.putValue("board", boardID); - subAction.putValue("custom_menu_option", customMenuOption); - subAction.putValue("package", packageName); - subAction.putValue("platform", platformName); - - if (!buttonGroupsMap.containsKey(customMenuID)) { - buttonGroupsMap.put(customMenuID, new ButtonGroup()); + onBoardOrPortChange(); + Sketch.buildSettingChanged(); + rebuildImportMenu(Editor.importMenu, editor); + rebuildExamplesMenu(Editor.examplesMenu); } + }; + subAction.putValue("board", boardId); + subAction.putValue("custom_menu_option", customMenuOption); + subAction.putValue("package", packageName); + subAction.putValue("platform", platformName); - item = new JRadioButtonMenuItem(subAction); - menu.add(item); - buttonGroupsMap.get(customMenuID).add(item); + if (!buttonGroupsMap.containsKey(customMenuId)) { + buttonGroupsMap.put(customMenuId, new ButtonGroup()); + } - String selectedCustomMenuEntry = Preferences.get("custom_" + customMenuID); - if (selBoard.equals(boardID) && (boardID + "_" + customMenuOption).equals(selectedCustomMenuEntry)) { - menuItemsToClickAfterStartup.add(item); - } + item = new JRadioButtonMenuItem(subAction); + menu.add(item); + buttonGroupsMap.get(customMenuId).add(item); + + String selectedCustomMenuEntry = Preferences.get("custom_" + customMenuId); + if (selBoard.equals(boardId) && (boardId + "_" + customMenuOption).equals(selectedCustomMenuEntry)) { + menuItemsToClickAfterStartup.add(item); } } } @@ -1604,7 +1607,13 @@ public class Base { if (target.equals("tools")) continue; File subfolder = new File(folder, target); - packages.put(target, new TargetPackage(target, subfolder)); + + try { + packages.put(target, new TargetPackage(target, subfolder)); + } catch (TargetPlatformException e) { + System.out.println("WARNING: Error loading hardware folder " + target); + System.out.println(" " + e.getMessage()); + } } } @@ -1921,19 +1930,18 @@ public class Base { return getTargetPlatform(pack, Preferences.get("target_platform")); } - static public Map getBoardPreferences() { + static public PreferencesMap getBoardPreferences() { TargetPlatform target = getTargetPlatform(); String board = Preferences.get("board"); - Map boardPreferences = Maps.merge(target.getBoards().get(board), new LinkedHashMap()); - if (target.getCustomMenus() != null) { - for (String customMenuID : target.getCustomMenus().getKeys()) { - MapWithSubkeys boardCustomMenu = target.getCustomMenus().get(customMenuID).get(board); - String selectedCustomMenuEntry = Preferences.get("custom_" + customMenuID); - if (boardCustomMenu != null && selectedCustomMenuEntry != null && selectedCustomMenuEntry.startsWith(board)) { - String menuEntryId = selectedCustomMenuEntry.substring(selectedCustomMenuEntry.indexOf("_") + 1); - Maps.merge(boardCustomMenu.get(menuEntryId).getValues(), boardPreferences); - boardPreferences.put("name", boardPreferences.get("name") + ", " + boardCustomMenu.getValueOf(menuEntryId)); - } + PreferencesMap boardPreferences = new PreferencesMap(target.getBoard(board).getPreferences()); + PreferencesMap customMenus = target.getCustomMenus(); + for (String customMenuID : customMenus.topLevelKeySet()) { + PreferencesMap boardCustomMenu = customMenus.subTree(customMenuID).subTree(board); + String selectedCustomMenuEntry = Preferences.get("custom_" + customMenuID); + if (boardCustomMenu.size() > 0 && selectedCustomMenuEntry != null && selectedCustomMenuEntry.startsWith(board)) { + String menuEntryId = selectedCustomMenuEntry.substring(selectedCustomMenuEntry.indexOf("_") + 1); + boardPreferences.putAll(boardCustomMenu.subTree(menuEntryId)); + boardPreferences.put("name", boardPreferences.get("name") + ", " + boardCustomMenu.get(menuEntryId)); } } return boardPreferences; diff --git a/app/src/processing/app/debug/TargetBoard.java b/app/src/processing/app/debug/TargetBoard.java new file mode 100644 index 000000000..bb489c13e --- /dev/null +++ b/app/src/processing/app/debug/TargetBoard.java @@ -0,0 +1,47 @@ +package processing.app.debug; + +import processing.app.helpers.PreferencesMap; + +public class TargetBoard { + + String id; + PreferencesMap prefs; + + /** + * Create a TargetBoard based on preferences passed as argument. + * + * @param _prefs + * @return + */ + public TargetBoard(String _id, PreferencesMap _prefs) { + id = _id; + prefs = new PreferencesMap(_prefs); + } + + /** + * Get the name of the board. + * + * @return + */ + public String getName() { + return prefs.get("name"); + } + + /** + * Get the identifier of the board + * + * @return + */ + public String getId() { + return id; + } + + /** + * Get the full preferences map of the board with a given identifier + * + * @return + */ + public PreferencesMap getPreferences() { + return prefs; + } +} diff --git a/app/src/processing/app/debug/TargetPackage.java b/app/src/processing/app/debug/TargetPackage.java index 3d9e8fcd5..6d04082da 100644 --- a/app/src/processing/app/debug/TargetPackage.java +++ b/app/src/processing/app/debug/TargetPackage.java @@ -25,29 +25,31 @@ package processing.app.debug; import java.io.File; import java.util.Collection; -import java.util.HashMap; +import java.util.LinkedHashMap; import java.util.Map; import processing.app.helpers.filefilters.OnlyDirs; public class TargetPackage { - private final String name; + private String name; - Map platforms = new HashMap(); + Map platforms = new LinkedHashMap(); - public TargetPackage(String name, File folder) { - this.name = name; + public TargetPackage(String packageName, File packageFolder) + throws TargetPlatformException { + name = packageName; - String[] platformsList = folder.list(new OnlyDirs()); - if (platformsList != null) { - for (String platformName : platformsList) { - File platformFolder = new File(folder, platformName); - if (platformFolder.exists() && platformFolder.canRead()) { - TargetPlatform platform = new TargetPlatform(platformName, platformFolder); - platforms.put(platformName, platform); - } - } + File[] folders = packageFolder.listFiles(new OnlyDirs()); + if (folders == null) + return; + + for (File folder : folders) { + if (!folder.exists() || !folder.canRead()) + continue; + String arch = folder.getName(); + TargetPlatform platform = new TargetPlatform(arch, folder); + platforms.put(arch, platform); } } diff --git a/app/src/processing/app/debug/TargetPlatform.java b/app/src/processing/app/debug/TargetPlatform.java index 5ff600adf..e9dd6bb58 100644 --- a/app/src/processing/app/debug/TargetPlatform.java +++ b/app/src/processing/app/debug/TargetPlatform.java @@ -24,62 +24,90 @@ package processing.app.debug; import static processing.app.I18n._; +import static processing.app.I18n.format; import java.io.File; -import java.util.HashMap; +import java.io.IOException; +import java.util.LinkedHashMap; import java.util.Map; import processing.app.helpers.PreferencesMap; -import processing.app.tools.MapWithSubkeys; public class TargetPlatform { + private String name; private File folder; - private Map boards; - private Map programmers; - private PreferencesMap preferences; - private MapWithSubkeys customMenus; - public TargetPlatform(String _name, File _folder) { + /** + * Contains preferences for every defined board + */ + private Map boards = new LinkedHashMap(); + + /** + * Contains preferences for every defined programmer + */ + private Map programmers = new LinkedHashMap(); + + /** + * Contains preferences for platform + */ + private PreferencesMap preferences = new PreferencesMap(); + + private PreferencesMap customMenus = new PreferencesMap(); + + public TargetPlatform(String _name, File _folder) + throws TargetPlatformException { name = _name; folder = _folder; - boards = new HashMap(); - programmers = new HashMap(); - preferences = new PreferencesMap(); + // If there is no boards.txt, this is not a valid 1.5 hardware folder + File boardsFile = new File(folder, "boards.txt"); + if (!boardsFile.exists() || !boardsFile.canRead()) + throw new TargetPlatformException( + format(_("Could not find boards.txt in {0}. Is it pre-1.5?"), + boardsFile.getAbsolutePath())); + + // Load boards try { - File boardsFile = new File(_folder, "boards.txt"); - if (boardsFile.exists() && boardsFile.canRead()) { - PreferencesMap boardPreferences = new PreferencesMap(); - boardPreferences.load(boardsFile); - boards = boardPreferences.createFirstLevelMap(); - customMenus = MapWithSubkeys.createFrom(boards.get("menu")); - boards.remove("menu"); + PreferencesMap p = new PreferencesMap(boardsFile); + Map boardsPreferences = p.firstLevelMap(); + + // Create custom menus using the key "menu" and its subkeys + if (boardsPreferences.containsKey("menu")) { + customMenus = new PreferencesMap(boardsPreferences.get("menu")); + boardsPreferences.remove("menu"); } - } catch (Exception e) { - e.printStackTrace(); - System.err.println("Error loading boards from boards.txt: " + e); + + // Create boards + for (String id : boardsPreferences.keySet()) { + PreferencesMap preferences = boardsPreferences.get(id); + boards.put(id, new TargetBoard(id, preferences)); + } + } catch (IOException e) { + throw new TargetPlatformException(format(_("Error loading {0}"), + boardsFile.getAbsolutePath()), e); } + File platformsFile = new File(folder, "platform.txt"); try { - File platformsFile = new File(_folder, "platform.txt"); if (platformsFile.exists() && platformsFile.canRead()) { preferences.load(platformsFile); } - } catch (Exception e) { - System.err.println("Error loading platforms from platform.txt: " + e); + } catch (IOException e) { + throw new TargetPlatformException( + format(_("Error loading {0}"), platformsFile.getAbsolutePath()), e); } + File progFile = new File(folder, "programmers.txt"); try { - File programmersFile = new File(_folder, "programmers.txt"); - if (programmersFile.exists() && programmersFile.canRead()) { + if (progFile.exists() && progFile.canRead()) { PreferencesMap prefs = new PreferencesMap(); - prefs.load(programmersFile); - programmers = prefs.createFirstLevelMap(); + prefs.load(progFile); + programmers = prefs.firstLevelMap(); } - } catch (Exception e) { - System.err - .println("Error loading programmers from programmers.txt: " + e); + } catch (IOException e) { + throw new TargetPlatformException(format(_("Error loading {0}"), progFile + .getAbsolutePath()), e); } } @@ -91,11 +119,11 @@ public class TargetPlatform { return folder; } - public Map getBoards() { + public Map getBoards() { return boards; } - public MapWithSubkeys getCustomMenus() { + public PreferencesMap getCustomMenus() { return customMenus; } @@ -106,12 +134,16 @@ public class TargetPlatform { public PreferencesMap getProgrammer(String programmer) { return getProgrammers().get(programmer); } - + public PreferencesMap getTool(String tool) { - return getPreferences().createSubTree("tools").createSubTree(tool); + return getPreferences().subTree("tools").subTree(tool); } - + public PreferencesMap getPreferences() { return preferences; } + + public TargetBoard getBoard(String boardId) { + return boards.get(boardId); + } } diff --git a/app/src/processing/app/debug/TargetPlatformException.java b/app/src/processing/app/debug/TargetPlatformException.java new file mode 100644 index 000000000..edb5366ec --- /dev/null +++ b/app/src/processing/app/debug/TargetPlatformException.java @@ -0,0 +1,22 @@ +package processing.app.debug; + +@SuppressWarnings("serial") +public class TargetPlatformException extends Exception { + + public TargetPlatformException() { + super(); + } + + public TargetPlatformException(String arg0, Throwable arg1) { + super(arg0, arg1); + } + + public TargetPlatformException(String arg0) { + super(arg0); + } + + public TargetPlatformException(Throwable arg0) { + super(arg0); + } + +} diff --git a/app/src/processing/app/helpers/Maps.java b/app/src/processing/app/helpers/Maps.java deleted file mode 100644 index 439cb6bc5..000000000 --- a/app/src/processing/app/helpers/Maps.java +++ /dev/null @@ -1,15 +0,0 @@ -package processing.app.helpers; - -import java.util.Map; -import java.util.Map.Entry; - -public class Maps { - - public static Map merge(Map input, Map target) { - for (Entry entry : input.entrySet()) { - target.put(entry.getKey(), entry.getValue()); - } - return target; - } - -} diff --git a/app/src/processing/app/helpers/PreferencesMap.java b/app/src/processing/app/helpers/PreferencesMap.java index 52ff7c3f2..23640875e 100644 --- a/app/src/processing/app/helpers/PreferencesMap.java +++ b/app/src/processing/app/helpers/PreferencesMap.java @@ -28,17 +28,43 @@ import java.io.FileInputStream; import java.io.FileNotFoundException; import java.io.IOException; import java.io.InputStream; -import java.util.*; +import java.util.Collection; +import java.util.LinkedHashMap; +import java.util.LinkedHashSet; +import java.util.Map; +import java.util.Set; +import java.util.SortedSet; +import java.util.TreeSet; import processing.app.Base; import processing.core.PApplet; +@SuppressWarnings("serial") public class PreferencesMap extends LinkedHashMap { public PreferencesMap(Map table) { super(table); } + /** + * Create a PreferencesMap and load the content of the file passed as + * argument. + * + * Is equivalent to: + * + * 
+   * PreferencesMap map = new PreferencesMap();
+   * map.load(file);
+   *
+ * + * @param file + * @throws IOException + */ + public PreferencesMap(File file) throws IOException { + super(); + load(file); + } + public PreferencesMap() { super(); } @@ -75,7 +101,7 @@ public class PreferencesMap extends LinkedHashMap { } // This is needed to avoid ConcurrentAccessExceptions - Set keys = new HashSet(keySet()); + Set keys = new LinkedHashSet(keySet()); // Override keys that have OS specific versions for (String key : keys) { @@ -95,13 +121,109 @@ public class PreferencesMap extends LinkedHashMap { } /** - * Create a new Map where the keys are the first level - * of the current mapping. E.g. the folowing mapping:
+ * Create a new PreferenceMap that contains all the top level pairs of the + * current mapping. E.g. the folowing mapping:
* * 
    * Map (
+   *     alpha = Alpha
    *     alpha.some.keys = v1
    *     alpha.other.keys = v2
+   *     beta = Beta
+   *     beta.some.keys = v3
+   *   )
+   *
+ * + * will generate the following result: + * + * 
+   * Map (
+   *     alpha = Alpha
+   *     beta = Beta
+   *   )
+   *
+ * + * @return + */ + public PreferencesMap topLevelMap() { + PreferencesMap res = new PreferencesMap(); + for (String key : keySet()) { + if (key.contains(".")) + continue; + res.put(key, get(key)); + } + return res; + } + + /** + * Returns the values of all the top level pairs of the current mapping. E.g. + * the folowing mapping:
+ * + * 
+   * Map (
+   *     alpha = Alpha
+   *     alpha.some.keys = v1
+   *     alpha.other.keys = v2
+   *     beta = Beta
+   *     beta.some.keys = v3
+   *   )
+   *
+ * + * will generate the following result: + * + * 
+   * Collection (
+   *     Alpha
+   *     Beta
+   *   )
+   *
+ * + * @return + */ + public Collection topLevelValues() { + return topLevelMap().values(); + } + + /** + * Returns a key set of all the top level pairs of the current mapping. E.g. + * the folowing mapping:
+ * + * 
+   * Map (
+   *     alpha = Alpha
+   *     alpha.some.keys = v1
+   *     alpha.other.keys = v2
+   *     beta = Beta
+   *     beta.some.keys = v3
+   *   )
+   *
+ * + * will generate the following result: + * + * 
+   * Set (
+   *     alpha
+   *     beta
+   *   )
+   *
+ * + * @return + */ + public Set topLevelKeySet() { + return topLevelMap().keySet(); + } + + /** + * Create a new Map where keys are the first level of + * the current mapping. Top level pairs are discarded. E.g. the folowing + * mapping:
+ * + * 
+   * Map (
+   *     alpha = Alpha
+   *     alpha.some.keys = v1
+   *     alpha.other.keys = v2
+   *     beta = Beta
    *     beta.some.keys = v3
    *   )
    *
@@ -120,7 +242,7 @@ public class PreferencesMap extends LinkedHashMap { * * @return */ - public Map createFirstLevelMap() { + public Map firstLevelMap() { Map res = new LinkedHashMap(); for (String key : keySet()) { int dot = key.indexOf('.'); @@ -138,13 +260,15 @@ public class PreferencesMap extends LinkedHashMap { } /** - * Create a new PreferenceMap using a subtree of the current mapping. E.g. - * with the folowing mapping:
+ * Create a new PreferenceMap using a subtree of the current mapping. Top + * level pairs are ignored. E.g. with the following mapping:
* * 
    * Map (
+   *     alpha = Alpha
    *     alpha.some.keys = v1
    *     alpha.other.keys = v2
+   *     beta = Beta
    *     beta.some.keys = v3
    *   )
    *
@@ -161,7 +285,7 @@ public class PreferencesMap extends LinkedHashMap { * @param parent * @return */ - public PreferencesMap createSubTree(String parent) { + public PreferencesMap subTree(String parent) { PreferencesMap res = new PreferencesMap(); parent += "."; int parentLen = parent.length(); @@ -172,5 +296,16 @@ public class PreferencesMap extends LinkedHashMap { return res; } - private static final long serialVersionUID = 2330591567444282843L; + public String toString(String indent) { + String res = indent + "{\n"; + SortedSet treeSet = new TreeSet(keySet()); + for (String k : treeSet) + res += indent + k + " = " + get(k) + "\n"; + return res; + } + + @Override + public String toString() { + return toString(""); + } } diff --git a/app/src/processing/app/tools/MapWithSubkeys.java b/app/src/processing/app/tools/MapWithSubkeys.java deleted file mode 100644 index 1ad5e4b62..000000000 --- a/app/src/processing/app/tools/MapWithSubkeys.java +++ /dev/null @@ -1,66 +0,0 @@ -package processing.app.tools; - -import java.util.*; -import java.util.Map.Entry; - -public class MapWithSubkeys { - - public static MapWithSubkeys createFrom(Map input) { - if (input == null) { - return null; - } - MapWithSubkeys target = new MapWithSubkeys(); - for (Entry entry : input.entrySet()) { - String[] entryParts = entry.getKey().split("\\."); - if (entryParts.length == 1) { - target.put(entryParts[0], entry.getValue()); - } else if (entryParts.length == 3) { - target.get(entryParts[0]).get(entryParts[1]).put(entryParts[2], entry.getValue()); - } else if (entryParts.length > 3) { - StringBuilder sb = new StringBuilder(); - for (int i = 3; i < entryParts.length; i++) { - sb.append(entryParts[i]).append("."); - } - sb.deleteCharAt(sb.length() - 1); - String key = sb.toString(); - target.get(entryParts[0]).get(entryParts[1]).get(entryParts[2]).put(key, entry.getValue()); - } - } - return target; - } - - private final Map values; - private final Map maps; - - public MapWithSubkeys() { - this.values = new LinkedHashMap(); - this.maps = new LinkedHashMap(); - } - - public Collection getKeys() { - return values.keySet(); - } - - public Map getValues() { - return values; - } - - public String getValueOf(String key) { - return values.get(key); - } - - public MapWithSubkeys get(String key) { - if (!maps.containsKey(key)) { - maps.put(key, new MapWithSubkeys()); - } - if (!values.containsKey(key)) { - put(key, null); - } - return maps.get(key); - } - - public void put(String key, String value) { - values.put(key, value); - } - -} diff --git a/app/test/processing/app/tools/MapWithSubkeysTest.java b/app/test/processing/app/tools/MapWithSubkeysTest.java deleted file mode 100644 index a602e08f6..000000000 --- a/app/test/processing/app/tools/MapWithSubkeysTest.java +++ /dev/null @@ -1,59 +0,0 @@ -package processing.app.tools; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - -import java.io.BufferedReader; -import java.io.InputStreamReader; -import java.util.Collection; -import java.util.HashMap; -import java.util.Map; - -import org.junit.Before; -import org.junit.Test; - -public class MapWithSubkeysTest { - - private MapWithSubkeys map; - - @Before - public void setup() throws Exception { - Map input = new HashMap(); - BufferedReader reader = new BufferedReader(new InputStreamReader(MapWithSubkeysTest.class.getResourceAsStream("test_partial_boards.txt"))); - String line = null; - while ((line = reader.readLine()) != null) { - String[] lineParts = line.split("="); - input.put(lineParts[0], lineParts[1]); - } - map = MapWithSubkeys.createFrom(input); - } - - @Test - public void shouldListCustomMenusIDs() { - Collection menusIDs = map.getKeys(); - - assertEquals(2, menusIDs.size()); - assertTrue(menusIDs.contains("cpu")); - assertTrue(menusIDs.contains("speed")); - - assertEquals("Processor", map.getValueOf("cpu")); - - MapWithSubkeys cpu = map.get("cpu"); - - Collection boards = cpu.getKeys(); - assertEquals(1, boards.size()); - assertTrue(boards.contains("nano")); - - Collection cpuNanoProcessors = cpu.get("nano").getKeys(); - assertEquals(2, cpuNanoProcessors.size()); - assertTrue(cpuNanoProcessors.contains("atmega168")); - assertTrue(cpuNanoProcessors.contains("atmega328")); - assertEquals("ATmega168", cpu.get("nano").getValueOf("atmega168")); - assertEquals("ATmega328", cpu.get("nano").getValueOf("atmega328")); - - MapWithSubkeys atmega168Properties = cpu.get("nano").get("atmega168"); - assertEquals(9, atmega168Properties.getKeys().size()); - assertTrue(atmega168Properties.getKeys().contains("bootloader.high_fuses")); - } - -}