Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPierre-Charles David2017-08-24 08:06:02 +0000
committerJoao Barata2017-09-22 11:02:57 +0000
commit3bfe39f2db35235c67077d4282de86c8df7a8231 (patch)
tree17d13df24171b43d681f11502e80a02b0cb1a06c
parentfa26a0ea1f91e0201f71d5a440c36ea8121de5d3 (diff)
downloadorg.eclipse.amalgam-3bfe39f2db35235c67077d4282de86c8df7a8231.tar.gz
org.eclipse.amalgam-3bfe39f2db35235c67077d4282de86c8df7a8231.tar.xz
org.eclipse.amalgam-3bfe39f2db35235c67077d4282de86c8df7a8231.zip
[509735] Fix potential NPE in ActivityExplorerPage
The previous refactoring introduced the possiblity of NPEs in AEP when creating breadcrumb for the first or last page. Bug: 509735 Change-Id: I0bd2671d4873c3b29f3fe37cff4083c85b2a9e98 Signed-off-by: Pierre-Charles David <pierre-charles.david@obeo.fr>
-rw-r--r--plugins/org.eclipse.amalgam.explorer.activity.ui/src/org/eclipse/amalgam/explorer/activity/ui/api/editor/pages/ActivityExplorerPage.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/org.eclipse.amalgam.explorer.activity.ui/src/org/eclipse/amalgam/explorer/activity/ui/api/editor/pages/ActivityExplorerPage.java b/plugins/org.eclipse.amalgam.explorer.activity.ui/src/org/eclipse/amalgam/explorer/activity/ui/api/editor/pages/ActivityExplorerPage.java
index 30f6223c..5326c06c 100644
--- a/plugins/org.eclipse.amalgam.explorer.activity.ui/src/org/eclipse/amalgam/explorer/activity/ui/api/editor/pages/ActivityExplorerPage.java
+++ b/plugins/org.eclipse.amalgam.explorer.activity.ui/src/org/eclipse/amalgam/explorer/activity/ui/api/editor/pages/ActivityExplorerPage.java
@@ -222,7 +222,7 @@ public class ActivityExplorerPage extends CommonActivityExplorerPage implements
final IFormPage nextPage = getEditor().getNextPage(this);
// create rich text
- String body = HTMLHelper.breadcrumbForm(previousPage.getId(), this.getId(), nextPage.getId());
+ String body = HTMLHelper.breadcrumbForm(previousPage != null ? previousPage.getId() : null, this.getId(), nextPage != null ? nextPage.getId() : null);
FormText richText = org.eclipse.amalgam.explorer.activity.ui.api.editor.pages.helper.FormHelper.createRichText(managedForm.getToolkit(), sectionContainer, body,
new FormTextPageLinkAdapter(getEditor()));

Back to the top