diff options
| author | Axel Richard | 2013-10-30 05:47:30 -0400 |
|---|---|---|
| committer | Gerrit Code Review @ Eclipse.org | 2013-11-05 11:57:28 -0500 |
| commit | 73d71b5d1e5019a7c47b5bf1868f78661ec588d5 (patch) | |
| tree | 00ad06f514475af32ad885f7ca62b91f89ff5f95 /plugins/org.eclipse.emf.compare.ide.ui/src | |
| parent | d4ce3f0f7a520b59442dd708baaa2583482314fd (diff) | |
| download | org.eclipse.emf.compare-73d71b5d1e5019a7c47b5bf1868f78661ec588d5.tar.gz org.eclipse.emf.compare-73d71b5d1e5019a7c47b5bf1868f78661ec588d5.tar.xz org.eclipse.emf.compare-73d71b5d1e5019a7c47b5bf1868f78661ec588d5.zip | |
[420705] Fix NPE on comparison containing only filtered diffs
Bug: 420705
Change-Id: Ia2bf86bca9d6bb50592241fd49cd9d6e1c65ef35
Diffstat (limited to 'plugins/org.eclipse.emf.compare.ide.ui/src')
| -rw-r--r-- | plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/Navigatable.java | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/Navigatable.java b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/Navigatable.java index 2c52e5172..3443925cc 100644 --- a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/Navigatable.java +++ b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/Navigatable.java @@ -139,6 +139,9 @@ public class Navigatable implements INavigatable { }
private Object getNextSiblingDiff(Item item) {
+ if (item == null) {
+ return null;
+ }
Object ret = null;
Item parentItem = viewer.getParentItem(item);
final Item[] siblings = getChildren(parentItem);
@@ -155,6 +158,9 @@ public class Navigatable implements INavigatable { }
private Object getPreviousSiblingDeepestDiff(Item item) {
+ if (item == null) {
+ return null;
+ }
Object ret = null;
Item parentItem = viewer.getParentItem(item);
final Item[] siblings = getChildren(parentItem);
|