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 0eb0d43..c25da3e 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
@@ -12,16 +12,16 @@ package net.sourceforge.phpdt.internal.core.builder;
 
 import java.util.ArrayList;
 
-import net.sourceforge.phpdt.core.JavaCore;
+//import net.sourceforge.phpdt.core.JavaCore;
 import net.sourceforge.phpdt.internal.core.util.Util;
 
-import org.eclipse.core.resources.IContainer;
+//import org.eclipse.core.resources.IContainer;
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IResource;
 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 org.eclipse.core.runtime.IPath;
 
 public class BatchImageBuilder extends AbstractImageBuilder {
 
@@ -104,179 +104,179 @@ public class BatchImageBuilder extends AbstractImageBuilder {
 		}
 	}
 
-	protected void cleanOutputFolders() throws CoreException {
-		boolean deleteAll = JavaCore.CLEAN.equals(javaBuilder.javaProject
-				.getOption(JavaCore.CORE_JAVA_BUILD_CLEAN_OUTPUT_FOLDER, true));
-		if (deleteAll) {
-			ArrayList visited = new ArrayList(sourceLocations.length);
-			for (int i = 0, l = sourceLocations.length; i < l; i++) {
-				notifier.subTask(Util.bind("build.cleaningOutput")); //$NON-NLS-1$
-				ClasspathMultiDirectory sourceLocation = sourceLocations[i];
-				if (sourceLocation.hasIndependentOutputFolder) {
-					IContainer outputFolder = sourceLocation.binaryFolder;
-					if (!visited.contains(outputFolder)) {
-						visited.add(outputFolder);
-						IResource[] members = outputFolder.members();
-						for (int j = 0, m = members.length; j < m; j++)
-							members[j].delete(IResource.FORCE, null);
-					}
-					notifier.checkCancel();
-					copyExtraResourcesBack(sourceLocation, deleteAll);
-				} else {
-					boolean isOutputFolder = sourceLocation.sourceFolder
-							.equals(sourceLocation.binaryFolder);
-					final char[][] exclusionPatterns = isOutputFolder ? sourceLocation.exclusionPatterns
-							: null; // ignore exclusionPatterns if output folder
-									// == another source folder... not this one
-					sourceLocation.binaryFolder.accept(
-							new IResourceProxyVisitor() {
-								public boolean visit(IResourceProxy proxy)
-										throws CoreException {
-									IResource resource = null;
-									if (exclusionPatterns != null) {
-										resource = proxy.requestResource();
-										if (Util.isExcluded(resource,
-												exclusionPatterns))
-											return false;
-									}
-									if (proxy.getType() == IResource.FILE) {
-										// if
-										// (ProjectPrefUtil.isClassFileName(proxy.getName()))
-										// {
-										// if (resource == null)
-										// resource = proxy.requestResource();
-										// resource.delete(IResource.FORCE,
-										// null);
-										// }
-										return false;
-									}
-									notifier.checkCancel();
-									return true;
-								}
-							}, IResource.NONE);
-					if (!isOutputFolder) {
-						notifier.checkCancel();
-						copyPackages(sourceLocation);
-					}
-				}
-				notifier.checkCancel();
-			}
-		} else {
-			for (int i = 0, l = sourceLocations.length; i < l; i++) {
-				ClasspathMultiDirectory sourceLocation = sourceLocations[i];
-				if (sourceLocation.hasIndependentOutputFolder)
-					copyExtraResourcesBack(sourceLocation, deleteAll);
-				else if (!sourceLocation.sourceFolder
-						.equals(sourceLocation.binaryFolder))
-					copyPackages(sourceLocation); // output folder is
-													// different from source
-													// folder
-				notifier.checkCancel();
-			}
-		}
-	}
+//	protected void cleanOutputFolders() throws CoreException {
+//		boolean deleteAll = JavaCore.CLEAN.equals(javaBuilder.javaProject
+//				.getOption(JavaCore.CORE_JAVA_BUILD_CLEAN_OUTPUT_FOLDER, true));
+//		if (deleteAll) {
+//			ArrayList visited = new ArrayList(sourceLocations.length);
+//			for (int i = 0, l = sourceLocations.length; i < l; i++) {
+//				notifier.subTask(Util.bind("build.cleaningOutput")); //$NON-NLS-1$
+//				ClasspathMultiDirectory sourceLocation = sourceLocations[i];
+//				if (sourceLocation.hasIndependentOutputFolder) {
+//					IContainer outputFolder = sourceLocation.binaryFolder;
+//					if (!visited.contains(outputFolder)) {
+//						visited.add(outputFolder);
+//						IResource[] members = outputFolder.members();
+//						for (int j = 0, m = members.length; j < m; j++)
+//							members[j].delete(IResource.FORCE, null);
+//					}
+//					notifier.checkCancel();
+//					copyExtraResourcesBack(sourceLocation, deleteAll);
+//				} else {
+//					boolean isOutputFolder = sourceLocation.sourceFolder
+//							.equals(sourceLocation.binaryFolder);
+//					final char[][] exclusionPatterns = isOutputFolder ? sourceLocation.exclusionPatterns
+//							: null; // ignore exclusionPatterns if output folder
+//									// == another source folder... not this one
+//					sourceLocation.binaryFolder.accept(
+//							new IResourceProxyVisitor() {
+//								public boolean visit(IResourceProxy proxy)
+//										throws CoreException {
+//									IResource resource = null;
+//									if (exclusionPatterns != null) {
+//										resource = proxy.requestResource();
+//										if (Util.isExcluded(resource,
+//												exclusionPatterns))
+//											return false;
+//									}
+//									if (proxy.getType() == IResource.FILE) {
+//										// if
+//										// (ProjectPrefUtil.isClassFileName(proxy.getName()))
+//										// {
+//										// if (resource == null)
+//										// resource = proxy.requestResource();
+//										// resource.delete(IResource.FORCE,
+//										// null);
+//										// }
+//										return false;
+//									}
+//									notifier.checkCancel();
+//									return true;
+//								}
+//							}, IResource.NONE);
+//					if (!isOutputFolder) {
+//						notifier.checkCancel();
+//						copyPackages(sourceLocation);
+//					}
+//				}
+//				notifier.checkCancel();
+//			}
+//		} else {
+//			for (int i = 0, l = sourceLocations.length; i < l; i++) {
+//				ClasspathMultiDirectory sourceLocation = sourceLocations[i];
+//				if (sourceLocation.hasIndependentOutputFolder)
+//					copyExtraResourcesBack(sourceLocation, deleteAll);
+//				else if (!sourceLocation.sourceFolder
+//						.equals(sourceLocation.binaryFolder))
+//					copyPackages(sourceLocation); // output folder is
+//													// different from source
+//													// folder
+//				notifier.checkCancel();
+//			}
+//		}
+//	}
 
