added useful impl. for ContentMergeViewer.refresh

3 files changed, 16 insertions, 30 deletions

diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/ContentMergeViewer.java b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/ContentMergeViewer.java
index e98d7c9b0..731358a61 100644
--- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/ContentMergeViewer.java
+++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/ContentMergeViewer.java
@@ -280,7 +280,7 @@ public abstract class ContentMergeViewer extends ContentViewer implements IPrope
 		

 		fCompareInputChangeListener= new ICompareInputChangeListener() {

 			public void compareInputChanged(ICompareInput input) {

-				ContentMergeViewer.this.compareInputChanged(input);

+				ContentMergeViewer.this.internalRefresh(input);

 			}

 		};

 		

@@ -424,9 +424,6 @@ public abstract class ContentMergeViewer extends ContentViewer implements IPrope
 		return (IMergeViewerContentProvider) getContentProvider();

 	}

 

-	public void refresh() {

-	}

-	

 	/**

 	 * The <code>ContentMergeViewer</code> implementation of this 

 	 * <code>Viewer</code> method returns the empty selection. Subclasses may override.

@@ -457,7 +454,6 @@ public abstract class ContentMergeViewer extends ContentViewer implements IPrope
 		}

 	}

 	

-	//PR1GI3HDZ

 	void setAncestorVisibility(boolean visible, boolean enabled) {

 		if (fAncestorItem != null) {

 			Action action= (Action) fAncestorItem.getAction();

@@ -469,8 +465,6 @@ public abstract class ContentMergeViewer extends ContentViewer implements IPrope
 		if (fCompareConfiguration != null)

 			fCompareConfiguration.setProperty(ANCESTOR_ENABLED, new Boolean(visible));

 	}

-	//end PR1GI3HDZ

-

 

 	//---- input

 			 

@@ -538,10 +532,22 @@ public abstract class ContentMergeViewer extends ContentViewer implements IPrope
 		setLeftDirty(false);

 		setRightDirty(false);

 

+		internalRefresh(input);

+	}

+	

+	/* (non Javadoc)

+	 * see Viewer.refresh

+	 */

+	public void refresh() {

+		internalRefresh(getInput());

+	}

+	

+	private void internalRefresh(Object input) {

+		

 		// determine the merge direction

 		//boolean rightEditable= fMergeViewerContentProvider.isRightEditable(input);

 		//boolean leftEditable= fMergeViewerContentProvider.isLeftEditable(input);

-				

+		

 		IMergeViewerContentProvider content= getMergeContentProvider();

 		if (content != null) {

 			Object ancestor= content.getAncestorContent(input);

@@ -573,22 +579,6 @@ public abstract class ContentMergeViewer extends ContentViewer implements IPrope
 			updateContent(ancestor, left, right);

 		}

 	}

-

-	private void compareInputChanged(ICompareInput input) {

-				

-		if (input != null) {

-			

-			IMergeViewerContentProvider content= getMergeContentProvider();

-			

-			if (content != null) {

-				Object ancestor= content.getAncestorContent(input);

-				Object left= content.getLeftContent(input);

-				Object right= content.getRightContent(input);

-					

-				updateContent(ancestor, left, right);

-			}

-		}

-	}

 	

 	//---- layout & SWT control creation

 		

diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/patch/PatchWizard.java b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/patch/PatchWizard.java
index a2d9e0366..7b4bd987f 100644
--- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/patch/PatchWizard.java
+++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/patch/PatchWizard.java
@@ -51,9 +51,7 @@ import org.eclipse.compare.internal.*;
 			return null;

 		

 		IPath p= new Path(path);

-		int sc= p.segmentCount();

-		System.out.println(path + " " + sc);

-		if (sc > 1)

+		if (p.segmentCount() > 1)

 			p= p.removeFirstSegments(1);

 		

 		IResource[] selection= Utilities.getResources(fSelection);

diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/patch/PreviewPatchPage.java b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/patch/PreviewPatchPage.java
index 41e213e29..502112183 100644
--- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/patch/PreviewPatchPage.java
+++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/patch/PreviewPatchPage.java
@@ -80,9 +80,7 @@ import org.eclipse.compare.structuremergeviewer.Differencer;
 						h.setData(hunk);

 						h.setText(hunk.getDescription());

 						

-						h.setChecked(true);

-						//if (error)

-						//	isOk= false;

+						h.setChecked(isOk);

 					}

 					

 					d.setChecked(isOk);