diff options
| author | Vincent Lorenzo | 2019-09-26 15:19:19 +0000 |
|---|---|---|
| committer | Patrick Tessier | 2019-11-26 20:05:20 +0000 |
| commit | 5a4f9004866f51ed72b8de0fed634fccd910d1c7 (patch) | |
| tree | 57ea3d899a5fbdb19db8cf0a973990e2949fdea7 | |
| parent | 034ca6367237e3f4154f35a4cd20823e0b9095b6 (diff) | |
| download | org.eclipse.papyrus-5a4f9004866f51ed72b8de0fed634fccd910d1c7.tar.gz org.eclipse.papyrus-5a4f9004866f51ed72b8de0fed634fccd910d1c7.tar.xz org.eclipse.papyrus-5a4f9004866f51ed72b8de0fed634fccd910d1c7.zip | |
Bug 551530: [Diagram][WelcomePage][Internationalization] NullPointerException with the checkbox Use internationalization
Change-Id: I6b2324d808367a96c515cb7f0deb7b6a255a9ef5
Signed-off-by: Vincent Lorenzo <vincent.lorenzo@cea.fr>
3 files changed, 14 insertions, 9 deletions
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/META-INF/MANIFEST.MF index 167b693620f..7765c7927d5 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/META-INF/MANIFEST.MF +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/META-INF/MANIFEST.MF @@ -92,7 +92,7 @@ Require-Bundle: org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors;bundle org.eclipse.papyrus.infra.gmfdiag.style;bundle-version="[2.0.0,3.0.0)", org.eclipse.papyrus.infra.gmfdiag.representation;bundle-version="[2.0.0,3.0.0)" Bundle-Vendor: %providerName -Bundle-Version: 3.4.0.qualifier +Bundle-Version: 3.4.100.qualifier Eclipse-BuddyPolicy: dependent Bundle-Activator: org.eclipse.papyrus.uml.diagram.common.Activator Bundle-ManifestVersion: 2 diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/pom.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/pom.xml index 12a42669c42..bec906d8670 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/pom.xml +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/pom.xml @@ -1,13 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.eclipse.papyrus</groupId> - <artifactId>org.eclipse.papyrus.uml-diagrams</artifactId> - <version>0.0.1-SNAPSHOT</version> + <groupId>org.eclipse.papyrus</groupId> + <artifactId>org.eclipse.papyrus.uml-diagrams</artifactId> + <version>0.0.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.papyrus.uml.diagram.common</artifactId> - <version>3.4.0-SNAPSHOT</version> + <version>3.4.100-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project> diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/part/UmlGmfDiagramEditor.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/part/UmlGmfDiagramEditor.java index 64dc0a2ccbf..1e4983b3993 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/part/UmlGmfDiagramEditor.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/part/UmlGmfDiagramEditor.java @@ -1,5 +1,5 @@ /***************************************************************************** - * Copyright (c) 2016, 2017 CEA LIST. + * Copyright (c) 2016, 2017, 2019 CEA LIST. * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -12,7 +12,7 @@ * CEA LIST - Initial API and implementation * Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - Bug 496905 * Ansgar Radermacher (CEA) ansgar.radermacher@cea.fr - Bug 519107 (lazy diagram opening) - * + * Vincent LORENZO (CEA) vincent.lorenzo@cea.fr - bug 551530 *****************************************************************************/ package org.eclipse.papyrus.uml.diagram.common.part; @@ -371,7 +371,11 @@ public class UmlGmfDiagramEditor extends SynchronizableGmfDiagramEditor implemen * @see org.eclipse.papyrus.infra.internationalization.common.editor.IInternationalizationEditor#refreshEditorPart() */ @Override - public void refreshEditorPart(){ + public void refreshEditorPart() { + if (null == getDiagramEditPart()) { + return;// see bug 551530 + } + DiagramHelper.forceRefresh(getDiagramEditPart()); } } |