-	protected void copyExtraResourcesBack(
-			ClasspathMultiDirectory sourceLocation, final boolean deletedAll)
-			throws CoreException {
-		// When, if ever, does a builder need to copy resources files (not .java
-		// or .class) into the output folder?
-		// If we wipe the output folder at the beginning of the build then all
-		// 'extra' resources must be copied to the output folder.
-
-		notifier.subTask(Util.bind("build.copyingResources")); //$NON-NLS-1$
-		final int segmentCount = sourceLocation.sourceFolder.getFullPath()
-				.segmentCount();
-		final char[][] exclusionPatterns = sourceLocation.exclusionPatterns;
-		final IContainer outputFolder = sourceLocation.binaryFolder;
-		final boolean isAlsoProject = sourceLocation.sourceFolder
-				.equals(javaBuilder.currentProject);
-		sourceLocation.sourceFolder.accept(new IResourceProxyVisitor() {
-			public boolean visit(IResourceProxy proxy) throws CoreException {
-				IResource resource = null;
-				switch (proxy.getType()) {
-				case IResource.FILE:
-					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;
-					if (exclusionPatterns != null
-							&& Util.isExcluded(resource, exclusionPatterns))
-						return false;
-
-					IPath partialPath = resource.getFullPath()
-							.removeFirstSegments(segmentCount);
-					IResource copiedResource = outputFolder
-							.getFile(partialPath);
-					if (copiedResource.exists()) {
-						if (deletedAll) {
-							createErrorFor(resource, Util
-									.bind("build.duplicateResource")); //$NON-NLS-1$
-							return false;
-						}
-						copiedResource.delete(IResource.FORCE, null); // last
-																		// one
-																		// wins
-					}
-					resource.copy(copiedResource.getFullPath(),
-							IResource.FORCE, null);
-					copiedResource.setDerived(true);
-					return false;
-				case IResource.FOLDER:
-					resource = proxy.requestResource();
-					if (javaBuilder.filterExtraResource(resource))
-						return false;
-					if (exclusionPatterns != null
-							&& Util.isExcluded(resource, exclusionPatterns))
-						return false;
-
-					IPath folderPath = resource.getFullPath();
-					if (isAlsoProject && isExcludedFromProject(folderPath))
-						return false; // the sourceFolder == project
-						// createFolder(folderPath.removeFirstSegments(segmentCount),
-						// outputFolder);
-				}
-				return true;
-			}
-		}, IResource.NONE);
-	}
-
-	protected void copyPackages(ClasspathMultiDirectory sourceLocation)
-			throws CoreException {
+//	protected void copyExtraResourcesBack(
+//			ClasspathMultiDirectory sourceLocation, final boolean deletedAll)
+//			throws CoreException {
+//		// When, if ever, does a builder need to copy resources files (not .java
+//		// or .class) into the output folder?
+//		// If we wipe the output folder at the beginning of the build then all
+//		// 'extra' resources must be copied to the output folder.
+//
+//		notifier.subTask(Util.bind("build.copyingResources")); //$NON-NLS-1$
 //		final int segmentCount = sourceLocation.sourceFolder.getFullPath()
 //				.segmentCount();
-		final char[][] exclusionPatterns = sourceLocation.exclusionPatterns;
-		//final IContainer outputFolder = sourceLocation.binaryFolder;
-		final boolean isAlsoProject = sourceLocation.sourceFolder
-				.equals(javaBuilder.currentProject);
-		sourceLocation.sourceFolder.accept(new IResourceProxyVisitor() {
-			public boolean visit(IResourceProxy proxy) throws CoreException {
-				switch (proxy.getType()) {
-				case IResource.FILE:
-					return false;
-				case IResource.FOLDER:
-					IResource resource = proxy.requestResource();
-					if (javaBuilder.filterExtraResource(resource))
-						return false;
-					if (exclusionPatterns != null
-							&& Util.isExcluded(resource, exclusionPatterns))
-						return false;
+//		final char[][] exclusionPatterns = sourceLocation.exclusionPatterns;
+//		final IContainer outputFolder = sourceLocation.binaryFolder;
+//		final boolean isAlsoProject = sourceLocation.sourceFolder
+//				.equals(javaBuilder.currentProject);
+//		sourceLocation.sourceFolder.accept(new IResourceProxyVisitor() {
+//			public boolean visit(IResourceProxy proxy) throws CoreException {
+//				IResource resource = null;
+//				switch (proxy.getType()) {
+//				case IResource.FILE:
+//					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;
+//					if (exclusionPatterns != null
+//							&& Util.isExcluded(resource, exclusionPatterns))
+//						return false;
+//
+//					IPath partialPath = resource.getFullPath()
+//							.removeFirstSegments(segmentCount);
+//					IResource copiedResource = outputFolder
+//							.getFile(partialPath);
+//					if (copiedResource.exists()) {
+//						if (deletedAll) {
+//							createErrorFor(resource, Util
+//									.bind("build.duplicateResource")); //$NON-NLS-1$
+//							return false;
+//						}
+//						copiedResource.delete(IResource.FORCE, null); // last
+//																		// one
+//																		// wins
+//					}
+//					resource.copy(copiedResource.getFullPath(),
+//							IResource.FORCE, null);
+//					copiedResource.setDerived(true);
+//					return false;
+//				case IResource.FOLDER:
+//					resource = proxy.requestResource();
+//					if (javaBuilder.filterExtraResource(resource))
+//						return false;
+//					if (exclusionPatterns != null
+//							&& Util.isExcluded(resource, exclusionPatterns))
+//						return false;
+//
+//					IPath folderPath = resource.getFullPath();
+//					if (isAlsoProject && isExcludedFromProject(folderPath))
+//						return false; // the sourceFolder == project
+//						// createFolder(folderPath.removeFirstSegments(segmentCount),
+//						// outputFolder);
+//				}
+//				return true;
+//			}
+//		}, IResource.NONE);
+//	}
 
-					IPath folderPath = resource.getFullPath();
-					if (isAlsoProject && isExcludedFromProject(folderPath))
-						return false; // the sourceFolder == project
-						// createFolder(folderPath.removeFirstSegments(segmentCount),
-						// outputFolder);
-				}
-				return true;
-			}
-		}, IResource.NONE);
-	}
+//	protected void copyPackages(ClasspathMultiDirectory sourceLocation)
+//			throws CoreException {
+////		final int segmentCount = sourceLocation.sourceFolder.getFullPath()
+////				.segmentCount();
+//		final char[][] exclusionPatterns = sourceLocation.exclusionPatterns;
+//		//final IContainer outputFolder = sourceLocation.binaryFolder;
+//		final boolean isAlsoProject = sourceLocation.sourceFolder
+//				.equals(javaBuilder.currentProject);
+//		sourceLocation.sourceFolder.accept(new IResourceProxyVisitor() {
+//			public boolean visit(IResourceProxy proxy) throws CoreException {
+//				switch (proxy.getType()) {
+//				case IResource.FILE:
+//					return false;
+//				case IResource.FOLDER:
+//					IResource resource = proxy.requestResource();
+//					if (javaBuilder.filterExtraResource(resource))
+//						return false;
+//					if (exclusionPatterns != null
+//							&& Util.isExcluded(resource, exclusionPatterns))
+//						return false;
+//
+//					IPath folderPath = resource.getFullPath();
+//					if (isAlsoProject && isExcludedFromProject(folderPath))
+//						return false; // the sourceFolder == project
+//						// createFolder(folderPath.removeFirstSegments(segmentCount),
+//						// outputFolder);
+//				}
+//				return true;
+//			}
+//		}, IResource.NONE);
+//	}
 
 	public String toString() {
 		return "batch image builder for:\n\tnew state: " + newState; //$NON-NLS-1$