diff options
| author | Andre Weinand | 2004-06-04 13:20:29 +0000 |
|---|---|---|
| committer | Andre Weinand | 2004-06-04 13:20:29 +0000 |
| commit | f3244886d6d75685cd9181eaf63ebb298526c423 (patch) | |
| tree | 2d94643382283ea9a26a4adae4ecb8dee4d97714 | |
| parent | df425d4e41cde783b8009606ced4e18d633023ca (diff) | |
| download | eclipse.platform.team-f3244886d6d75685cd9181eaf63ebb298526c423.tar.gz eclipse.platform.team-f3244886d6d75685cd9181eaf63ebb298526c423.tar.xz eclipse.platform.team-f3244886d6d75685cd9181eaf63ebb298526c423.zip | |
fixed #55333v20040604_1600
4 files changed, 24 insertions, 10 deletions
diff --git a/bundles/org.eclipse.compare/buildnotes_compare.html b/bundles/org.eclipse.compare/buildnotes_compare.html index d9b0bcdd0..2c7c99bbf 100644 --- a/bundles/org.eclipse.compare/buildnotes_compare.html +++ b/bundles/org.eclipse.compare/buildnotes_compare.html @@ -19,6 +19,7 @@ Problem reports fixed</h2> <a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=61998">61998</a>: bad idea to subclass Error for ordinary exceptions<br> <a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=59232">59232</a>: DBCS: compare improperly in EUC-JP encoding project on workbench encoding MS932<br> <a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=65515">65515</a>: Local History always says "Parsing Error; no structured Replace Available"<br> +<a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=55333">55333</a>: NPE in TextMergeViewer.interpolate<br> <h1> <hr WIDTH="100%"></h1> diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java index b69826cef..9c8271f22 100644 --- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java +++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java @@ -3509,11 +3509,17 @@ public class TextMergeViewer extends ContentMergeViewer { } static RGB interpolate(RGB fg, RGB bg, double scale) { - return new RGB( - (int)((1.0-scale) * fg.red + scale * bg.red), - (int)((1.0-scale) * fg.green + scale * bg.green), - (int)((1.0-scale) * fg.blue + scale * bg.blue) - ); + if (fg != null && bg != null) + return new RGB( + (int)((1.0-scale) * fg.red + scale * bg.red), + (int)((1.0-scale) * fg.green + scale * bg.green), + (int)((1.0-scale) * fg.blue + scale * bg.blue) + ); + if (fg != null) + return fg; + if (bg != null) + return bg; + return new RGB(128, 128, 128); // a gray } //---- Navigating and resolving Diffs 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 d9b0bcdd0..2c7c99bbf 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 @@ -19,6 +19,7 @@ Problem reports fixed</h2> <a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=61998">61998</a>: bad idea to subclass Error for ordinary exceptions<br> <a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=59232">59232</a>: DBCS: compare improperly in EUC-JP encoding project on workbench encoding MS932<br> <a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=65515">65515</a>: Local History always says "Parsing Error; no structured Replace Available"<br> +<a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=55333">55333</a>: NPE in TextMergeViewer.interpolate<br> <h1> <hr WIDTH="100%"></h1> 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 b69826cef..9c8271f22 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 @@ -3509,11 +3509,17 @@ public class TextMergeViewer extends ContentMergeViewer { } static RGB interpolate(RGB fg, RGB bg, double scale) { - return new RGB( - (int)((1.0-scale) * fg.red + scale * bg.red), - (int)((1.0-scale) * fg.green + scale * bg.green), - (int)((1.0-scale) * fg.blue + scale * bg.blue) - ); + if (fg != null && bg != null) + return new RGB( + (int)((1.0-scale) * fg.red + scale * bg.red), + (int)((1.0-scale) * fg.green + scale * bg.green), + (int)((1.0-scale) * fg.blue + scale * bg.blue) + ); + if (fg != null) + return fg; + if (bg != null) + return bg; + return new RGB(128, 128, 128); // a gray } //---- Navigating and resolving Diffs |