diff options
| author | Laurent Delaigue | 2015-01-28 08:01:07 +0000 |
|---|---|---|
| committer | Laurent Goubet | 2015-02-03 14:19:47 +0000 |
| commit | 29a9ac12a847a69937bf5b3523c83cfcc93c590d (patch) | |
| tree | f5d03648affb5a886723fde2d755cac885ed1a47 | |
| parent | a1a723b667fd37133b12c5f5d21f41cb071a03ee (diff) | |
| download | org.eclipse.emf.compare-29a9ac12a847a69937bf5b3523c83cfcc93c590d.tar.gz org.eclipse.emf.compare-29a9ac12a847a69937bf5b3523c83cfcc93c590d.tar.xz org.eclipse.emf.compare-29a9ac12a847a69937bf5b3523c83cfcc93c590d.zip | |
Needed to make sure diagnostic passed to method updateProblemIndication
is never null.
Bug: 458502 (duplicate)
Bug: 457700
Change-Id: I023c74755332c7d6a93fa0bad1049ac64bdf915f
Signed-off-by: Laurent Delaigue <laurent.delaigue@obeo.fr>
| -rw-r--r-- | plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/EMFCompareStructureMergeViewer.java | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/EMFCompareStructureMergeViewer.java b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/EMFCompareStructureMergeViewer.java index 53a2969d5..19712fbb4 100644 --- a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/EMFCompareStructureMergeViewer.java +++ b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/EMFCompareStructureMergeViewer.java @@ -817,7 +817,12 @@ public class EMFCompareStructureMergeViewer extends AbstractStructuredViewerWrap // display problem tabs if any SWTUtil.safeAsyncExec(new Runnable() { public void run() { - updateProblemIndication(comparison.getDiagnostic()); + Diagnostic diagnostic = comparison.getDiagnostic(); + if (diagnostic == null) { + updateProblemIndication(Diagnostic.OK_INSTANCE); + } else { + updateProblemIndication(diagnostic); + } } }); @@ -1145,6 +1150,7 @@ public class EMFCompareStructureMergeViewer extends AbstractStructuredViewerWrap } private void updateProblemIndication(Diagnostic diagnostic) { + Assert.isNotNull(diagnostic); int lastEditorPage = getPageCount() - 1; if (lastEditorPage >= 0 && getItemControl(lastEditorPage) instanceof ProblemIndicationComposite) { ((ProblemIndicationComposite)getItemControl(lastEditorPage)).setDiagnostic(diagnostic); |