X-Git-Url: http://git.phpeclipse.com

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 d7e0e9b..61db63d 100644
--- 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
@@ -13,11 +13,9 @@ import java.util.ArrayList;
 
 import net.sourceforge.phpdt.core.compiler.IProblem;
 import net.sourceforge.phpdt.internal.compiler.CompilationResult;
-import net.sourceforge.phpdt.internal.core.Util;
+import net.sourceforge.phpdt.internal.compiler.problem.ProblemHandler;
 import net.sourceforge.phpdt.internal.core.util.SimpleLookupTable;
-import net.sourceforge.phpdt.internal.ui.util.PHPFileUtil;
-import net.sourceforge.phpeclipse.PHPeclipsePlugin;
-import net.sourceforge.phpeclipse.builder.IdentifierIndexManager;
+import net.sourceforge.phpdt.internal.core.util.Util;
 
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IFolder;
@@ -190,7 +188,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;
 //              }
 //            }
@@ -325,7 +323,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()) {
@@ -394,7 +392,7 @@ public class IncrementalImageBuilder extends AbstractImageBuilder {
           case IResourceDelta.ADDED :
             IPath addedPackagePath = resource.getFullPath()
                 .removeFirstSegments(segmentCount);
-            createFolder(addedPackagePath, md.binaryFolder); // ensure package
+           // createFolder(addedPackagePath, md.binaryFolder); // ensure package
             // exists in the
             // output folder
             // add dependents even when the package thinks it exists to be on
@@ -417,7 +415,7 @@ public class IncrementalImageBuilder extends AbstractImageBuilder {
                     removedPackagePath).exists()) {
                   // only a package fragment was removed, same as removing
                   // multiple source files
-                  createFolder(removedPackagePath, md.binaryFolder); // ensure
+//                  createFolder(removedPackagePath, md.binaryFolder); // ensure
                   // package
                   // exists
                   // in the
@@ -428,13 +426,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)
@@ -445,7 +443,7 @@ public class IncrementalImageBuilder extends AbstractImageBuilder {
         return;
       case IResource.FILE :
         String resourceName = resource.getName();
-        if (Util.isJavaFileName(resourceName)) {
+        if (net.sourceforge.phpdt.internal.compiler.util.Util.isJavaFileName(resourceName)) {
           IPath typePath = resource.getFullPath().removeFirstSegments(
               segmentCount).removeFileExtension();
           String typeLocator = resource.getProjectRelativePath().toString();
@@ -514,7 +512,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))
@@ -522,52 +520,52 @@ public class IncrementalImageBuilder extends AbstractImageBuilder {
           // copy all other resource deltas to the output folder
           IPath resourcePath = resource.getFullPath().removeFirstSegments(
               segmentCount);
-          IResource outputFile = md.binaryFolder.getFile(resourcePath);
+//          IResource outputFile = md.binaryFolder.getFile(resourcePath);
           switch (sourceDelta.getKind()) {
             case IResourceDelta.ADDED :
-              if (outputFile.exists()) {
-                if (PHPBuilder.DEBUG)
-                  System.out.println("Deleting existing file " + resourcePath); //$NON-NLS-1$
-                outputFile.delete(IResource.FORCE, null);
-              }
+//              if (outputFile.exists()) {
+//                if (PHPBuilder.DEBUG)
+//                  System.out.println("Deleting existing file " + resourcePath); //$NON-NLS-1$
+//                outputFile.delete(IResource.FORCE, null);
+//              }
               if (PHPBuilder.DEBUG)
                 System.out.println("Copying added file " + resourcePath); //$NON-NLS-1$
-              createFolder(resourcePath.removeLastSegments(1), md.binaryFolder); // ensure
+//              createFolder(resourcePath.removeLastSegments(1), md.binaryFolder); // ensure
               // package
               // exists
               // in
               // the
               // output
               // folder
-              resource.copy(outputFile.getFullPath(), IResource.FORCE, null);
-              outputFile.setDerived(true);
+//              resource.copy(outputFile.getFullPath(), IResource.FORCE, null);
+//              outputFile.setDerived(true);
               return;
             case IResourceDelta.REMOVED :
-              if (outputFile.exists()) {
-                if (PHPBuilder.DEBUG)
-                  System.out.println("Deleting removed file " + resourcePath); //$NON-NLS-1$
-                outputFile.delete(IResource.FORCE, null);
-              }
+//              if (outputFile.exists()) {
+//                if (PHPBuilder.DEBUG)
+//                  System.out.println("Deleting removed file " + resourcePath); //$NON-NLS-1$
+//                outputFile.delete(IResource.FORCE, null);
+//              }
               return;
             case IResourceDelta.CHANGED :
               if ((sourceDelta.getFlags() & IResourceDelta.CONTENT) == 0)
                 return; // skip it since it really isn't changed
-              if (outputFile.exists()) {
-                if (PHPBuilder.DEBUG)
-                  System.out.println("Deleting existing file " + resourcePath); //$NON-NLS-1$
-                outputFile.delete(IResource.FORCE, null);
-              }
+//              if (outputFile.exists()) {
+//                if (PHPBuilder.DEBUG)
+//                  System.out.println("Deleting existing file " + resourcePath); //$NON-NLS-1$
+//                outputFile.delete(IResource.FORCE, null);
+//              }
               if (PHPBuilder.DEBUG)
                 System.out.println("Copying changed file " + resourcePath); //$NON-NLS-1$
-              createFolder(resourcePath.removeLastSegments(1), md.binaryFolder); // ensure
+            //  createFolder(resourcePath.removeLastSegments(1), md.binaryFolder); // ensure
               // package
               // exists
               // in
               // the
               // output
               // folder
-              resource.copy(outputFile.getFullPath(), IResource.FORCE, null);
-              outputFile.setDerived(true);
+//              resource.copy(outputFile.getFullPath(), IResource.FORCE, null);
+//              outputFile.setDerived(true);
           }
           return;
         }
@@ -658,6 +656,16 @@ public class IncrementalImageBuilder extends AbstractImageBuilder {
     IProblem[] problems = result.getProblems();
     if (problems == null && markers.length == 0)
       return;
+    
+//  axelcl start insert - calculate line numbers
+    for (int i = 0; i < problems.length; i++) {
+      if (problems[i].getSourceLineNumber() == 1) {
+        problems[i].setSourceLineNumber(ProblemHandler
+            .searchLineNumber(result.lineSeparatorPositions, problems[i].getSourceStart()));
+      }
+    }
+    //axelcl end insert
+    
     notifier.updateProblemCounts(markers, problems);
     PHPBuilder.removeProblemsFor(sourceFile.resource);
     storeProblemsFor(sourceFile, problems);
@@ -700,7 +708,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) {