Bug 519107 - [All diagrams] model opening is slow, if multiple diagrams are open

- Avoid NPE on dispose (if diagram has not been initialized yet)
- Add bug-related entry in header

Signed-off-by: Ansgar Radermacher <ansgar.radermacher@cea.fr>

1 files changed, 16 insertions, 3 deletions

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 72d7d380169..0e7f08d6626 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 CEA LIST.
+ * Copyright (c) 2016, 2017 CEA LIST.
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -9,6 +9,7 @@
  * Contributors:
  *   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)
  *
  *****************************************************************************/
 package org.eclipse.papyrus.uml.diagram.common.part;
@@ -128,6 +129,18 @@ public class UmlGmfDiagramEditor extends SynchronizableGmfDiagramEditor implemen
 	}
 
 	/**
+	 * Avoid NPE, if viewer has not been initialized yet (method is called on dispose)
+	 *
+	 * @see org.eclipse.gmf.runtime.diagram.ui.parts.DiagramEditor#persistViewerSettings()
+	 */
+	@Override
+	public void persistViewerSettings() {
+		if (getDiagramEditPart() != null) {
+			super.persistViewerSettings();
+		}
+	}
+
+	/**
 	 * Dispose services used in this part.
 	 *
 	 * @see org.eclipse.gmf.runtime.diagram.ui.resources.editor.parts.DiagramDocumentEditor#dispose()
@@ -309,10 +322,10 @@ public class UmlGmfDiagramEditor extends SynchronizableGmfDiagramEditor implemen
 	public void modifyPartName(final String name) {
 		setPartName(name);
 	}
-	
+
 	/**
 	 * {@inheritDoc}
-	 * 
+	 *
 	 * @see org.eclipse.papyrus.infra.internationalization.common.editor.IInternationalizationEditor#refreshEditorPart()
 	 */
 	@Override