Bug 405314 - Moved setParent and init method calls into init of

DiagramEditor.
Developers who provide subclasses of DiagramBehavior can just
instantiate it in the createDiagramBehavior method without worrying
about configuration and initialization.

Change-Id: If5db18396e694860de829da437d847b4d794239e

1 files changed, 4 insertions, 5 deletions

diff --git a/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/editor/DiagramEditor.java b/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/editor/DiagramEditor.java
index 6ce4e07d..05164c0d 100644
--- a/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/editor/DiagramEditor.java
+++ b/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/editor/DiagramEditor.java
@@ -34,6 +34,7 @@
  *    pjpaulin - Bug 352120 - Main implementation of DiagramEditor - API BREAKAGE HERE
  *    pjpaulin - Bug 352120 - Renamed from DiagramEditorImpl so that classes extending DiagramEditor do not break
  *    mwenz - Bug 394315 - Enable injecting behavior objects in DiagramEditor
+ *    pjpaulin - Bug 405314 - Should be able to override DefaultBehavior implementation without configuration
  *
  * </copyright>
  *
@@ -194,6 +195,8 @@ public class DiagramEditor extends GraphicalEditorWithFlyoutPalette implements I
 	 */
 	public void init(IEditorSite site, IEditorInput input) throws PartInitException {
 		diagramBehavior = createDiagramBehavior();
+		diagramBehavior.setParentPart(this);
+		diagramBehavior.initDefaultBehaviors();
 
 		// Eclipse may call us with other inputs when a file is to be
 		// opened. Try to convert this to a valid diagram input.
@@ -238,11 +241,7 @@ public class DiagramEditor extends GraphicalEditorWithFlyoutPalette implements I
 	 * @since 0.10
 	 */
 	protected DiagramBehavior createDiagramBehavior() {
-		DiagramBehavior diagramBehavior = new DiagramBehavior(this);
-		diagramBehavior.setParentPart(this);
-		diagramBehavior.initDefaultBehaviors();
-
-		return diagramBehavior;
+		return new DiagramBehavior(this);
 	}
 
 	/**