Revert "Implemented code folder imports. Fixes processing#3732"

This reverts commit 2450880. Conflicts: java/src/processing/mode/java/pdex/ASTGenerator.java java/src/processing/mode/java/pdex/ErrorCheckerService.java java/src/processing/mode/java/pdex/XQPreprocessor.java
JakubValtar · Sep 21, 2015 · 41dcc72 · 41dcc72
1 parent 90e3a30
commit 41dcc72
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 46 deletions.
diff --git a/java/src/processing/mode/java/pdex/ASTGenerator.java b/java/src/processing/mode/java/pdex/ASTGenerator.java
@@ -1370,19 +1370,6 @@ protected Class<?> findClassIfExists(String className){
       //log("Doesn't exist in imp package: " + impS.getImportName());
     }
 
-    for (ImportStatement impS : errorCheckerService.codeFolderImports) {
-      String temp = impS.getPackageName();
-      if (impS.isStarredImport() && className.indexOf('.') == -1) {
-        temp = impS.getPackageName() + "." + className;
-      }
-      tehClass = loadClass(temp);
-      if (tehClass != null) {
-        log(tehClass.getName() + " located.");
-        return tehClass;
-      }
-      //log("Doesn't exist in (code folder) imp package: " + impS.getImportName());
-    }
-
     PdePreprocessor p = new PdePreprocessor(null);
     for (String impS : p.getCoreImports()) {
       tehClass = loadClass(impS.substring(0,impS.length()-1) + className);

diff --git a/java/src/processing/mode/java/pdex/ErrorCheckerService.java b/java/src/processing/mode/java/pdex/ErrorCheckerService.java
@@ -202,11 +202,6 @@ public class ErrorCheckerService implements Runnable {
    */
   protected ArrayList<ImportStatement> previousImports = new ArrayList<ImportStatement>();
 
-  /**
-   * List of import statements for any .jar files in the code folder.
-   */
-  protected ArrayList<ImportStatement> codeFolderImports = new ArrayList<ImportStatement>();
-
   /**
    * Teh Preprocessor
    */
@@ -248,7 +243,7 @@ public ErrorCheckerService(JavaEditor debugEditor) {
 
     initParser();
     //initializeErrorWindow();
-    xqpreproc = new XQPreprocessor(this);
+    xqpreproc = new XQPreprocessor();
     PdePreprocessor pdePrepoc = new PdePreprocessor(null);
     defaultImportsOffset = pdePrepoc.getCoreImports().length +
         pdePrepoc.getDefaultImports().length + 1;
@@ -663,10 +658,6 @@ protected void compileCheck() {
         loadCompClass = false;
       }
 
-//      for(URL cpUrl: classPath) {
-//        Messages.log("CP jar: " + cpUrl.getPath());
-//      }
-
       if (compilerSettings == null) {
         prepareCompilerSetting();
       }
@@ -877,18 +868,15 @@ protected void prepareCompilerClasspath() {
           Messages.log("Sketch has a code folder. Adding its jars");
           String codeFolderPath[] =
                   PApplet.split(codeFolderClassPath.substring(1).trim(),
-                          File.pathSeparatorChar);
+                                File.pathSeparatorChar);
           try {
             for (String pathItem : codeFolderPath) {
               classpathJars.add(new File(pathItem).toURI().toURL());
-              Messages.log("Addind cf jar: " + pathItem);
             }
           } catch (Exception e2) {
             e2.printStackTrace();
           }
         }
-
-
       }
 
       // Also add jars specified in mode's search path
@@ -929,11 +917,11 @@ protected boolean ignorableSuggestionImport(String impName) {
       }
     }
 
-    for (ImportStatement impS : codeFolderImports) {
+    /*for (ImportStatement impS : codeFolderImports) {
       if (impNameLc.startsWith(impS.getPackageName().toLowerCase())) {
         return false;
       }
-    }
+    }*/
 
     final String include = "include";
     final String exclude = "exclude";

diff --git a/java/src/processing/mode/java/pdex/XQPreprocessor.java b/java/src/processing/mode/java/pdex/XQPreprocessor.java
@@ -38,7 +38,6 @@
 import org.eclipse.text.edits.MalformedTreeException;
 import org.eclipse.text.edits.TextEdit;
 
-import processing.app.Util;
 import processing.data.StringList;
 import processing.mode.java.preproc.PdePreprocessor;
 
@@ -51,13 +50,12 @@
 public class XQPreprocessor {
   private ASTRewrite rewrite = null;
   private List<ImportStatement> extraImports;
-  private ErrorCheckerService ecs;
+
   private String[] coreImports;
   private String[] defaultImports;
 
 
-  public XQPreprocessor(ErrorCheckerService errorCheckerService) {
-    ecs = errorCheckerService;
+  public XQPreprocessor() {
     PdePreprocessor p = new PdePreprocessor(null);
     defaultImports = p.getDefaultImports();
     coreImports = p.getCoreImports();
@@ -113,19 +111,6 @@ String prepareImports(List<ImportStatement> programImports) {
     for (String imp : defaultImports) {
       imports.append("import " + imp + ";");
     }
-    if (ecs.getEditor().getSketch().getCodeFolder().exists()) {
-      StringList codeFolderPackages = null;
-      String codeFolderClassPath = Util.contentsToClassPath(ecs.getEditor().getSketch().getCodeFolder());
-      codeFolderPackages = Util.packageListFromClassPath(codeFolderClassPath);
-      if (codeFolderPackages != null) {
-        ecs.codeFolderImports.clear();
-        for (String item : codeFolderPackages) {
-          // Messages.log("CF import " + item);
-          imports.append("import " + item + ".*;");
-          ecs.codeFolderImports.add(new ImportStatement("import " + item + ".*;",0,0));
-        }
-      }
-    }
     return imports.join("\n") + "\n";
   }