commit 65f3da469604f76f85fef09e769884d572969a6e
author Philip Langer <planger@eclipsesource.com> Mon Feb 02 04:52:20 2015 -0500
committer Gerrit Code Review @ Eclipse.org <gerrit@eclipse.org> Mon Feb 02 04:52:21 2015 -0500
tree c27cd5a8801b0614c7c5852a0f763b0a961762a2
parent 9edffec1035f2701c13e60abdf1348360f66a256
parent 31610874aebf22d40071810d6f7851076b0d9122

Merge "Happy boy-scout: Fixed findbugs warning."

plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/text/EMFCompareTextMergeViewer.java

diff --git a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/text/EMFCompareTextMergeViewer.java b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/text/EMFCompareTextMergeViewer.java
index 5783aa6..b70785b 100644
--- a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/text/EMFCompareTextMergeViewer.java
+++ b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/text/EMFCompareTextMergeViewer.java
@@ -305,16 +305,14 @@
 				final Object oldInput = getInput();
 				if (event.getDocumentEvent() != null && oldInput instanceof CompareInputAdapter) {
 					// When we leave the current input
-					if (oldInput instanceof CompareInputAdapter) {
-						final AttributeChange diff = (AttributeChange)((CompareInputAdapter)oldInput)
-								.getComparisonObject();
-						final EAttribute eAttribute = diff.getAttribute();
-						final Match match = diff.getMatch();
-						final IEqualityHelper equalityHelper = match.getComparison().getEqualityHelper();
+					final AttributeChange diff = (AttributeChange)((CompareInputAdapter)oldInput)
+							.getComparisonObject();
+					final EAttribute eAttribute = diff.getAttribute();
+					final Match match = diff.getMatch();
+					final IEqualityHelper equalityHelper = match.getComparison().getEqualityHelper();
 
-						updateModel(diff, eAttribute, equalityHelper, match.getLeft(), true);
-						updateModel(diff, eAttribute, equalityHelper, match.getRight(), false);
-					}
+					updateModel(diff, eAttribute, equalityHelper, match.getLeft(), true);
+					updateModel(diff, eAttribute, equalityHelper, match.getRight(), false);
 				}
 			}
 		});