Download
Getting Started
Members
Projects
Community
Marketplace
Events
Planet Eclipse
Newsletter
Videos
Participate
Report a Bug
Forums
Mailing Lists
Wiki
IRC
How to Contribute
Working Groups
Automotive
Internet of Things
LocationTech
Long-Term Support
PolarSys
Science
OpenMDM
More
Community
Marketplace
Events
Planet Eclipse
Newsletter
Videos
Participate
Report a Bug
Forums
Mailing Lists
Wiki
IRC
How to Contribute
Working Groups
Automotive
Internet of Things
LocationTech
Long-Term Support
PolarSys
Science
OpenMDM
Toggle navigation
Bugzilla – Attachment 176337 Details for
Bug 322329
Cancel does not work when comparing files
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
Log In
[x]
|
Terms of Use
|
Copyright Agent
Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read
this important communication.
[patch]
Fix v01
clipboard.txt (text/plain), 3.90 KB, created by
Tomasz Zarna
on 2010-08-11 09:31:20 EDT
(
hide
)
Description:
Fix v01
Filename:
MIME Type:
Creator:
Tomasz Zarna
Created:
2010-08-11 09:31:20 EDT
Size:
3.90 KB
patch
obsolete
>### Eclipse Workspace Patch 1.0 >#P org.eclipse.compare >Index: compare/org/eclipse/compare/internal/merge/DocumentMerger.java >=================================================================== >RCS file: /cvsroot/eclipse/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/merge/DocumentMerger.java,v >retrieving revision 1.11 >diff -u -r1.11 DocumentMerger.java >--- compare/org/eclipse/compare/internal/merge/DocumentMerger.java 12 Apr 2010 14:36:06 -0000 1.11 >+++ compare/org/eclipse/compare/internal/merge/DocumentMerger.java 11 Aug 2010 13:20:24 -0000 >@@ -11,17 +11,35 @@ > package org.eclipse.compare.internal.merge; > > import java.lang.reflect.InvocationTargetException; >-import java.util.*; >+import java.util.ArrayList; >+import java.util.Iterator; >+import java.util.List; > > import org.eclipse.compare.CompareConfiguration; > import org.eclipse.compare.contentmergeviewer.ITokenComparator; >-import org.eclipse.compare.internal.*; >+import org.eclipse.compare.internal.CompareContentViewerSwitchingPane; >+import org.eclipse.compare.internal.CompareMessages; >+import org.eclipse.compare.internal.CompareUIPlugin; >+import org.eclipse.compare.internal.DocLineComparator; >+import org.eclipse.compare.internal.MergeViewerContentProvider; >+import org.eclipse.compare.internal.Utilities; > import org.eclipse.compare.internal.core.LCS; >-import org.eclipse.compare.rangedifferencer.*; >+import org.eclipse.compare.rangedifferencer.IRangeComparator; >+import org.eclipse.compare.rangedifferencer.RangeDifference; >+import org.eclipse.compare.rangedifferencer.RangeDifferencer; > import org.eclipse.compare.structuremergeviewer.Differencer; >-import org.eclipse.core.runtime.*; >+import org.eclipse.core.runtime.CoreException; >+import org.eclipse.core.runtime.IProgressMonitor; >+import org.eclipse.core.runtime.IStatus; >+import org.eclipse.core.runtime.Status; > import org.eclipse.jface.operation.IRunnableWithProgress; >-import org.eclipse.jface.text.*; >+import org.eclipse.jface.text.BadLocationException; >+import org.eclipse.jface.text.BadPositionCategoryException; >+import org.eclipse.jface.text.IDocument; >+import org.eclipse.jface.text.IRegion; >+import org.eclipse.jface.text.Position; >+import org.eclipse.jface.text.Region; >+import org.eclipse.jface.text.TextUtilities; > import org.eclipse.swt.graphics.Image; > import org.eclipse.swt.graphics.Point; > import org.eclipse.ui.PlatformUI; >@@ -446,7 +464,15 @@ > fAllDiffs.add(diff); > throw new CoreException(new Status(IStatus.ERROR, CompareUIPlugin.PLUGIN_ID, 0, CompareMessages.DocumentMerger_1, ex.getTargetException())); > } catch (InterruptedException ex) { >- // >+ // we create a NOCHANGE range for the whole document >+ Diff diff= new Diff(null, RangeDifference.NOCHANGE, >+ aDoc, aRegion, 0, aDoc != null ? aDoc.getLength() : 0, >+ lDoc, lRegion, 0, lDoc.getLength(), >+ rDoc, rRegion, 0, rDoc.getLength()); >+ >+ fAllDiffs = new ArrayList(); >+ fAllDiffs.add(diff); >+ return; > } > > if (isCapped(sa, sl, sr)) >#P org.eclipse.compare.core >Index: src/org/eclipse/compare/rangedifferencer/RangeDifferencer.java >=================================================================== >RCS file: /cvsroot/eclipse/org.eclipse.compare/plugins/org.eclipse.compare.core/src/org/eclipse/compare/rangedifferencer/RangeDifferencer.java,v >retrieving revision 1.7 >diff -u -r1.7 RangeDifferencer.java >--- src/org/eclipse/compare/rangedifferencer/RangeDifferencer.java 20 Apr 2010 16:52:43 -0000 1.7 >+++ src/org/eclipse/compare/rangedifferencer/RangeDifferencer.java 11 Aug 2010 13:20:29 -0000 >@@ -342,7 +342,7 @@ > * @since 2.0 > */ > public static RangeDifference[] findRanges(IProgressMonitor pm, IRangeComparator ancestor, IRangeComparator left, IRangeComparator right) { >- return findRanges(defaultFactory, null, ancestor, left, right); >+ return findRanges(defaultFactory, pm, ancestor, left, right); > } > > /**
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 322329
: 176337 |
176338
|
176444
|
176538
|
176547