[519142] Display a more explicit error message in SessionEditor.

* If the session cannot be loaded (because of too recent version for
instance) the error is now explicitly displayed instead of having a NPE
later during the execution.

Bug: 519142
Change-Id: I3c8aa6006847ee6385911fac1c75974949d7a6c2
Signed-off-by: Florian Barbin <florian.barbin@obeo.fr>

1 files changed, 9 insertions, 1 deletions

diff --git a/plugins/org.eclipse.sirius.ui.editor/src/org/eclipse/sirius/ui/editor/SessionEditor.java b/plugins/org.eclipse.sirius.ui.editor/src/org/eclipse/sirius/ui/editor/SessionEditor.java
index f50192748e..516795d894 100644
--- a/plugins/org.eclipse.sirius.ui.editor/src/org/eclipse/sirius/ui/editor/SessionEditor.java
+++ b/plugins/org.eclipse.sirius.ui.editor/src/org/eclipse/sirius/ui/editor/SessionEditor.java
@@ -405,8 +405,16 @@ public class SessionEditor extends SharedHeaderFormEditor implements ITabbedProp
                 };
                 session.getTransactionalEditingDomain().getCommandStack().addCommandStackListener(listener);
             }
-        } catch (InvocationTargetException | InterruptedException e) {
+        } catch (InvocationTargetException e) {
             ErrorDialog.openError(getSite().getShell(), MessageFormat.format(Messages.UI_SessionEditor_session_loading_error_message, new Object[0]), e.getMessage(), Status.CANCEL_STATUS);
+            // We cannot continue if one of those exception has been thrown ( if
+            // the Session cannot be loaded for instance). We throw a
+            // PartInitException.
+            throw new PartInitException(e.getTargetException().getMessage(), e.getTargetException());
+
+        } catch (InterruptedException e) {
+            ErrorDialog.openError(getSite().getShell(), MessageFormat.format(Messages.UI_SessionEditor_session_loading_error_message, new Object[0]), e.getMessage(), Status.CANCEL_STATUS);
+            throw new PartInitException(e.getMessage(), e);
         }
         pageRegistry = SessionEditorPlugin.getPlugin().getPageRegistry();
         pageRegistry.addRegistryListener(this);