diff options
| author | Ansgar Radermacher | 2021-05-27 13:20:47 +0000 |
|---|---|---|
| committer | Patrick Tessier | 2021-06-01 08:02:23 +0000 |
| commit | ee7c9e63f017825f6c20ac8100101b6068ce9262 (patch) | |
| tree | d81c072a182c50b67ed9128646a5187e0a5b7137 /plugins/infra | |
| parent | 18649c290ae56b774c61a28104ad0c679f0213fd (diff) | |
| download | org.eclipse.papyrus-ee7c9e63f017825f6c20ac8100101b6068ce9262.tar.gz org.eclipse.papyrus-ee7c9e63f017825f6c20ac8100101b6068ce9262.tar.xz org.eclipse.papyrus-ee7c9e63f017825f6c20ac8100101b6068ce9262.zip | |
Bug 573807 - [Core] Cannot close modified model
- Verify that a shell is not disposed, before asking for its display.
Signed-off-by: Ansgar Radermacher <ansgar.radermacher@cea.fr>
Change-Id: Id88e07e33782578304a55574805d56be4a1a14a4
Diffstat (limited to 'plugins/infra')
2 files changed, 10 insertions, 7 deletions
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu/src/org/eclipse/papyrus/infra/gmfdiag/menu/handlers/CopyInDiagramHandler.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu/src/org/eclipse/papyrus/infra/gmfdiag/menu/handlers/CopyInDiagramHandler.java index ddb2288007c..025ce20f989 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu/src/org/eclipse/papyrus/infra/gmfdiag/menu/handlers/CopyInDiagramHandler.java +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu/src/org/eclipse/papyrus/infra/gmfdiag/menu/handlers/CopyInDiagramHandler.java @@ -1,5 +1,5 @@ /***************************************************************************** - * Copyright (c) 2014 CEA LIST and others. + * Copyright (c) 2014, 2021 CEA LIST and others. * * * All rights reserved. This program and the accompanying materials @@ -12,7 +12,9 @@ * Contributors: * Benoit Maggi (CEA LIST) benoit.maggi@cea.fr - Initial API and implementation * Christian W. Damus (CEA) - bug 430701 - * Gabriel Pascual (ALL4TEC) gabriel.pascual@all4tec.net - bug 441318, bug 455305 + * Gabriel Pascual (ALL4TEC) gabriel.pascual@all4tec.net - bug 441318, bug 455305 + * Ansgar Radermacher (CEA LIST) ansgar.radermacher@cea.fr - bug 573807 + * *****************************************************************************/ package org.eclipse.papyrus.infra.gmfdiag.menu.handlers; @@ -159,7 +161,7 @@ public class CopyInDiagramHandler extends AbstractGraphicalCommandHandler { Control focusControl = null; if (activeShell instanceof Shell) { Shell shell = (Shell) activeShell; - Display display = shell.getDisplay(); + Display display = !shell.isDisposed() ? shell.getDisplay() : null; if (display != null) { focusControl = display.getFocusControl(); } @@ -176,7 +178,7 @@ public class CopyInDiagramHandler extends AbstractGraphicalCommandHandler { /** * Papyrus implementation of {@link CopyImageCommand}. - * + * * <p> * Bug 441318 :<br/> * Fix override {@link CopyImageCommand} to permit Undo. This workaround is used by GMF. diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu/src/org/eclipse/papyrus/infra/gmfdiag/menu/handlers/CutInDiagramHandler.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu/src/org/eclipse/papyrus/infra/gmfdiag/menu/handlers/CutInDiagramHandler.java index d53f4671740..333aa366a54 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu/src/org/eclipse/papyrus/infra/gmfdiag/menu/handlers/CutInDiagramHandler.java +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu/src/org/eclipse/papyrus/infra/gmfdiag/menu/handlers/CutInDiagramHandler.java @@ -1,5 +1,5 @@ /***************************************************************************** - * Copyright (c) 2014 CEA LIST and others. + * Copyright (c) 2014, 2021 CEA LIST and others. * * * All rights reserved. This program and the accompanying materials @@ -12,6 +12,7 @@ * Contributors: * Benoit Maggi (CEA LIST) benoit.maggi@cea.fr - Initial API and implementation * Gabriel Pascual (ALL4TEC) gabriel.pascual@all4tec.net - bug 455305 + * Ansgar Radermacher (CEA LIST) ansgar.radermacher@cea.fr - bug 573807 * *****************************************************************************/ package org.eclipse.papyrus.infra.gmfdiag.menu.handlers; @@ -118,7 +119,7 @@ public class CutInDiagramHandler extends AbstractGraphicalCommandHandler { /* * (non-Javadoc) - * + * * @see org.eclipse.papyrus.infra.gmfdiag.menu.handlers. * AbstractGraphicalCommandHandler#setEnabled(java.lang.Object) */ @@ -145,7 +146,7 @@ public class CutInDiagramHandler extends AbstractGraphicalCommandHandler { Control focusControl = null; if (activeShell instanceof Shell) { Shell shell = (Shell) activeShell; - Display display = shell.getDisplay(); + Display display = !shell.isDisposed() ? shell.getDisplay() : null; if (display != null) { focusControl = display.getFocusControl(); } |