Attachment 122256 Details for Bug 223857 – Patch

[patch] Patch

clipboard.txt (text/plain), 2.22 KB, created by Tomasz Zarna

on 2009-01-12 07:32:36 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Tomasz Zarna

Created: 2009-01-12 07:32:36 EST

Size: 2.22 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.compare
>Index: compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java,v
>retrieving revision 1.240
>diff -u -r1.240 TextMergeViewer.java
>--- compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java	9 Jan 2009 13:00:54 -0000	1.240
>+++ compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java	12 Jan 2009 12:30:17 -0000
>@@ -1003,6 +1003,14 @@
> 			IEditorInput input = getDocumentKey();
> 			if (input != null && input.equals(element)) {
> 				this.fViewer.updateDirtyState(input, getDocumentProvider(), fLeg);
>+				
>+				// recalculate diffs and update controls
>+				new UIJob(CompareMessages.DocumentMerger_0) {
>+					public IStatus runInUIThread(IProgressMonitor monitor) {
>+						update(true);
>+						return Status.OK_STATUS;
>+					}
>+				}.schedule();
> 			}
> 		}
> 		public void elementContentAboutToBeReplaced(Object element) {
>@@ -2491,8 +2499,7 @@
> 	}
> 
> 	private void contributeChangeEncodingAction(MergeSourceViewer viewer) {
>-		ResourceBundle bundle = ResourceBundle.getBundle("org.eclipse.ui.texteditor.ConstructedTextEditorMessages"); //$NON-NLS-1$
>-		IAction action = new ChangeEncodingAction(bundle, "Editor.ChangeEncodingAction.", getTextEditorAdapter()); //$NON-NLS-1$
>+		IAction action = new ChangeEncodingAction(getTextEditorAdapter());
> 		viewer.addAction(MergeSourceViewer.CHANGE_ENCODING_ID, action);
> 	}
> 
>@@ -2879,23 +2886,7 @@
> 			setRightDirty(dirty);
> 		}
> 		
>-		if (needsDiffRecalculation(e)) {
>-			new UIJob(CompareMessages.DocumentMerger_0) {
>-				public IStatus runInUIThread(IProgressMonitor monitor) {
>-					// do diff and update controls
>-					update(true);
>-					return Status.OK_STATUS;
>-				}
>-			}.schedule();
>-		} else {
>-			updateLines(doc);
>-		}
>-	}
>-	
>-	private boolean needsDiffRecalculation(DocumentEvent e) {
>-		IDocument doc = e.getDocument();
>-		// the doc has been replaced completely
>-		return e.fOffset == 0 && doc.get().length() == e.fText.length();
>+		updateLines(doc);
> 	}
> 	
> 	/*

Actions: View | Diff

Attachments on bug 223857: 121626 | 121790 | 121791 | 121805 | 121826 | 121932 | 122084 | 122256 | 122258 | 122528 | 122667 | 122671