Integrate latest GraphView

Signed-off-by: joce <joce@unity3d.com>

MaterialGraphProject/Assets/GraphFramework/SerializableGraph/Editor/Drawing/SerializableGraphView.cs

 
             InsertChild(0, new GridBackground());
 
-            dataMapper[typeof(GraphNodePresenter)] = typeof(NodeDrawer);
+            typeMapper[typeof(GraphNodePresenter)] = typeof(NodeDrawer);
         }
 
         // TODO JOCE Remove the "new" here. Use the base class' impl

MaterialGraphProject/Assets/GraphFramework/SerializableGraph/Editor/Util/TypeMapper.cs

 
 namespace UnityEditor.Graphing.Util
 {
-    public class TypeMapper : BaseDataMapper<INode, ScriptableObject>
+    public class TypeMapper : BaseTypeMapper<INode, ScriptableObject>
     {
         public TypeMapper(Type fallbackType) : base(fallbackType)
         {

MaterialGraphProject/Assets/NewUI/Editor/Demo/Views/NodesContentView.cs

 				return EventPropagation.Continue;
 			}));
 
-			dataMapper[typeof(CustomEdgePresenter)] = typeof(CustomEdge);
-			dataMapper[typeof(NodeAnchorPresenter)] = typeof(NodeAnchor);
-			dataMapper[typeof(NodePresenter)] = typeof(Node);
-			dataMapper[typeof(VerticalNodePresenter)] = typeof(Node);
+			typeMapper[typeof(CustomEdgePresenter)] = typeof(CustomEdge);
+			typeMapper[typeof(NodeAnchorPresenter)] = typeof(NodeAnchor);
+			typeMapper[typeof(NodePresenter)] = typeof(Node);
+			typeMapper[typeof(VerticalNodePresenter)] = typeof(Node);
 		}
 
 		public void CreateOperator()

MaterialGraphProject/Assets/NewUI/Editor/Demo/Views/SimpleContentView.cs

 
 			InsertChild(0, new GridBackground());
 
-			dataMapper[typeof(CirclePresenter)] = typeof(Circle);
-			dataMapper[typeof(InvisibleBorderContainerPresenter)] = typeof(InvisibleBorderContainer);
-			dataMapper[typeof(MiniMapPresenter)] = typeof(MiniMap);
-			dataMapper[typeof(SimpleElementPresenter)] = typeof(SimpleElement);
-			dataMapper[typeof(WWWImagePresenter)] = typeof(WWWImage);
-			dataMapper[typeof(IMGUIPresenter)] = typeof(IMGUIElement);
-			dataMapper[typeof(CommentPresenter)] = typeof(Comment);
+			typeMapper[typeof(CirclePresenter)] = typeof(Circle);
+			typeMapper[typeof(InvisibleBorderContainerPresenter)] = typeof(InvisibleBorderContainer);
+			typeMapper[typeof(MiniMapPresenter)] = typeof(MiniMap);
+			typeMapper[typeof(SimpleElementPresenter)] = typeof(SimpleElement);
+			typeMapper[typeof(WWWImagePresenter)] = typeof(WWWImage);
+			typeMapper[typeof(IMGUIPresenter)] = typeof(IMGUIElement);
+			typeMapper[typeof(CommentPresenter)] = typeof(Comment);
 		}
 	}
 }

MaterialGraphProject/Assets/NewUI/Editor/Views/GraphView.cs

 			}
 		}
 
-		protected GraphViewDataMapper dataMapper { get; set; }
+		protected GraphViewTypeMapper typeMapper { get; set; }
 
 		public VisualContainer contentViewContainer{ get; private set; }
 
 			// make it absolute and 0 sized so it acts as a transform to move children to and fro
 			AddChild(contentViewContainer);
 
-			dataMapper = new GraphViewDataMapper();
-			dataMapper[typeof(EdgePresenter)] = typeof(Edge);
+			typeMapper = new GraphViewTypeMapper();
+			typeMapper[typeof(EdgePresenter)] = typeof(Edge);
 		}
 
 		public override void OnDataChanged()
 		private void InstantiateElement(GraphElementPresenter elementPresenter)
 		{
 			// call factory
-			GraphElement newElem = dataMapper.Create(elementPresenter);
+			GraphElement newElem = typeMapper.Create(elementPresenter);
 
 			if (newElem == null)
 			{

MaterialGraphProject/Assets/NewUI/Editor/BaseTypeMapper.cs

 
 namespace RMGUI.GraphView
 {
-	public abstract class BaseDataMapper<TKey, TValue>
+	public abstract class BaseTypeMapper<TKey, TValue>
 	{
 		private readonly Dictionary<Type, Type> m_Mappings = new Dictionary<Type, Type>();
 		private readonly Type m_FallbackType;
-		static BaseDataMapper()
+		static BaseTypeMapper()
 		{
 			k_KeyType = typeof(TKey);
 			k_ValueType = typeof(TValue);
 			return InternalCreate(valueType);
 		}
 
-		protected BaseDataMapper(Type fallbackType)
+		protected BaseTypeMapper(Type fallbackType)
 		{
 			m_FallbackType = fallbackType;
 		}

MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/MaterialGraphView.cs

         {
             AddManipulator(new ContextualMenu(DoContextMenu));
 
-            dataMapper[typeof(MaterialNodePresenter)] = typeof(MaterialNodeDrawer);
-            dataMapper[typeof(GraphAnchorPresenter)] = typeof(NodeAnchor);
-            dataMapper[typeof(EdgePresenter)] = typeof(Edge);
+            typeMapper[typeof(MaterialNodePresenter)] = typeof(MaterialNodeDrawer);
+            typeMapper[typeof(GraphAnchorPresenter)] = typeof(NodeAnchor);
+            typeMapper[typeof(EdgePresenter)] = typeof(Edge);
         }
 
         public virtual bool CanAddToNodeMenu(Type type)

MaterialGraphProject/ProjectSettings/ProjectVersion.txt

-m_EditorVersion: 5.6.0a5
+m_EditorVersion: 5.6.0b4

MaterialGraphProject/Assets/NewUI/Editor/GraphViewTypeMapper.cs

+namespace RMGUI.GraphView
+{
+	public class GraphViewTypeMapper : BaseTypeMapper<GraphElementPresenter, GraphElement>
+	{
+		public GraphViewTypeMapper() : base(typeof(FallbackGraphElement))
+		{
+		}
+
+		public override GraphElement Create(GraphElementPresenter key)
+		{
+			GraphElement elem = base.Create(key);
+			if (elem != null)
+			{
+				elem.presenter = key;
+			}
+			return elem;
+		}
+	}
+}

MaterialGraphProject/Assets/NewUI/Editor/GraphViewDataMapper.cs

-namespace RMGUI.GraphView
-{
-	public class GraphViewDataMapper : BaseDataMapper<GraphElementPresenter, GraphElement>
-	{
-		public GraphViewDataMapper() : base(typeof(FallbackGraphElement))
-		{
-		}
-
-		public override GraphElement Create(GraphElementPresenter key)
-		{
-			GraphElement elem = base.Create(key);
-			if (elem != null)
-			{
-				elem.presenter = key;
-			}
-			return elem;
-		}
-	}
-}