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

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 967d8c3..d29be84 100644
--- 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;
-import net.sourceforge.phpeclipse.PHPeclipsePlugin;
-import net.sourceforge.phpeclipse.builder.IdentifierIndexManager;
+import net.sourceforge.phpdt.internal.core.util.Util;
 
 import org.eclipse.core.resources.IContainer;
 import org.eclipse.core.resources.IFile;
@@ -39,9 +36,8 @@ public void build() {
 
 	try {
 		notifier.subTask(Util.bind("build.cleaningOutput")); //$NON-NLS-1$
-		JavaModelManager.getJavaModelManager().deltaProcessor.addForRefresh(javaBuilder.javaProject);
 		PHPBuilder.removeProblemsAndTasksFor(javaBuilder.currentProject);
-//		cleanOutputFolders();
+//		cleanOutputFolders(true);
 		notifier.updateProgressDelta(0.1f);
 
 		notifier.subTask(Util.bind("build.analyzingSources")); //$NON-NLS-1$
@@ -60,6 +56,7 @@ public void build() {
 
 		if (javaBuilder.javaProject.hasCycleMarker())
 			javaBuilder.mustPropagateStructuralChanges();
+		
 	} catch (CoreException e) {
 		throw internalException(e);
 	} finally {
@@ -83,7 +80,7 @@ protected void addAllSourceFiles(final ArrayList sourceFiles) throws CoreExcepti
 					}
 					switch(proxy.getType()) {
 						case IResource.FILE :
-							if (Util.isJavaFileName(proxy.getName())) {
+							if (net.sourceforge.phpdt.internal.compiler.util.Util.isJavaFileName(proxy.getName())) {
 								if (resource == null)
 									resource = proxy.requestResource();
 								sourceFiles.add(new SourceFile((IFile) resource, sourceLocation, encoding));
@@ -134,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);
@@ -181,7 +178,7 @@ protected void copyExtraResourcesBack(ClasspathMultiDirectory sourceLocation, fi
 				IResource resource = null;
 				switch(proxy.getType()) {
 					case IResource.FILE :
-						if (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;
@@ -208,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;
 			}
@@ -236,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;
 			}