diff options
| author | Camille Letavernier | 2013-08-01 11:22:11 +0000 |
|---|---|---|
| committer | Camille Letavernier | 2013-08-01 11:22:11 +0000 |
| commit | 205c41fa561834946289b706c8c41f89451d92b5 (patch) | |
| tree | da3dfaf77944e00dcce44ce814621d71090c7ea2 /plugins/uml/org.eclipse.papyrus.uml.profile | |
| parent | 34aa750ec6b019bd541b4d3eb30aec7a88f903dd (diff) | |
| parent | 12000895c5f194595e6b9c6ed193a65a0447006e (diff) | |
| download | org.eclipse.papyrus-205c41fa561834946289b706c8c41f89451d92b5.tar.gz org.eclipse.papyrus-205c41fa561834946289b706c8c41f89451d92b5.tar.xz org.eclipse.papyrus-205c41fa561834946289b706c8c41f89451d92b5.zip | |
Merge branch 'Bug-408491-ProfileSwitch'
Conflicts:
plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/model/ProfileApplicationModel.java
Diffstat (limited to 'plugins/uml/org.eclipse.papyrus.uml.profile')
| -rw-r--r-- | plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/service/ReapplyProfilesService.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/service/ReapplyProfilesService.java b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/service/ReapplyProfilesService.java index 5a9017f2d71..4309655a6de 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/service/ReapplyProfilesService.java +++ b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/service/ReapplyProfilesService.java @@ -109,6 +109,10 @@ public class ReapplyProfilesService implements IService, EditorLifecycleEventLis }
protected boolean checkAndRefreshProfiles(Package currentPackage, IMultiDiagramEditor editor) {
+ if(Display.getCurrent() == null) {
+ return false;
+ }
+
for(Profile profile : currentPackage.getAppliedProfiles()) {
if(ProfileUtil.isDirty(currentPackage, profile)) {
RefreshProfileDialog dialog = new RefreshProfileDialog(editor.getSite().getShell(), this.rootPackage);
|