Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
View | Details | Raw Unified | Return to bug 339927
Collapse All | Expand All

(-)src/org/eclipse/wst/jsdt/internal/core/builder/IncrementalImageBuilder.java (-36 / +38 lines)
Lines 607-650 Link Here
607
				}
607
				}
608
				return true;
608
				return true;
609
			} else if (md.hasIndependentOutputFolder) {
609
			} else if (md.hasIndependentOutputFolder) {
610
				if (javaBuilder.filterExtraResource(resource)) return true;
610
				// Genuitec: Begin Fix 11340 - MyEclipse deleting svn all-wcprops and entries files
611
//				if (javaBuilder.filterExtraResource(resource)) return true;
611
612
612
				// copy all other resource deltas to the output folder
613
				// copy all other resource deltas to the output folder
613
				IPath resourcePath = resource.getFullPath().removeFirstSegments(segmentCount);
614
//				IPath resourcePath = resource.getFullPath().removeFirstSegments(segmentCount);
614
				IResource outputFile = md.binaryFolder.getFile(resourcePath);
615
//				IResource outputFile = md.binaryFolder.getFile(resourcePath);
615
				switch (sourceDelta.getKind()) {
616
//				switch (sourceDelta.getKind()) {
616
					case IResourceDelta.ADDED :
617
//					case IResourceDelta.ADDED :
617
						if (outputFile.exists()) {
618
//						if (outputFile.exists()) {
618
							if (JavaBuilder.DEBUG)
619
//							if (JavaBuilder.DEBUG)
619
								System.out.println("Deleting existing file " + resourcePath); //$NON-NLS-1$
620
//								System.out.println("Deleting existing file " + resourcePath); //$NON-NLS-1$
620
							outputFile.delete(IResource.FORCE, null);
621
//							outputFile.delete(IResource.FORCE, null);
621
						}
622
//						}
622
						if (JavaBuilder.DEBUG)
623
//						if (JavaBuilder.DEBUG)
623
							System.out.println("Copying added file " + resourcePath); //$NON-NLS-1$
624
//							System.out.println("Copying added file " + resourcePath); //$NON-NLS-1$
624
						return true;
625
//						return true;
625
					case IResourceDelta.REMOVED :
626
//					case IResourceDelta.REMOVED :
626
						if (outputFile.exists()) {
627
//						if (outputFile.exists()) {
627
							if (JavaBuilder.DEBUG)
628
//							if (JavaBuilder.DEBUG)
628
								System.out.println("Deleting removed file " + resourcePath); //$NON-NLS-1$
629
//								System.out.println("Deleting removed file " + resourcePath); //$NON-NLS-1$
629
							outputFile.delete(IResource.FORCE, null);
630
//							outputFile.delete(IResource.FORCE, null);
630
						}
631
//						}
631
						return true;
632
//						return true;
632
					case IResourceDelta.CHANGED :
633
//					case IResourceDelta.CHANGED :
633
						if ((sourceDelta.getFlags() & IResourceDelta.CONTENT) == 0
634
//						if ((sourceDelta.getFlags() & IResourceDelta.CONTENT) == 0
634
								&& (sourceDelta.getFlags() & IResourceDelta.ENCODING) == 0)
635
//								&& (sourceDelta.getFlags() & IResourceDelta.ENCODING) == 0)
635
							return true; // skip it since it really isn't changed
636
//							return true; // skip it since it really isn't changed
636
						if (outputFile.exists()) {
637
//						if (outputFile.exists()) {
637
							if (JavaBuilder.DEBUG)
638
//							if (JavaBuilder.DEBUG)
638
								System.out.println("Deleting existing file " + resourcePath); //$NON-NLS-1$
639
//								System.out.println("Deleting existing file " + resourcePath); //$NON-NLS-1$
639
							outputFile.delete(IResource.FORCE, null);
640
//							outputFile.delete(IResource.FORCE, null);
640
						}
641
//						}
641
						if (JavaBuilder.DEBUG)
642
//						if (JavaBuilder.DEBUG)
642
							System.out.println("Copying changed file " + resourcePath); //$NON-NLS-1$
643
//							System.out.println("Copying changed file " + resourcePath); //$NON-NLS-1$
643
						//createFolder(resourcePath.removeLastSegments(1), md.binaryFolder); // ensure package exists in the output folder
644
//						//createFolder(resourcePath.removeLastSegments(1), md.binaryFolder); // ensure package exists in the output folder
644
						//resource.copy(outputFile.getFullPath(), IResource.FORCE | IResource.DERIVED, null);
645
//						//resource.copy(outputFile.getFullPath(), IResource.FORCE | IResource.DERIVED, null);
645
					//	Util.setReadOnly(outputFile, false); // just in case the original was read only
646
//					//	Util.setReadOnly(outputFile, false); // just in case the original was read only
646
				}
647
//				}
647
				return true;
648
//				return true;
649
				// Genuitec: Begin Fix 11340 - MyEclipse deleting svn all-wcprops and entries files
648
			}
650
			}
649
	}
651
	}
650
	return true;
652
	return true;

Return to bug 339927