Additional fix for bug 123787: [Patch] Apply Patch error handlingv20120808-124256I20120814-0800I20120812-1736I20120810-1300I20120808-2000

for invalid formats

2 files changed, 11 insertions, 0 deletions

diff --git a/bundles/org.eclipse.compare.core/src/org/eclipse/compare/internal/core/patch/PatchReader.java b/bundles/org.eclipse.compare.core/src/org/eclipse/compare/internal/core/patch/PatchReader.java
index 05b85eec7..f4540e5a2 100644
--- a/bundles/org.eclipse.compare.core/src/org/eclipse/compare/internal/core/patch/PatchReader.java
+++ b/bundles/org.eclipse.compare.core/src/org/eclipse/compare/internal/core/patch/PatchReader.java
@@ -323,6 +323,12 @@ public class PatchReader {
 							continue;
 						}
 						break;
+					case '#':
+						break;
+					case 'I':
+						if (line.indexOf("Index:") == 0) //$NON-NLS-1$
+							break;
+						//$FALL-THROUGH$
 					default:
 						throw new IOException("Invalid patch"); //$NON-NLS-1$
 				}
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/InputPatchPage.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/InputPatchPage.java
index c68ed57a0..a8bbeccff 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/InputPatchPage.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/InputPatchPage.java
@@ -251,6 +251,9 @@ public class InputPatchPage extends WizardPage {
 	 * Reads in the patch contents
 	 */
 	public void readInPatch(){
+		if (fPatchRead)
+			return;
+
 		WorkspacePatcher patcher= ((PatchWizard) getWizard()).getPatcher();
 		// Create a reader for the input
 		Reader reader= null;
@@ -450,6 +453,7 @@ public class InputPatchPage extends WizardPage {
 			public void modifyText(ModifyEvent e) {
 				clearErrorMessage();
 				fShowError= true;
+				fPatchRead = false;
 				updateWidgetEnablements();
 			}
 		});
@@ -476,6 +480,7 @@ public class InputPatchPage extends WizardPage {
 			public void modifyText(ModifyEvent e) {
 				clearErrorMessage();
 				fShowError = true;
+				fPatchRead = false;
 				updateWidgetEnablements();
 			}
 		});