[1885] The PreferencesHelper does not check the case if the input of the

editor is null Bug: 1885 Change-Id: I7d95c8658c52b08e175454214564e6a12346edda Signed-off-by: cong-bang.do <docongbang1993@gmail.com>
eclipse-capella · Jan 3, 2018 · c1bf7e6 · c1bf7e6
1 parent 1271285
commit c1bf7e6
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/...references/src/org/polarsys/capella/core/commands/preferences/util/PreferencesHelper.java b/...references/src/org/polarsys/capella/core/commands/preferences/util/PreferencesHelper.java
@@ -170,6 +170,7 @@ public static IProject getSelectedCapellaProject() {
         capellaProject = resourceFile.getProject();
       }
     } else if ((activePage != null) && (activePage.getActiveEditor() != null)
+        && (activePage.getActiveEditor().getEditorInput() != null)
         && (activePage.getActiveEditor().getEditorInput().getName() != null)) {
       capellaProject = getProjectByEditorName(activePage.getActiveEditor().getEditorInput().getName());
     }
@@ -447,7 +448,8 @@ public static List<IFile> retrieveUserDefinedPreferenceFiles(ISelectionProvider
         public boolean visit(IResource resource) throws CoreException {
           IProject prj = resource != null ? resource.getProject() : null;
           IProject configurationProject = (prj != null) && prj.isOpen() && (prj.getReferencedProjects().length > 0)
-              ? prj.getReferencedProjects()[0] : null;
+              ? prj.getReferencedProjects()[0]
+              : null;
           if ((null != configurationProject)) {
             IFolder preferenceFolder = (configurationProject.getProject() != null)
                 && (configurationProject.getProject().getFolder(".settings/") != null) //$NON-NLS-1$