ECS: make library lookup thread safe

JakubValtar · JakubValtar · commit 49823a0d8f51 · 2016-05-03T12:16:58.000+02:00
diff --git a/app/src/processing/app/Mode.java b/app/src/processing/app/Mode.java
@@ -282,7 +282,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, List<Library>>();
+    HashMap<String, List<Library>> importToLibraryTable = new HashMap<>();
 
     Library core = getCoreLibrary();
     if (core != null) {
@@ -323,6 +323,11 @@ public void rebuildLibraryList() {
     for (Library lib : contribLibraries) {
       lib.addPackageList(importToLibraryTable);
     }
+
+    // Make this Map thread-safe
+    this.importToLibraryTable = Collections.unmodifiableMap(importToLibraryTable);
+
+    base.getEditors().forEach(Editor::librariesChanged);
   }
 
 
diff --git a/java/src/processing/mode/java/pdex/ErrorCheckerService.java b/java/src/processing/mode/java/pdex/ErrorCheckerService.java
@@ -703,7 +703,7 @@ private List<String> buildSketchLibraryClassPath(JavaMode mode,
         .filter(pckg -> !ignorableImport(pckg))
         .map(pckg -> {
           try {
-            return mode.getLibrary(pckg); // TODO: this may not be thread-safe
+            return mode.getLibrary(pckg);
           } catch (SketchException e) {
             return null;
           }

Original file line number	Diff line number	Diff line change
`@@ -703,7 +703,7 @@ private List<String> buildSketchLibraryClassPath(JavaMode mode,`
`703`	`703`	`.filter(pckg -> !ignorableImport(pckg))`
`704`	`704`	`.map(pckg -> {`
`705`	`705`	`try {`
`706`		`- return mode.getLibrary(pckg); // TODO: this may not be thread-safe`
	`706`	`+ return mode.getLibrary(pckg);`
`707`	`707`	`} catch (SketchException e) {`
`708`	`708`	`return null;`
`709`	`709`	`}`