diff options
| author | Pierre-Charles David | 2017-08-08 14:55:10 +0000 |
|---|---|---|
| committer | Pierre-Charles David | 2017-08-08 14:56:05 +0000 |
| commit | 7f0cfdc126a0d9e5289913a51ab65ea27b1eb199 (patch) | |
| tree | 29e65c52c7d43d8bc29025bb8571f9957b5a10df | |
| parent | 0090a9a4b4ce19d6a60282eadc9c520eb45404ca (diff) | |
| download | org.eclipse.amalgam-7f0cfdc126a0d9e5289913a51ab65ea27b1eb199.tar.gz org.eclipse.amalgam-7f0cfdc126a0d9e5289913a51ab65ea27b1eb199.tar.xz org.eclipse.amalgam-7f0cfdc126a0d9e5289913a51ab65ea27b1eb199.zip | |
[509735] Fix potential NPEs introduced by a434a1609dc9
Make sure the "image on/off" paths are always non-null, using the
defaults from IImageKeys if nothing specific is configured.
Bug: 509735
Change-Id: I8d5edc2b59197c447f050e61f868dd8ca0bf11c6
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/CommonActivityExplorerPage.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/plugins/org.eclipse.amalgam.explorer.activity.ui/src/org/eclipse/amalgam/explorer/activity/ui/api/editor/pages/CommonActivityExplorerPage.java b/plugins/org.eclipse.amalgam.explorer.activity.ui/src/org/eclipse/amalgam/explorer/activity/ui/api/editor/pages/CommonActivityExplorerPage.java index 35e87b55..f64fffb6 100644 --- a/plugins/org.eclipse.amalgam.explorer.activity.ui/src/org/eclipse/amalgam/explorer/activity/ui/api/editor/pages/CommonActivityExplorerPage.java +++ b/plugins/org.eclipse.amalgam.explorer.activity.ui/src/org/eclipse/amalgam/explorer/activity/ui/api/editor/pages/CommonActivityExplorerPage.java @@ -108,6 +108,9 @@ public class CommonActivityExplorerPage extends FormPage implements IExecutableE config.setOverviewImageOffPath(ActivityExplorerExtensionManager.getOverviewImageOff(cfig)); config.setOverviewImageOnPath(ActivityExplorerExtensionManager.getOverviewImageOn(cfig)); config.setOverviewText(ActivityExplorerExtensionManager.getOverviewDescription(cfig)); + } else { + config.setOverviewImageOffPath(IImageKeys.IMAGE_DEFAULT_OVERVIEW_OFF); + config.setOverviewImageOnPath(IImageKeys.IMAGE_DEFAULT_OVERVIEW_ON); } config.setPredicate(ActivityExplorerExtensionManager.getPredicate(cfig)); |