Attachment 191237 Details for Bug 339927 – Attaching a patch file against WTP 3.0.4 that fixes this issue

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] Attaching a patch file against WTP 3.0.4 that fixes this issue

WTP-3.0.4Fix-Do_Not_Remove_SVN_Files.txt (text/plain), 4.52 KB, created by Todd E. Williams

on 2011-03-15 14:20:35 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Todd E. Williams

Created: 2011-03-15 14:20:35 EDT

Size: 4.52 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.wst.jsdt.core
>Index: src/org/eclipse/wst/jsdt/internal/core/builder/IncrementalImageBuilder.java
>===================================================================
>RCS file: /home/product/myeclipse-oss/cvsroot/org.eclipse.wst.jsdt.core/src/org/eclipse/wst/jsdt/internal/core/builder/IncrementalImageBuilder.java,v
>retrieving revision 1.2
>diff -u -r1.2 IncrementalImageBuilder.java
>--- src/org/eclipse/wst/jsdt/internal/core/builder/IncrementalImageBuilder.java	1 Jan 2009 10:29:12 -0000	1.2
>+++ src/org/eclipse/wst/jsdt/internal/core/builder/IncrementalImageBuilder.java	2 Jun 2009 19:09:42 -0000
>@@ -607,44 +607,46 @@
> 				}
> 				return true;
> 			} else if (md.hasIndependentOutputFolder) {
>-				if (javaBuilder.filterExtraResource(resource)) return true;
>+				// Genuitec: Begin Fix 11340 - MyEclipse deleting svn all-wcprops and entries files
>+//				if (javaBuilder.filterExtraResource(resource)) return true;
> 
> 				// copy all other resource deltas to the output folder
>-				IPath resourcePath = resource.getFullPath().removeFirstSegments(segmentCount);
>-				IResource outputFile = md.binaryFolder.getFile(resourcePath);
>-				switch (sourceDelta.getKind()) {
>-					case IResourceDelta.ADDED :
>-						if (outputFile.exists()) {
>-							if (JavaBuilder.DEBUG)
>-								System.out.println("Deleting existing file " + resourcePath); //$NON-NLS-1$
>-							outputFile.delete(IResource.FORCE, null);
>-						}
>-						if (JavaBuilder.DEBUG)
>-							System.out.println("Copying added file " + resourcePath); //$NON-NLS-1$
>-						return true;
>-					case IResourceDelta.REMOVED :
>-						if (outputFile.exists()) {
>-							if (JavaBuilder.DEBUG)
>-								System.out.println("Deleting removed file " + resourcePath); //$NON-NLS-1$
>-							outputFile.delete(IResource.FORCE, null);
>-						}
>-						return true;
>-					case IResourceDelta.CHANGED :
>-						if ((sourceDelta.getFlags() & IResourceDelta.CONTENT) == 0
>-								&& (sourceDelta.getFlags() & IResourceDelta.ENCODING) == 0)
>-							return true; // skip it since it really isn't changed
>-						if (outputFile.exists()) {
>-							if (JavaBuilder.DEBUG)
>-								System.out.println("Deleting existing file " + resourcePath); //$NON-NLS-1$
>-							outputFile.delete(IResource.FORCE, null);
>-						}
>-						if (JavaBuilder.DEBUG)
>-							System.out.println("Copying changed file " + resourcePath); //$NON-NLS-1$
>-						//createFolder(resourcePath.removeLastSegments(1), md.binaryFolder); // ensure package exists in the output folder
>-						//resource.copy(outputFile.getFullPath(), IResource.FORCE | IResource.DERIVED, null);
>-					//	Util.setReadOnly(outputFile, false); // just in case the original was read only
>-				}
>-				return true;
>+//				IPath resourcePath = resource.getFullPath().removeFirstSegments(segmentCount);
>+//				IResource outputFile = md.binaryFolder.getFile(resourcePath);
>+//				switch (sourceDelta.getKind()) {
>+//					case IResourceDelta.ADDED :
>+//						if (outputFile.exists()) {
>+//							if (JavaBuilder.DEBUG)
>+//								System.out.println("Deleting existing file " + resourcePath); //$NON-NLS-1$
>+//							outputFile.delete(IResource.FORCE, null);
>+//						}
>+//						if (JavaBuilder.DEBUG)
>+//							System.out.println("Copying added file " + resourcePath); //$NON-NLS-1$
>+//						return true;
>+//					case IResourceDelta.REMOVED :
>+//						if (outputFile.exists()) {
>+//							if (JavaBuilder.DEBUG)
>+//								System.out.println("Deleting removed file " + resourcePath); //$NON-NLS-1$
>+//							outputFile.delete(IResource.FORCE, null);
>+//						}
>+//						return true;
>+//					case IResourceDelta.CHANGED :
>+//						if ((sourceDelta.getFlags() & IResourceDelta.CONTENT) == 0
>+//								&& (sourceDelta.getFlags() & IResourceDelta.ENCODING) == 0)
>+//							return true; // skip it since it really isn't changed
>+//						if (outputFile.exists()) {
>+//							if (JavaBuilder.DEBUG)
>+//								System.out.println("Deleting existing file " + resourcePath); //$NON-NLS-1$
>+//							outputFile.delete(IResource.FORCE, null);
>+//						}
>+//						if (JavaBuilder.DEBUG)
>+//							System.out.println("Copying changed file " + resourcePath); //$NON-NLS-1$
>+//						//createFolder(resourcePath.removeLastSegments(1), md.binaryFolder); // ensure package exists in the output folder
>+//						//resource.copy(outputFile.getFullPath(), IResource.FORCE | IResource.DERIVED, null);
>+//					//	Util.setReadOnly(outputFile, false); // just in case the original was read only
>+//				}
>+//				return true;
>+				// Genuitec: Begin Fix 11340 - MyEclipse deleting svn all-wcprops and entries files
> 			}
> 	}
> 	return true;

Actions: View | Diff

Attachments on bug 339927: 191237