Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaxime Porhel2017-04-28 08:29:13 +0000
committerPierre-Charles David2017-05-09 07:54:51 +0000
commit8ead1a09f4c440f5a8196f09bd659375d4544c2d (patch)
tree03d66ea5c8903dcf6c5d1a8a195254e838bfdb56
parent6d36166e3938b9aa495584bec0f382f705fba269 (diff)
downloadorg.eclipse.sirius-8ead1a09f4c440f5a8196f09bd659375d4544c2d.tar.gz
org.eclipse.sirius-8ead1a09f4c440f5a8196f09bd659375d4544c2d.tar.xz
org.eclipse.sirius-8ead1a09f4c440f5a8196f09bd659375d4544c2d.zip
[442150] Prevent NPE in case of actions without id in the toolbar manager
Bug: 442150 Change-Id: If0d24ae4361657c9c958566979c28f85b3ee0c88 Signed-off-by: Maxime Porhel <maxime.porhel@obeo.fr>
-rw-r--r--plugins/org.eclipse.sirius.editor/src/org/eclipse/sirius/editor/tools/internal/presentation/CustomSiriusEditor.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/org.eclipse.sirius.editor/src/org/eclipse/sirius/editor/tools/internal/presentation/CustomSiriusEditor.java b/plugins/org.eclipse.sirius.editor/src/org/eclipse/sirius/editor/tools/internal/presentation/CustomSiriusEditor.java
index 9f8b842a0b..023e74f6e5 100644
--- a/plugins/org.eclipse.sirius.editor/src/org/eclipse/sirius/editor/tools/internal/presentation/CustomSiriusEditor.java
+++ b/plugins/org.eclipse.sirius.editor/src/org/eclipse/sirius/editor/tools/internal/presentation/CustomSiriusEditor.java
@@ -435,7 +435,7 @@ public class CustomSiriusEditor extends SiriusEditor implements IEObjectNavigabl
private ValidateAction getValidateAction(ToolBarManager tbm) {
IContributionItem[] contributions = tbm.getItems();
for (IContributionItem contribution : contributions) {
- if (contribution instanceof ActionContributionItem && contribution.getId().equals(ValidateAction.ID)) {
+ if (contribution instanceof ActionContributionItem && ValidateAction.ID.equals(contribution.getId())) {
IAction action = ((ActionContributionItem) contribution).getAction();
if (action instanceof ValidateAction) {
return (ValidateAction) action;

Back to the top