additional type corrections

benfry · benfry · commit 07c6f52db25b · 2015-08-09T20:47:19.000-04:00
diff --git a/app/src/processing/app/Library.java b/app/src/processing/app/Library.java
@@ -256,13 +256,13 @@ static String[] listPlatformEntries(File libraryFolder, String folderName, Strin
    * @param importToLibraryTable mapping from package names to Library objects
    */
 //  public void addPackageList(HashMap<String,Library> importToLibraryTable) {
-  public void addPackageList(Map<String, ArrayList<Library>> importToLibraryTable) {
+  public void addPackageList(Map<String, List<Library>> importToLibraryTable) {
 //    PApplet.println(packages);
     for (String pkg : packageList) {
 //          pw.println(pkg + "\t" + libraryFolder.getAbsolutePath());
 //      PApplet.println(pkg + "\t" + getName());
 //      Library library = importToLibraryTable.get(pkg);
-      ArrayList<Library> libraries = importToLibraryTable.get(pkg);
+      List<Library> libraries = importToLibraryTable.get(pkg);
       if (libraries == null) {
         libraries = new ArrayList<Library>();
         importToLibraryTable.put(pkg, libraries);
diff --git a/app/src/processing/app/Mode.java b/app/src/processing/app/Mode.java
@@ -62,7 +62,7 @@ public abstract class Mode {
 //  protected Tool formatter;
 
   // maps imported packages to their library folder
-  protected Map<String, ArrayList<Library>> importToLibraryTable;
+  protected Map<String, List<Library>> importToLibraryTable;
 
   // these menus are shared so that they needn't be rebuilt for all windows
   // each time a sketch is created, renamed, or moved.
@@ -318,7 +318,7 @@ public File getReferenceFolder() {
   public void rebuildLibraryList() {
     //new Exception("Rebuilding library list").printStackTrace(System.out);
     // reset the table mapping imports to libraries
-    importToLibraryTable = new HashMap<String, ArrayList<Library>>();
+    importToLibraryTable = new HashMap<String, List<Library>>();
 
     Library core = getCoreLibrary();
     if (core != null) {
diff --git a/todo.txt b/todo.txt
@@ -1,4 +1,8 @@
 0241 (3.0b3)
+X don't show breakpoints when debugger is off
+X   https://github.com/processing/processing/issues/3093
+X no setting breakpoints when debugger is off
+X   https://github.com/processing/processing/issues/3306
 _ 'examples' shows as a folder in the sketchbook window
 
 cleaning/earlier
@@ -38,10 +42,6 @@ _ fix red in sidebar, the squiggly line beneath code
 _ show hover text with 'debug'
 _ show number of updates available in the footer
 _   https://github.com/processing/processing/issues/3518
-X don't show breakpoints when debugger is off
-X   https://github.com/processing/processing/issues/3093
-_ no setting breakpoints when debugger is off
-_   https://github.com/processing/processing/issues/3306
 _ make breakpoints more prominent
 _   https://github.com/processing/processing/issues/3307
 _ import suggestions box needs design review
