Patch: added markers for rejected patches

2 files changed, 8 insertions, 6 deletions

diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/PatchMessages.properties b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/PatchMessages.properties
index e9aed4f47..2fcc64995 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/PatchMessages.properties
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/PatchMessages.properties
@@ -66,6 +66,7 @@ Patcher.ErrorDialog.title=title
 Patcher.DeleteError.message=Error while deleting resource

 Patcher.UpdateError.message=Error while updating resource

 Patcher.RefreshError.message=Error while refreshing from local

+Patcher.Marker.message=Rejected patch

 

 #

 # PatchCompareInput

diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/Patcher.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/Patcher.java
index c7d71a602..1053e186f 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/Patcher.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/Patcher.java
@@ -25,7 +25,7 @@ public class Patcher {
 	

 	private static final String DEV_NULL= "/dev/null"; //$NON-NLS-1$

 	

-	//private static final String MARKER_TYPE= "rejectedPatchMarker";

+	private static final String MARKER_TYPE= "org.eclipse.compare.rejectedPatchMarker";

 

 	// diff formats

 	private static final int CONTEXT= 0;

@@ -793,11 +793,12 @@ public class Patcher {
 					file= createPath(container, pp);

 					if (file != null) {

 						updateFile(getRejected(failed), file, pm);

-//						try {

-//							IMarker marker= file.createMarker(MARKER_TYPE);

-//							marker.setAttribute(marker.MESSAGE, "rejected patch");

-//						} catch (CoreException ex) {

-//						}

+						try {

+							IMarker marker= file.createMarker(MARKER_TYPE);

+							marker.setAttribute(marker.MESSAGE, PatchMessages.getString("Patcher.Marker.message"));	//$NON-NLS-1$

+							marker.setAttribute(marker.PRIORITY, IMarker.PRIORITY_HIGH);

+						} catch (CoreException ex) {

+						}

 					}

 				}

 			}