diff options
| author | Andre Weinand | 2002-05-27 14:56:16 +0000 |
|---|---|---|
| committer | Andre Weinand | 2002-05-27 14:56:16 +0000 |
| commit | 05e1e5c1d067ce65f5828e6ed618ec4395493c4b (patch) | |
| tree | 444f291c528f73418c00a768cacfb0e716b8808d /bundles/org.eclipse.compare/plugins | |
| parent | 0f58b338ecf3f549ebeba39ef4efa8c9e5d28525 (diff) | |
| download | eclipse.platform.team-05e1e5c1d067ce65f5828e6ed618ec4395493c4b.tar.gz eclipse.platform.team-05e1e5c1d067ce65f5828e6ed618ec4395493c4b.tar.xz eclipse.platform.team-05e1e5c1d067ce65f5828e6ed618ec4395493c4b.zip | |
#17536: NPE in compare
Diffstat (limited to 'bundles/org.eclipse.compare/plugins')
3 files changed, 4 insertions, 2 deletions
diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/buildnotes_compare.html b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/buildnotes_compare.html index ceaaa1665..55daeeee6 100644 --- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/buildnotes_compare.html +++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/buildnotes_compare.html @@ -32,6 +32,7 @@ Known deficiencies</h2> Problem reports fixed</h2>
<a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=17889">#17889</a>: Should not assume type of PropertyChangeEvent values<br>
<a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=17678">#17678</a>: Applying a patch does many compiles<br>
+<a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=17536">#17536</a>: NPE in compare<br>
<h2>
Problem reports closed</h2>
diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/EditionSelectionDialog.java b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/EditionSelectionDialog.java index 17ca4e5cb..796c3b472 100644 --- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/EditionSelectionDialog.java +++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/EditionSelectionDialog.java @@ -289,7 +289,7 @@ public class EditionSelectionDialog extends ResizableDialog { pair= new Pair(null, edition);
}
- if (! fTargetPair.equals(pair)) {
+ if (pair != null && !fTargetPair.equals(pair)) {
return pair.fItem;
}
}
diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java index 00405667b..f76b3757c 100644 --- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java +++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java @@ -939,7 +939,8 @@ public class TextMergeViewer extends ContentMergeViewer { r.y= yy;
r.width= size.x-(2*BIRDS_EYE_VIEW_INSET)-1;
r.height= hh;
- if (diff == fCurrentDiff) {
+ if (diff == fCurrentDiff ||
+ (fCurrentDiff != null && diff == fCurrentDiff.fParent)) {
gc.setLineWidth(2);
r.x++;
r.y++;
|