Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPierre-Charles David2016-09-20 14:53:48 +0000
committerPierre-Charles David2016-09-20 15:57:58 +0000
commit47dbd82d947fe8eda98f1a7d9fe215fcb071093e (patch)
treeba55b7cd785e3853f1a37f9b0e0c99b758b3788c
parenta925cb5eaf7a818c97e0cf83d59d6c27ac40ab75 (diff)
downloadorg.eclipse.sirius-47dbd82d947fe8eda98f1a7d9fe215fcb071093e.tar.gz
org.eclipse.sirius-47dbd82d947fe8eda98f1a7d9fe215fcb071093e.tar.xz
org.eclipse.sirius-47dbd82d947fe8eda98f1a7d9fe215fcb071093e.zip
[500681] Fix potential NPEs in the automated migration
Bug: 500681 Change-Id: Idabed045b2b02f7a372da06d6a67587261c00dc4 Signed-off-by: Pierre-Charles David <pierre-charles.david@obeo.fr>
-rw-r--r--plugins/org.eclipse.sirius.ui.properties/src/org/eclipse/sirius/ui/properties/internal/migration/ReferenceWidgetMigrationParticipant.java8
1 files changed, 6 insertions, 2 deletions
diff --git a/plugins/org.eclipse.sirius.ui.properties/src/org/eclipse/sirius/ui/properties/internal/migration/ReferenceWidgetMigrationParticipant.java b/plugins/org.eclipse.sirius.ui.properties/src/org/eclipse/sirius/ui/properties/internal/migration/ReferenceWidgetMigrationParticipant.java
index 998381657f..9535c7be0d 100644
--- a/plugins/org.eclipse.sirius.ui.properties/src/org/eclipse/sirius/ui/properties/internal/migration/ReferenceWidgetMigrationParticipant.java
+++ b/plugins/org.eclipse.sirius.ui.properties/src/org/eclipse/sirius/ui/properties/internal/migration/ReferenceWidgetMigrationParticipant.java
@@ -213,13 +213,17 @@ public class ReferenceWidgetMigrationParticipant extends AbstractVSMMigrationPar
hyperlink.setInitialOperation(listDescription.getOnClickOperation());
ListWidgetStyle listWidgetStyle = listDescription.getStyle();
- hyperlink.setStyle(this.handleHyperlinkStyle(listWidgetStyle));
+ if (listWidgetStyle != null) {
+ hyperlink.setStyle(this.handleHyperlinkStyle(listWidgetStyle));
+ }
List<ListWidgetConditionalStyle> listConditionalStyles = listDescription.getConditionalStyles();
for (ListWidgetConditionalStyle listWidgetConditionalStyle : listConditionalStyles) {
HyperlinkWidgetConditionalStyle hyperlinkWidgetConditionalStyle = PropertiesFactory.eINSTANCE.createHyperlinkWidgetConditionalStyle();
hyperlinkWidgetConditionalStyle.setPreconditionExpression(listWidgetConditionalStyle.getPreconditionExpression());
- hyperlinkWidgetConditionalStyle.setStyle(this.handleHyperlinkStyle(listWidgetConditionalStyle.getStyle()));
+ if (listWidgetConditionalStyle.getStyle() != null) {
+ hyperlinkWidgetConditionalStyle.setStyle(this.handleHyperlinkStyle(listWidgetConditionalStyle.getStyle()));
+ }
hyperlink.getConditionalStyles().add(hyperlinkWidgetConditionalStyle);
}
return hyperlink;

Back to the top