Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAxel Richard2013-10-30 05:47:30 -0400
committerGerrit Code Review @ Eclipse.org2013-11-05 11:57:28 -0500
commit73d71b5d1e5019a7c47b5bf1868f78661ec588d5 (patch)
tree00ad06f514475af32ad885f7ca62b91f89ff5f95 /plugins/org.eclipse.emf.compare.ide.ui/src
parentd4ce3f0f7a520b59442dd708baaa2583482314fd (diff)
downloadorg.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
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.java6
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);

Back to the top