add core to imports so that GL2 and processing.core doesn't screw up the ErrorCheckerService

benfry · benfry · commit 1bfa12c444bc · 2015-08-08T12:03:41.000-04:00
diff --git a/app/src/processing/app/Library.java b/app/src/processing/app/Library.java
@@ -256,7 +256,7 @@ 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(HashMap<String,ArrayList<Library>> importToLibraryTable) {
+  public void addPackageList(Map<String, ArrayList<Library>> importToLibraryTable) {
 //    PApplet.println(packages);
     for (String pkg : packageList) {
 //          pw.println(pkg + "\t" + libraryFolder.getAbsolutePath());
diff --git a/app/src/processing/app/Mode.java b/app/src/processing/app/Mode.java
@@ -54,16 +54,15 @@ public abstract class Mode {
   protected File folder;
 
   protected TokenMarker tokenMarker;
-  protected HashMap<String, String> keywordToReference =
+  protected Map<String, String> keywordToReference =
     new HashMap<String, String>();
 
   protected Settings theme;
 //  protected Formatter formatter;
 //  protected Tool formatter;
 
   // maps imported packages to their library folder
-//  protected HashMap<String, Library> importToLibraryTable;
-  protected HashMap<String, ArrayList<Library>> importToLibraryTable;
+  protected Map<String, ArrayList<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.
@@ -321,6 +320,11 @@ public void rebuildLibraryList() {
     // reset the table mapping imports to libraries
     importToLibraryTable = new HashMap<String, ArrayList<Library>>();
 
+    Library core = getCoreLibrary();
+    if (core != null) {
+      core.addPackageList(importToLibraryTable);
+    }
+
     coreLibraries = Library.list(librariesFolder);
     for (Library lib : coreLibraries) {
       lib.addPackageList(importToLibraryTable);
@@ -342,7 +346,7 @@ public Library getCoreLibrary() {
 
 
   public Library getLibrary(String pkgName) throws SketchException {
-    ArrayList<Library> libraries = importToLibraryTable.get(pkgName);
+    List<Library> libraries = importToLibraryTable.get(pkgName);
     if (libraries == null) {
       return null;
 
diff --git a/java/src/processing/mode/java/pdex/ASTGenerator.java b/java/src/processing/mode/java/pdex/ASTGenerator.java
@@ -1210,7 +1210,7 @@ public String getPDESourceCodeLine(int javaLineNumber) {
     int res[] = errorCheckerService
         .calculateTabIndexAndLineNumber(javaLineNumber);
     if (res != null) {
-      return errorCheckerService.getPDECodeAtLine(res[0], res[1]);
+      return errorCheckerService.getPdeCodeAtLine(res[0], res[1]);
     }
     return null;
   }
@@ -1657,7 +1657,7 @@ public ASTNodeWrapper getASTNodeAt(int lineNumber, String name, int offset,
 
     // Obtain correspondin java code at that line, match offsets
     if (lineNode != null) {
-      String pdeCodeLine = errorCheckerService.getPDECodeAtLine(editor
+      String pdeCodeLine = errorCheckerService.getPdeCodeAtLine(editor
           .getSketch().getCurrentCodeIndex(), lineNumber);
       String javaCodeLine = getJavaSourceCodeLine(pdeLineNumber);
 
@@ -3301,15 +3301,13 @@ public String[] getSuggestImports(final String className){
     }
 
     log("Looking for class " + className);
-    RegExpResourceFilter regf = new RegExpResourceFilter(
-                                                         Pattern.compile(".*"),
-                                                         Pattern
-                                                             .compile(className
-                                                                          + ".class",
-                                                                      Pattern.CASE_INSENSITIVE));
-    String[] resources = classPath
-        .findResources("", regf);
-    ArrayList<String> candidates = new ArrayList<String>();
+    RegExpResourceFilter regf =
+      new RegExpResourceFilter(Pattern.compile(".*"),
+                               Pattern.compile(className + ".class",
+                                               Pattern.CASE_INSENSITIVE));
+    // TODO once saw NPE here...possible for classPath to be null? [fry 150808]
+    String[] resources = classPath.findResources("", regf);
+    List<String> candidates = new ArrayList<String>();
     for (String res : resources) {
       candidates.add(res);
     }
diff --git a/java/src/processing/mode/java/pdex/ASTNodeWrapper.java b/java/src/processing/mode/java/pdex/ASTNodeWrapper.java
@@ -195,7 +195,7 @@ public int[] getJavaCodeOffsets(ErrorCheckerService ecs) {
     }
    
     int pdeoffsets[] = getPDECodeOffsets(ecs);
-    String pdeCode = ecs.getPDECodeAtLine(pdeoffsets[0],pdeoffsets[1] - 1).trim();
+    String pdeCode = ecs.getPdeCodeAtLine(pdeoffsets[0],pdeoffsets[1] - 1).trim();
     int vals[] = createOffsetMapping(ecs, pdeCode,nodeOffset - altStartPos,nodeLength);
     if (vals != null)
       return new int[] {
@@ -635,7 +635,7 @@ public boolean highlightNode(ASTGenerator astGenerator){
    */
   public int[][] getOffsetMapping(ErrorCheckerService ecs){
     int pdeoffsets[] = getPDECodeOffsets(ecs);
-    String pdeCode = ecs.getPDECodeAtLine(pdeoffsets[0],pdeoffsets[1] - 1).trim();
+    String pdeCode = ecs.getPdeCodeAtLine(pdeoffsets[0],pdeoffsets[1] - 1).trim();
     return getOffsetMapping(ecs, pdeCode);
   }
  
diff --git a/java/src/processing/mode/java/pdex/ErrorCheckerService.java b/java/src/processing/mode/java/pdex/ErrorCheckerService.java
diff --git a/todo.txt b/todo.txt
