Parser detects wrong include files now

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

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/builder/BatchImageBuilder.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/builder/BatchImageBuilder.java
index aa0de9f..d29be84 100644 (file)
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/builder/BatchImageBuilder.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/builder/BatchImageBuilder.java
@@ -13,10 +13,7 @@ package net.sourceforge.phpdt.internal.core.builder;
 import java.util.ArrayList;
 
 import net.sourceforge.phpdt.core.JavaCore;
-import net.sourceforge.phpdt.internal.core.JavaModelManager;
 import net.sourceforge.phpdt.internal.core.util.Util;
-import net.sourceforge.phpeclipse.PHPeclipsePlugin;
-import net.sourceforge.phpeclipse.builder.IdentifierIndexManager;
 
 import org.eclipse.core.resources.IContainer;
 import org.eclipse.core.resources.IFile;
@@ -25,8 +22,6 @@ import org.eclipse.core.resources.IResourceProxy;
 import org.eclipse.core.resources.IResourceProxyVisitor;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IPath;
-import net.sourceforge.phpdt.internal.core.builder.PHPBuilder;
-import net.sourceforge.phpdt.internal.core.builder.SourceFile;
 
 public class BatchImageBuilder extends AbstractImageBuilder {
 
@@ -136,7 +131,7 @@ protected void cleanOutputFolders() throws CoreException {
                                                                if (Util.isExcluded(resource, exclusionPatterns)) return false;
                                                        }
                                                        if (proxy.getType() == IResource.FILE) {
-//                                                             if (Util.isClassFileName(proxy.getName())) {
+//                                                             if (ProjectPrefUtil.isClassFileName(proxy.getName())) {
 //                                                                     if (resource == null)
 //                                                                             resource = proxy.requestResource();
 //                                                                     resource.delete(IResource.FORCE, null);
@@ -183,7 +178,7 @@ protected void copyExtraResourcesBack(ClasspathMultiDirectory sourceLocation, fi
                                IResource resource = null;
                                switch(proxy.getType()) {
                                        case IResource.FILE :
-                                               if (net.sourceforge.phpdt.internal.compiler.util.Util.isJavaFileName(proxy.getName())) return false;// || Util.isClassFileName(proxy.getName())) return false;
+                                               if (net.sourceforge.phpdt.internal.compiler.util.Util.isJavaFileName(proxy.getName())) return false;// || ProjectPrefUtil.isClassFileName(proxy.getName())) return false;
 
                                                resource = proxy.requestResource();
                                                if (javaBuilder.filterExtraResource(resource)) return false;
@@ -210,7 +205,7 @@ protected void copyExtraResourcesBack(ClasspathMultiDirectory sourceLocation, fi
 
                                                IPath folderPath = resource.getFullPath();
                                                if (isAlsoProject && isExcludedFromProject(folderPath)) return false; // the sourceFolder == project
-                                               createFolder(folderPath.removeFirstSegments(segmentCount), outputFolder);
+//                                             createFolder(folderPath.removeFirstSegments(segmentCount), outputFolder);
                                }
                                return true;
                        }
@@ -238,7 +233,7 @@ protected void copyPackages(ClasspathMultiDirectory sourceLocation) throws CoreE
 
                                                IPath folderPath = resource.getFullPath();
                                                if (isAlsoProject && isExcludedFromProject(folderPath)) return false; // the sourceFolder == project
-                                               createFolder(folderPath.removeFirstSegments(segmentCount), outputFolder);
+//                                             createFolder(folderPath.removeFirstSegments(segmentCount), outputFolder);
                                }
                                return true;
                        }