Attachment 15417 Details for Bug 72276 – Patch to QuickDiff to not prompt the user on errors

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] Patch to QuickDiff to not prompt the user on errors

org.eclipse.ui.workbench.texteditor.txt (text/plain), 4.13 KB, created by Michael Valenta

on 2004-10-27 11:28:23 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Valenta

Created: 2004-10-27 11:28:23 EDT

Size: 4.13 KB

patch

obsolete

>Index: .settings/org.eclipse.jdt.core.prefs
>===================================================================
>RCS file: /home/eclipse/org.eclipse.ui.workbench.texteditor/.settings/org.eclipse.jdt.core.prefs,v
>retrieving revision 1.4
>diff -u -r1.4 org.eclipse.jdt.core.prefs
>--- .settings/org.eclipse.jdt.core.prefs	7 Sep 2004 08:57:37 -0000	1.4
>+++ .settings/org.eclipse.jdt.core.prefs	26 Oct 2004 19:51:35 -0000
>@@ -1,4 +1,4 @@
>-#Fri Aug 27 08:42:49 CEST 2004
>+#Wed Sep 29 15:59:20 EDT 2004
> org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
> org.eclipse.jdt.core.compiler.debug.lineNumber=generate
> org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning
>Index: src/org/eclipse/ui/internal/texteditor/quickdiff/DocumentLineDiffer.java
>===================================================================
>RCS file: /home/eclipse/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/texteditor/quickdiff/DocumentLineDiffer.java,v
>retrieving revision 1.32
>diff -u -r1.32 DocumentLineDiffer.java
>--- src/org/eclipse/ui/internal/texteditor/quickdiff/DocumentLineDiffer.java	6 Jul 2004 09:58:08 -0000	1.32
>+++ src/org/eclipse/ui/internal/texteditor/quickdiff/DocumentLineDiffer.java	26 Oct 2004 19:51:36 -0000
>@@ -10,46 +10,18 @@
>  *******************************************************************************/
> package org.eclipse.ui.internal.texteditor.quickdiff;
> 
>-import java.util.ArrayList;
>-import java.util.ConcurrentModificationException;
>-import java.util.Iterator;
>-import java.util.LinkedList;
>-import java.util.List;
>-import java.util.ListIterator;
>-
>-import org.eclipse.core.runtime.CoreException;
>-import org.eclipse.core.runtime.IProgressMonitor;
>-import org.eclipse.core.runtime.IStatus;
>-import org.eclipse.core.runtime.OperationCanceledException;
>-import org.eclipse.core.runtime.Platform;
>-import org.eclipse.core.runtime.Status;
>-import org.eclipse.core.runtime.jobs.Job;
>+import java.util.*;
> 
>+import org.eclipse.core.runtime.*;
>+import org.eclipse.core.runtime.jobs.Job;
>+import org.eclipse.jface.text.*;
>+import org.eclipse.jface.text.source.*;
> import org.eclipse.jface.util.Assert;
>-
>-import org.eclipse.jface.text.BadLocationException;
>-import org.eclipse.jface.text.Document;
>-import org.eclipse.jface.text.DocumentEvent;
>-import org.eclipse.jface.text.IDocument;
>-import org.eclipse.jface.text.IDocumentListener;
>-import org.eclipse.jface.text.IRegion;
>-import org.eclipse.jface.text.Position;
>-import org.eclipse.jface.text.Region;
>-import org.eclipse.jface.text.source.Annotation;
>-import org.eclipse.jface.text.source.AnnotationModelEvent;
>-import org.eclipse.jface.text.source.IAnnotationModel;
>-import org.eclipse.jface.text.source.IAnnotationModelListener;
>-import org.eclipse.jface.text.source.IAnnotationModelListenerExtension;
>-import org.eclipse.jface.text.source.ILineDiffInfo;
>-import org.eclipse.jface.text.source.ILineDiffer;
>-
>-import org.eclipse.ui.texteditor.quickdiff.IQuickDiffReferenceProvider;
>-
> import org.eclipse.ui.internal.texteditor.TextEditorPlugin;
>-import org.eclipse.ui.internal.texteditor.quickdiff.compare.rangedifferencer.DocLineComparator;
>-import org.eclipse.ui.internal.texteditor.quickdiff.compare.rangedifferencer.RangeDifference;
>-import org.eclipse.ui.internal.texteditor.quickdiff.compare.rangedifferencer.RangeDifferencer;
>+import org.eclipse.ui.internal.texteditor.quickdiff.compare.rangedifferencer.*;
> import org.eclipse.ui.internal.texteditor.quickdiff.compare.rangedifferencer.LinkedRangeFactory.LowMemoryException;
>+import org.eclipse.ui.progress.IProgressConstants;
>+import org.eclipse.ui.texteditor.quickdiff.IQuickDiffReferenceProvider;
> 
> /**
>  * Standard implementation of <code>ILineDiffer</code> as an incremental diff engine. A 
>@@ -447,6 +419,9 @@
> 							clearModel();
> 							fireModelChanged();
> 							DocumentLineDiffer.this.notifyAll();
>+							// Do not put up the error immediatly as it may interupt the user
>+							setProperty(IProgressConstants.NO_IMMEDIATE_ERROR_PROMPT_PROPERTY, Boolean.TRUE);
>+							// TODO: Could add goto action that disables this quick diff
> 							return e.getStatus();
> 						}
> 					}

Actions: View | Diff

Attachments on bug 72276: 15417