From 77b2ee6f76adf95f067b2983fd22c640c00b6f54 Mon Sep 17 00:00:00 2001
From: Dylan Vorster <dylanvorster.dv@gmail.com>
Date: Wed, 29 Nov 2017 14:30:02 +0200
Subject: [PATCH] remove some core changes that are not neccesary

---
 demos/demo12/index.tsx             | 31 ++++++++++++------------------
 src/Common.ts                      |  4 ----
 src/defaults/DefaultLinkWidget.tsx | 21 ++++++--------------
 src/widgets/LinkLayerWidget.tsx    |  2 +-
 4 files changed, 19 insertions(+), 39 deletions(-)

diff --git a/demos/demo12/index.tsx b/demos/demo12/index.tsx
index 40d7957..e900e9b 100644
--- a/demos/demo12/index.tsx
+++ b/demos/demo12/index.tsx
@@ -9,17 +9,22 @@ import {
 	DiagramWidget,
 	LinkWidget,
 	LinkProps,
-	DefaultLinkWidget,
-	CustomizableLinkProps
+	DefaultLinkWidget
 } from "../../src/main";
 import { action } from "@storybook/addon-actions";
 import * as React from "react";
 import { LinkWidgetFactory } from "../../src/WidgetFactories";
 
 export class AdvancedLinkModel extends LinkModel {
+
+	size: number;
+	color: string;
+
     constructor() {
         super();
-        this.linkType = "advanced";
+		this.linkType = "advanced";
+		this.color = 'green';
+		this.size = 6;
     }
 }
 
@@ -36,27 +41,15 @@ export class AdvancedPortModel extends DefaultPortModel
 	}
 }
 
-export class AdvancedLinkWidget extends DefaultLinkWidget {
-	constructor(props: LinkProps) {
-		super(props);
-	}
-
-	beforeLinkGenerated(props: CustomizableLinkProps): CustomizableLinkProps {
-		return {
-			color: 'green',
-			width: 6,
-			smooth: props.smooth
-		};
-	}
-}
-
 export class AdvancedLinkWidgetFactory extends LinkWidgetFactory {
 	constructor() {
 		super("advanced");
 	}
 
-	generateReactWidget(diagramEngine: DiagramEngine, link: LinkModel): JSX.Element {
-		return React.createElement(AdvancedLinkWidget, {
+	generateReactWidget(diagramEngine: DiagramEngine, link: AdvancedLinkModel): JSX.Element {
+		return React.createElement(DefaultLinkWidget, {
+			color: link.color,
+			width: link.size,
 			link: link,
 			diagramEngine: diagramEngine
 		});
diff --git a/src/Common.ts b/src/Common.ts
index 129b342..622cde5 100644
--- a/src/Common.ts
+++ b/src/Common.ts
@@ -273,10 +273,6 @@ export class LinkModel extends BaseModel<LinkModelListener> {
 	getType(): string {
 		return this.linkType;
 	}
-
-	generateLinkWidget(diagramEngine: DiagramEngine): JSX.Element | null {
-		return diagramEngine.generateWidgetForLink(this);
-	}
 }
 
 export class PortModel extends BaseModel<BaseModelListener> {
diff --git a/src/defaults/DefaultLinkWidget.tsx b/src/defaults/DefaultLinkWidget.tsx
index 672e21b..841f256 100644
--- a/src/defaults/DefaultLinkWidget.tsx
+++ b/src/defaults/DefaultLinkWidget.tsx
@@ -3,16 +3,15 @@ import { LinkModel, PointModel } from "../Common";
 import * as _ from "lodash";
 import { DiagramEngine } from "../DiagramEngine";
 
-export interface CustomizableLinkProps {
-	color?: string;
-	width?: number;
-	smooth?: boolean;	
-}
 
-export interface DefaultLinkProps extends CustomizableLinkProps {
+
+export interface DefaultLinkProps {
 	link: LinkModel;
 	diagramEngine: DiagramEngine;
 	pointAdded?: (point: PointModel, event) => any;
+	color?: string;
+	width?: number;
+	smooth?: boolean;
 }
 
 export interface DefaultLinkState {
@@ -84,16 +83,8 @@ export class DefaultLinkWidget extends React.Component<DefaultLinkProps, Default
 		);
 	}
 
-	beforeLinkGenerated(props: CustomizableLinkProps): CustomizableLinkProps {
-		return props;
-	}
-
 	generateLink(extraProps: any, id: string | number): JSX.Element {
-		var props = this.beforeLinkGenerated({
-			color: this.props.color,
-			smooth: this.props.smooth,
-			width: this.props.width
-		});
+		var props = this.props;
 
 		var Bottom = (
 			<path
diff --git a/src/widgets/LinkLayerWidget.tsx b/src/widgets/LinkLayerWidget.tsx
index 0789c19..a13f33d 100644
--- a/src/widgets/LinkLayerWidget.tsx
+++ b/src/widgets/LinkLayerWidget.tsx
@@ -58,7 +58,7 @@ export class LinkLayerWidget extends React.Component<LinkLayerProps, LinkLayerSt
 						}
 
 						//generate links
-						var generatedLink = link.generateLinkWidget(this.props.diagramEngine);
+						var generatedLink = this.props.diagramEngine.generateWidgetForLink(link);
 						if (!generatedLink) {
 							console.log("no link generated for type: " + link.getType());
 							return null;