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, 25 insertions, 2 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 3e5f77c9a24..f8f8b7815de 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,6 +1,17 @@
-/**
+/*****************************************************************************
+ * 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
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * 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;
 
 import org.eclipse.core.commands.operations.IUndoContext;
@@ -122,6 +133,18 @@ public class UmlGmfDiagramEditor extends SynchronizableGmfDiagramEditor {
 	}
 
 	/**
+	 * 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()