Parser detects wrong include files now

[phpeclipse.git] / net.sourceforge.phpeclipse / src / net / sourceforge / phpdt / internal / core / builder / IncrementalImageBuilder.java

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/builder/IncrementalImageBuilder.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/builder/IncrementalImageBuilder.java
index c738342..5765f22 100644 (file)
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/builder/IncrementalImageBuilder.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/builder/IncrementalImageBuilder.java
@@ -187,7 +187,7 @@ public class IncrementalImageBuilder extends AbstractImageBuilder {
 //                  sourceFileFullPath)) {
 //                md = sourceLocations[j];
 //                if (md.exclusionPatterns == null
-//                    || !Util.isExcluded(file, md.exclusionPatterns))
+//                    || !ProjectPrefUtil.isExcluded(file, md.exclusionPatterns))
 //                  break;
 //              }
 //            }
@@ -322,7 +322,7 @@ public class IncrementalImageBuilder extends AbstractImageBuilder {
         }
         return;
       case IResource.FILE :
-    //                 if (Util.isClassFileName(resource.getName())) {
+    //                 if (ProjectPrefUtil.isClassFileName(resource.getName())) {
     //                         IPath typePath =
     // resource.getFullPath().removeFirstSegments(segmentCount).removeFileExtension();
     //                         switch (binaryDelta.getKind()) {
@@ -425,13 +425,13 @@ public class IncrementalImageBuilder extends AbstractImageBuilder {
                   for (int j = 0, m = removedChildren.length; j < m; j++)
                     findSourceFiles(removedChildren[j], md, segmentCount);
                   return;
-                }
+                } 
               }
             }
-            IFolder removedPackageFolder = md.binaryFolder
-                .getFolder(removedPackagePath);
-            if (removedPackageFolder.exists())
-              removedPackageFolder.delete(IResource.FORCE, null);
+//            IFolder removedPackageFolder = md.binaryFolder
+//                .getFolder(removedPackagePath);
+//            if (removedPackageFolder.exists())
+//              removedPackageFolder.delete(IResource.FORCE, null);
             // add dependents even when the package thinks it does not exist to
             // be on the safe side
             if (PHPBuilder.DEBUG)
@@ -511,7 +511,7 @@ public class IncrementalImageBuilder extends AbstractImageBuilder {
               sourceFiles.add(new SourceFile((IFile) resource, md, encoding));
           }
           return;
-          //                   } else if (Util.isClassFileName(resourceName)) {
+          //                   } else if (ProjectPrefUtil.isClassFileName(resourceName)) {
           //                           return; // skip class files
         } else if (md.hasIndependentOutputFolder) {
           if (javaBuilder.filterExtraResource(resource))
@@ -697,7 +697,7 @@ public class IncrementalImageBuilder extends AbstractImageBuilder {
   //protected boolean writeClassFileCheck(IFile file, String fileName, byte[]
   // newBytes) throws CoreException {
   //   try {
-  //           byte[] oldBytes = Util.getResourceContentsAsByteArray(file);
+  //           byte[] oldBytes = ProjectPrefUtil.getResourceContentsAsByteArray(file);
   //           if (this.compileLoop > 1) { // only optimize files which were recompiled
   // during the dependent pass, see 33990
   //                   notEqual : if (newBytes.length == oldBytes.length) {