DynamoDS
diff --git a/‎src/DynamoCore/Models/DynamoModelCommands.cs
Copy file name to clipboard
+65-27Lines changed: 65 additions & 27 deletions b/‎src/DynamoCore/Models/DynamoModelCommands.cs
Copy file name to clipboard
+65-27Lines changed: 65 additions & 27 deletions
diff --git a/‎src/DynamoCore/Models/RecordableCommands.cs
Copy file name to clipboard
+10-1Lines changed: 10 additions & 1 deletion b/‎src/DynamoCore/Models/RecordableCommands.cs
Copy file name to clipboard
+10-1Lines changed: 10 additions & 1 deletion
diff --git a/‎src/DynamoCoreWpf/Commands/DynamoCommands.cs
Copy file name to clipboard
+12-1Lines changed: 12 additions & 1 deletion b/‎src/DynamoCoreWpf/Commands/DynamoCommands.cs
Copy file name to clipboard
+12-1Lines changed: 12 additions & 1 deletion
diff --git a/‎src/DynamoCoreWpf/ViewModels/Core/StateMachine.cs
Copy file name to clipboard
+7-2Lines changed: 7 additions & 2 deletions b/‎src/DynamoCoreWpf/ViewModels/Core/StateMachine.cs
Copy file name to clipboard
+7-2Lines changed: 7 additions & 2 deletions
@@ -52,19 +52,19 @@ protected virtual void OpenFileImpl(OpenFileCommand command)
             //ClipBoard.Clear();
         }
 
-        void RunCancelImpl(RunCancelCommand command)
+        private void RunCancelImpl(RunCancelCommand command)
         {
             var model = CurrentWorkspace as HomeWorkspaceModel;
             if (model != null)
                 model.Run();
         }
 
-        void ForceRunCancelImpl(ForceRunCancelCommand command)
+        private void ForceRunCancelImpl(ForceRunCancelCommand command)
         {
             ForceRun();
         }
 
-        void CreateNodeImpl(CreateNodeCommand command)
+        private void CreateNodeImpl(CreateNodeCommand command)
         {
             var node = GetNodeFromCommand(command);
             if (node == null)
@@ -79,7 +79,7 @@ void CreateNodeImpl(CreateNodeCommand command)
             CurrentWorkspace.RecordCreatedModel(node);
         }
 
-        void CreateAndConnectNodeImpl(CreateAndConnectNodeCommand command)
+        private void CreateAndConnectNodeImpl(CreateAndConnectNodeCommand command)
         {
             using (CurrentWorkspace.UndoRecorder.BeginActionGroup())
             {
@@ -124,7 +124,7 @@ void CreateAndConnectNodeImpl(CreateAndConnectNodeCommand command)
             }
         }
 
-        NodeModel GetNodeFromCommand(CreateNodeCommand command)
+        private NodeModel GetNodeFromCommand(CreateNodeCommand command)
         {
             if (command.Node != null)
             {
@@ -202,7 +202,7 @@ private NodeModel CreateNodeFromNameOrType(Guid nodeId, string name)
             return node;
         }
 
-        void CreateNoteImpl(CreateNoteCommand command)
+        private void CreateNoteImpl(CreateNoteCommand command)
         {
             NoteModel noteModel = CurrentWorkspace.AddNote(
                 command.DefaultPosition,
@@ -214,14 +214,14 @@ void CreateNoteImpl(CreateNoteCommand command)
             CurrentWorkspace.RecordCreatedModel(noteModel);
         }
 
-        void CreateAnnotationImpl(CreateAnnotationCommand command)
+        private void CreateAnnotationImpl(CreateAnnotationCommand command)
         {
             AnnotationModel annotationModel = currentWorkspace.AddAnnotation(command.AnnotationText, command.ModelGuid);
 
             CurrentWorkspace.RecordCreatedModel(annotationModel);
         }
 
-        void SelectModelImpl(SelectModelCommand command)
+        private void SelectModelImpl(SelectModelCommand command)
         {
             // Empty ModelGuid means clear selection.
             if (command.ModelGuid == Guid.Empty)
@@ -249,7 +249,7 @@ void SelectModelImpl(SelectModelCommand command)
             }
         }
 
-        void MakeConnectionImpl(MakeConnectionCommand command)
+        private void MakeConnectionImpl(MakeConnectionCommand command)
         {
             Guid nodeId = command.ModelGuid;
 
@@ -271,8 +271,17 @@ void MakeConnectionImpl(MakeConnectionCommand command)
                     EndShiftReconnections(nodeId, command.PortIndex, command.Type);
                     break;
 
+                // TODO - can be removed in Dynamo 3.0 - DYN-1729
                 case MakeConnectionCommand.Mode.EndAndStartCtrlConnection:
-                    EndAndStartCtrlConnection(nodeId, command.PortIndex, command.Type);
+                    BeginDuplicateConnection(nodeId, command.PortIndex, command.Type);
+                    break;
+
+                case MakeConnectionCommand.Mode.BeginDuplicateConnection:
+                    BeginDuplicateConnection(nodeId, command.PortIndex, command.Type);
+                    break;
+
+                case MakeConnectionCommand.Mode.BeginCreateConnections:
+                    BeginCreateConnections(nodeId, command.PortIndex, command.Type);
                     break;
 
                 case MakeConnectionCommand.Mode.Cancel:
@@ -281,7 +290,7 @@ void MakeConnectionImpl(MakeConnectionCommand command)
             }
         }
 
-        void BeginConnection(Guid nodeId, int portIndex, PortType portType)
+        private void BeginConnection(Guid nodeId, int portIndex, PortType portType)
         {
             bool isInPort = portType == PortType.Input;
             activeStartPorts = null;
@@ -315,7 +324,36 @@ void BeginConnection(Guid nodeId, int portIndex, PortType portType)
             }
         }
 
-        void BeginShiftReconnections(Guid nodeId, int portIndex, PortType portType)
+        private void BeginDuplicateConnection(Guid nodeId, int portIndex, PortType portType)
+        {
+            // If the port clicked is an output port, begin connection as per normal
+            if (portType == PortType.Output)
+            {
+                BeginConnection(nodeId, portIndex, portType);
+                return;
+            }
+
+            // Otherwise, if the port is an input port, check if the port already has a connection.
+            // If it does, duplicate the existing connection.
+            var node = CurrentWorkspace.GetModelInternal(nodeId) as NodeModel;
+            if (node == null)
+            {
+                return;
+            }
+
+            var portModel = node.InPorts[portIndex];
+            if (portModel.Connectors.Count == 0)
+            {
+                // If the port doesn't have any existing connections, begin connection as per normal
+                BeginConnection(nodeId, portIndex, portType);
+                return;
+            }
+            // Duplicate the existing connection
+            activeStartPorts = new PortModel[] { portModel.Connectors[0].Start };
+            firstStartPort = portModel.Connectors[0].Start;
+        }
+
+        private void BeginShiftReconnections(Guid nodeId, int portIndex, PortType portType)
         {
             if (portType == PortType.Input) return; //only handle multiple connections when the port selected is an output port
             var node = CurrentWorkspace.GetModelInternal(nodeId) as NodeModel;
@@ -343,7 +381,7 @@ void BeginShiftReconnections(Guid nodeId, int portIndex, PortType portType)
             return;
         }
 
-        void EndConnection(Guid nodeId, int portIndex, PortType portType)
+        private void EndConnection(Guid nodeId, int portIndex, PortType portType)
         {
             // Check if the node from which the connector starts is valid and has not been deleted
             if (activeStartPorts == null || activeStartPorts.Count() <= 0 || activeStartPorts[0].Owner == null) return;
@@ -365,7 +403,7 @@ void EndConnection(Guid nodeId, int portIndex, PortType portType)
             firstStartPort = null;
         }
 
-        void EndShiftReconnections(Guid nodeId, int portIndex, PortType portType)
+        private void EndShiftReconnections(Guid nodeId, int portIndex, PortType portType)
         {
             if (portType == PortType.Input) return; //only handle multiple connections when the port selected is an output port
             if (activeStartPorts == null || activeStartPorts.Count() <= 0) return;
@@ -388,7 +426,7 @@ void EndShiftReconnections(Guid nodeId, int portIndex, PortType portType)
             return;
         }
 
-        void EndAndStartCtrlConnection(Guid nodeId, int portIndex, PortType portType)
+        private void BeginCreateConnections(Guid nodeId, int portIndex, PortType portType)
         {
             if (portType == PortType.Output) return; // Only handle ctrl connections if selected port is an input port
             if (firstStartPort == null || activeStartPorts == null || activeStartPorts.Count() <= 0) return;
@@ -403,15 +441,15 @@ void EndAndStartCtrlConnection(Guid nodeId, int portIndex, PortType portType)
             activeStartPorts = new PortModel[] { firstStartPort };
         }
 
-        void CancelConnections()
+        private void CancelConnections()
         {
             CurrentWorkspace.DeleteSavedModels();
             activeStartPorts = null;
             firstStartPort = null;
             return;
         }
 
-        static Dictionary<ModelBase, UndoRedoRecorder.UserAction> GetConnectorsToAddAndDelete(
+        private static Dictionary<ModelBase, UndoRedoRecorder.UserAction> GetConnectorsToAddAndDelete(
             PortModel endPort, PortModel startPort)
         {
             ConnectorModel connectorToRemove = null;
@@ -457,7 +495,7 @@ void CancelConnections()
             return models;
         }
 
-        void DeleteModelImpl(DeleteModelCommand command)
+        private void DeleteModelImpl(DeleteModelCommand command)
         {
             var modelsToDelete = new List<ModelBase>();
             if (command.ModelGuid == Guid.Empty)
@@ -473,7 +511,7 @@ void DeleteModelImpl(DeleteModelCommand command)
             DeleteModelInternal(modelsToDelete);
         }
 
-        void UngroupModelImpl(UngroupModelCommand command)
+        private void UngroupModelImpl(UngroupModelCommand command)
         {
             if (command.ModelGuid == Guid.Empty)
                 return;
@@ -483,7 +521,7 @@ void UngroupModelImpl(UngroupModelCommand command)
             UngroupModel(modelsToUngroup);
         }
 
-        void AddToGroupImpl(AddModelToGroupCommand command)
+        private void AddToGroupImpl(AddModelToGroupCommand command)
         {
             if (command.ModelGuid == Guid.Empty)
                 return;
@@ -493,7 +531,7 @@ void AddToGroupImpl(AddModelToGroupCommand command)
             AddToGroup(modelsToGroup);
         }
 
-        void UndoRedoImpl(UndoRedoCommand command)
+        private void UndoRedoImpl(UndoRedoCommand command)
         {
             switch (command.CmdOperation)
             {
@@ -506,15 +544,15 @@ void UndoRedoImpl(UndoRedoCommand command)
             }
         }
 
-        void SendModelEventImpl(ModelEventCommand command)
+        private void SendModelEventImpl(ModelEventCommand command)
         {
             foreach (var guid in command.ModelGuids)
             {
                 CurrentWorkspace.SendModelEvent(guid, command.EventName, command.Value);
             }
         }
 
-        void UpdateModelValueImpl(UpdateModelValueCommand command)
+        private void UpdateModelValueImpl(UpdateModelValueCommand command)
         {
             WorkspaceModel targetWorkspace = CurrentWorkspace;
             if (!command.WorkspaceGuid.Equals(Guid.Empty))
@@ -533,7 +571,7 @@ private void ConvertNodesToCodeImpl(ConvertNodesToCodeCommand command)
             CurrentWorkspace.HasUnsavedChanges = true;
         }
 
-        void CreateCustomNodeImpl(CreateCustomNodeCommand command)
+        private void CreateCustomNodeImpl(CreateCustomNodeCommand command)
         {
             var workspace = CustomNodeManager.CreateCustomNode(
                 command.Name,
@@ -545,19 +583,19 @@ void CreateCustomNodeImpl(CreateCustomNodeCommand command)
             CurrentWorkspace = workspace;
         }
 
-        void SwitchWorkspaceImpl(SwitchTabCommand command)
+        private void SwitchWorkspaceImpl(SwitchTabCommand command)
         {
             // We don't attempt to null-check here, we need it to fail fast.
             CurrentWorkspace = Workspaces.ElementAt(command.WorkspaceModelIndex);
         }
 
-        void CreatePresetStateImpl(AddPresetCommand command)
+        private void CreatePresetStateImpl(AddPresetCommand command)
         {
             var preset = this.CurrentWorkspace.AddPreset(command.PresetStateName,command.PresetStateDescription,command.ModelGuids);
 
             CurrentWorkspace.RecordCreatedModel(preset);
         }
-        void SetWorkSpaceToStateImpl(ApplyPresetCommand command)
+        private void SetWorkSpaceToStateImpl(ApplyPresetCommand command)
         {
             var workspaceToSet = this.Workspaces.Where(x => x.Guid == command.WorkSpaceID).First();
             if (workspaceToSet == null)
 
@@ -1360,11 +1360,20 @@ public enum Mode
                 /// <summary>
                 /// End and start control connections.
                 /// </summary>
+                [Obsolete("Replaced with BeginDuplicateConnection")]
                 EndAndStartCtrlConnection,
                 /// <summary>
                 /// Cancel connection.
                 /// </summary>
-                Cancel
+                Cancel,
+                /// <summary>
+                /// Begin duplicate connection.
+                /// </summary>
+                BeginDuplicateConnection,
+                /// <summary>
+                /// End current connection and create new connections.
+                /// </summary>
+                BeginCreateConnections
             }
 
             void setProperties(int portIndex, PortType portType, Mode mode)
 
@@ -222,8 +222,19 @@ private void MakeConnectionImpl(DynamoModel.MakeConnectionCommand command)
                         nodeId, command.PortIndex, command.Type);
                     break;
 
+                // TODO - can be removed in Dynamo 3.0 - DYN-1729
                 case DynamoModel.MakeConnectionCommand.Mode.EndAndStartCtrlConnection:
-                    CurrentSpaceViewModel.EndAndStartCtrlConnection(
+                    CurrentSpaceViewModel.BeginConnection(
+                        nodeId, command.PortIndex, command.Type);
+                    break;
+
+                case DynamoModel.MakeConnectionCommand.Mode.BeginDuplicateConnection:
+                    CurrentSpaceViewModel.BeginConnection(
+                        nodeId, command.PortIndex, command.Type);
+                    break;
+
+                case DynamoModel.MakeConnectionCommand.Mode.BeginCreateConnections:
+                    CurrentSpaceViewModel.BeginCreateConnections(
                         nodeId, command.PortIndex, command.Type);
                     break;
 
 
@@ -225,7 +225,7 @@ internal void EndConnection(Guid nodeId, int portIndex, PortType portType)
             this.SetActiveConnectors(null);
         }
 
-        internal void EndAndStartCtrlConnection(Guid nodeId, int portIndex, PortType portType)
+        internal void BeginCreateConnections(Guid nodeId, int portIndex, PortType portType)
         {
             // Only handle ctrl connections if selected port is an input port
             if (firstStartPort == null || portType == PortType.Output) return; 
@@ -790,6 +790,11 @@ internal bool HandlePortClicked(PortViewModel portViewModel)
                         multipleConnections = true;
                         mode = DynamoModel.MakeConnectionCommand.Mode.BeginShiftReconnections;
                     }
+                    else if (Keyboard.Modifiers == ModifierKeys.Control)
+                    {
+                        // If the control key is held down, check if there is a need to duplicate connections
+                        mode = DynamoModel.MakeConnectionCommand.Mode.BeginDuplicateConnection;
+                    }
 
                     var command = new DynamoModel.MakeConnectionCommand(nodeId, portIndex, portModel.PortType, mode);
                     owningWorkspace.DynamoViewModel.ExecuteCommand(command);
@@ -819,7 +824,7 @@ internal bool HandlePortClicked(PortViewModel portViewModel)
                         }
                         else if (Keyboard.Modifiers == ModifierKeys.Control) // If the control key is held down
                         {
-                            mode = DynamoModel.MakeConnectionCommand.Mode.EndAndStartCtrlConnection;
+                            mode = DynamoModel.MakeConnectionCommand.Mode.BeginCreateConnections;
                             this.currentState = State.Connection; // Start a new connection
                             owningWorkspace.CurrentCursor = CursorLibrary.GetCursor(CursorSet.ArcSelect); // Reassign the cursor
                         }
Original file line number	Diff line number	Diff line change
`@@ -52,19 +52,19 @@ protected virtual void OpenFileImpl(OpenFileCommand command)`
`52`	`52`	`//ClipBoard.Clear();`
`53`	`53`	`}`
`54`	`54`
`55`		`- void RunCancelImpl(RunCancelCommand command)`
	`55`	`+ private void RunCancelImpl(RunCancelCommand command)`
`56`	`56`	`{`
`57`	`57`	`var model = CurrentWorkspace as HomeWorkspaceModel;`
`58`	`58`	`if (model != null)`
`59`	`59`	`model.Run();`
`60`	`60`	`}`
`61`	`61`
`62`		`- void ForceRunCancelImpl(ForceRunCancelCommand command)`
	`62`	`+ private void ForceRunCancelImpl(ForceRunCancelCommand command)`
`63`	`63`	`{`
`64`	`64`	`ForceRun();`
`65`	`65`	`}`
`66`	`66`
`67`		`- void CreateNodeImpl(CreateNodeCommand command)`
	`67`	`+ private void CreateNodeImpl(CreateNodeCommand command)`
`68`	`68`	`{`
`69`	`69`	`var node = GetNodeFromCommand(command);`
`70`	`70`	`if (node == null)`
`@@ -79,7 +79,7 @@ void CreateNodeImpl(CreateNodeCommand command)`
`79`	`79`	`CurrentWorkspace.RecordCreatedModel(node);`
`80`	`80`	`}`
`81`	`81`
`82`		`- void CreateAndConnectNodeImpl(CreateAndConnectNodeCommand command)`
	`82`	`+ private void CreateAndConnectNodeImpl(CreateAndConnectNodeCommand command)`
`83`	`83`	`{`
`84`	`84`	`using (CurrentWorkspace.UndoRecorder.BeginActionGroup())`
`85`	`85`	`{`
`@@ -124,7 +124,7 @@ void CreateAndConnectNodeImpl(CreateAndConnectNodeCommand command)`
`124`	`124`	`}`
`125`	`125`	`}`
`126`	`126`
`127`		`- NodeModel GetNodeFromCommand(CreateNodeCommand command)`
	`127`	`+ private NodeModel GetNodeFromCommand(CreateNodeCommand command)`
`128`	`128`	`{`
`129`	`129`	`if (command.Node != null)`
`130`	`130`	`{`
`@@ -202,7 +202,7 @@ private NodeModel CreateNodeFromNameOrType(Guid nodeId, string name)`
`202`	`202`	`return node;`
`203`	`203`	`}`
`204`	`204`
`205`		`- void CreateNoteImpl(CreateNoteCommand command)`
	`205`	`+ private void CreateNoteImpl(CreateNoteCommand command)`
`206`	`206`	`{`
`207`	`207`	`NoteModel noteModel = CurrentWorkspace.AddNote(`
`208`	`208`	`command.DefaultPosition,`
`@@ -214,14 +214,14 @@ void CreateNoteImpl(CreateNoteCommand command)`
`214`	`214`	`CurrentWorkspace.RecordCreatedModel(noteModel);`
`215`	`215`	`}`
`216`	`216`
`217`		`- void CreateAnnotationImpl(CreateAnnotationCommand command)`
	`217`	`+ private void CreateAnnotationImpl(CreateAnnotationCommand command)`
`218`	`218`	`{`
`219`	`219`	`AnnotationModel annotationModel = currentWorkspace.AddAnnotation(command.AnnotationText, command.ModelGuid);`
`220`	`220`
`221`	`221`	`CurrentWorkspace.RecordCreatedModel(annotationModel);`
`222`	`222`	`}`
`223`	`223`
`224`		`- void SelectModelImpl(SelectModelCommand command)`
	`224`	`+ private void SelectModelImpl(SelectModelCommand command)`
`225`	`225`	`{`
`226`	`226`	`// Empty ModelGuid means clear selection.`
`227`	`227`	`if (command.ModelGuid == Guid.Empty)`
`@@ -249,7 +249,7 @@ void SelectModelImpl(SelectModelCommand command)`
`249`	`249`	`}`
`250`	`250`	`}`
`251`	`251`
`252`		`- void MakeConnectionImpl(MakeConnectionCommand command)`
	`252`	`+ private void MakeConnectionImpl(MakeConnectionCommand command)`
`253`	`253`	`{`
`254`	`254`	`Guid nodeId = command.ModelGuid;`
`255`	`255`
`@@ -271,8 +271,17 @@ void MakeConnectionImpl(MakeConnectionCommand command)`
`271`	`271`	`EndShiftReconnections(nodeId, command.PortIndex, command.Type);`
`272`	`272`	`break;`
`273`	`273`
	`274`	`+ // TODO - can be removed in Dynamo 3.0 - DYN-1729`
`274`	`275`	`case MakeConnectionCommand.Mode.EndAndStartCtrlConnection:`
`275`		`- EndAndStartCtrlConnection(nodeId, command.PortIndex, command.Type);`
	`276`	`+ BeginDuplicateConnection(nodeId, command.PortIndex, command.Type);`
	`277`	`+ break;`
	`278`	`+`
	`279`	`+ case MakeConnectionCommand.Mode.BeginDuplicateConnection:`
	`280`	`+ BeginDuplicateConnection(nodeId, command.PortIndex, command.Type);`
	`281`	`+ break;`
	`282`	`+`
	`283`	`+ case MakeConnectionCommand.Mode.BeginCreateConnections:`
	`284`	`+ BeginCreateConnections(nodeId, command.PortIndex, command.Type);`
`276`	`285`	`break;`
`277`	`286`
`278`	`287`	`case MakeConnectionCommand.Mode.Cancel:`
`@@ -281,7 +290,7 @@ void MakeConnectionImpl(MakeConnectionCommand command)`
`281`	`290`	`}`
`282`	`291`	`}`
`283`	`292`
`284`		`- void BeginConnection(Guid nodeId, int portIndex, PortType portType)`
	`293`	`+ private void BeginConnection(Guid nodeId, int portIndex, PortType portType)`
`285`	`294`	`{`
`286`	`295`	`bool isInPort = portType == PortType.Input;`
`287`	`296`	`activeStartPorts = null;`
`@@ -315,7 +324,36 @@ void BeginConnection(Guid nodeId, int portIndex, PortType portType)`
`315`	`324`	`}`
`316`	`325`	`}`
`317`	`326`
`318`		`- void BeginShiftReconnections(Guid nodeId, int portIndex, PortType portType)`
	`327`	`+ private void BeginDuplicateConnection(Guid nodeId, int portIndex, PortType portType)`
	`328`	`+ {`
	`329`	`+ // If the port clicked is an output port, begin connection as per normal`
	`330`	`+ if (portType == PortType.Output)`
	`331`	`+ {`
	`332`	`+ BeginConnection(nodeId, portIndex, portType);`
	`333`	`+ return;`
	`334`	`+ }`
	`335`	`+`
	`336`	`+ // Otherwise, if the port is an input port, check if the port already has a connection.`
	`337`	`+ // If it does, duplicate the existing connection.`
	`338`	`+ var node = CurrentWorkspace.GetModelInternal(nodeId) as NodeModel;`
	`339`	`+ if (node == null)`
	`340`	`+ {`
	`341`	`+ return;`
	`342`	`+ }`
	`343`	`+`
	`344`	`+ var portModel = node.InPorts[portIndex];`
	`345`	`+ if (portModel.Connectors.Count == 0)`
	`346`	`+ {`
	`347`	`+ // If the port doesn't have any existing connections, begin connection as per normal`
	`348`	`+ BeginConnection(nodeId, portIndex, portType);`
	`349`	`+ return;`
	`350`	`+ }`
	`351`	`+ // Duplicate the existing connection`
	`352`	`+ activeStartPorts = new PortModel[] { portModel.Connectors[0].Start };`
	`353`	`+ firstStartPort = portModel.Connectors[0].Start;`
	`354`	`+ }`
	`355`	`+`
	`356`	`+ private void BeginShiftReconnections(Guid nodeId, int portIndex, PortType portType)`
`319`	`357`	`{`
`320`	`358`	`if (portType == PortType.Input) return; //only handle multiple connections when the port selected is an output port`
`321`	`359`	`var node = CurrentWorkspace.GetModelInternal(nodeId) as NodeModel;`
`@@ -343,7 +381,7 @@ void BeginShiftReconnections(Guid nodeId, int portIndex, PortType portType)`
`343`	`381`	`return;`
`344`	`382`	`}`
`345`	`383`
`346`		`- void EndConnection(Guid nodeId, int portIndex, PortType portType)`
	`384`	`+ private void EndConnection(Guid nodeId, int portIndex, PortType portType)`
`347`	`385`	`{`
`348`	`386`	`// Check if the node from which the connector starts is valid and has not been deleted`
`349`	`387`	`if (activeStartPorts == null \|\| activeStartPorts.Count() <= 0 \|\| activeStartPorts[0].Owner == null) return;`
`@@ -365,7 +403,7 @@ void EndConnection(Guid nodeId, int portIndex, PortType portType)`
`365`	`403`	`firstStartPort = null;`
`366`	`404`	`}`
`367`	`405`
`368`		`- void EndShiftReconnections(Guid nodeId, int portIndex, PortType portType)`
	`406`	`+ private void EndShiftReconnections(Guid nodeId, int portIndex, PortType portType)`
`369`	`407`	`{`
`370`	`408`	`if (portType == PortType.Input) return; //only handle multiple connections when the port selected is an output port`
`371`	`409`	`if (activeStartPorts == null \|\| activeStartPorts.Count() <= 0) return;`
`@@ -388,7 +426,7 @@ void EndShiftReconnections(Guid nodeId, int portIndex, PortType portType)`
`388`	`426`	`return;`
`389`	`427`	`}`
`390`	`428`
`391`		`- void EndAndStartCtrlConnection(Guid nodeId, int portIndex, PortType portType)`
	`429`	`+ private void BeginCreateConnections(Guid nodeId, int portIndex, PortType portType)`
`392`	`430`	`{`
`393`	`431`	`if (portType == PortType.Output) return; // Only handle ctrl connections if selected port is an input port`
`394`	`432`	`if (firstStartPort == null \|\| activeStartPorts == null \|\| activeStartPorts.Count() <= 0) return;`
`@@ -403,15 +441,15 @@ void EndAndStartCtrlConnection(Guid nodeId, int portIndex, PortType portType)`
`403`	`441`	`activeStartPorts = new PortModel[] { firstStartPort };`
`404`	`442`	`}`
`405`	`443`
`406`		`- void CancelConnections()`
	`444`	`+ private void CancelConnections()`
`407`	`445`	`{`
`408`	`446`	`CurrentWorkspace.DeleteSavedModels();`
`409`	`447`	`activeStartPorts = null;`
`410`	`448`	`firstStartPort = null;`
`411`	`449`	`return;`
`412`	`450`	`}`
`413`	`451`
`414`		`- static Dictionary<ModelBase, UndoRedoRecorder.UserAction> GetConnectorsToAddAndDelete(`
	`452`	`+ private static Dictionary<ModelBase, UndoRedoRecorder.UserAction> GetConnectorsToAddAndDelete(`
`415`	`453`	`PortModel endPort, PortModel startPort)`
`416`	`454`	`{`
`417`	`455`	`ConnectorModel connectorToRemove = null;`
`@@ -457,7 +495,7 @@ void CancelConnections()`
`457`	`495`	`return models;`
`458`	`496`	`}`
`459`	`497`
`460`		`- void DeleteModelImpl(DeleteModelCommand command)`
	`498`	`+ private void DeleteModelImpl(DeleteModelCommand command)`
`461`	`499`	`{`
`462`	`500`	`var modelsToDelete = new List<ModelBase>();`
`463`	`501`	`if (command.ModelGuid == Guid.Empty)`
`@@ -473,7 +511,7 @@ void DeleteModelImpl(DeleteModelCommand command)`
`473`	`511`	`DeleteModelInternal(modelsToDelete);`
`474`	`512`	`}`
`475`	`513`
`476`		`- void UngroupModelImpl(UngroupModelCommand command)`
	`514`	`+ private void UngroupModelImpl(UngroupModelCommand command)`
`477`	`515`	`{`
`478`	`516`	`if (command.ModelGuid == Guid.Empty)`
`479`	`517`	`return;`
`@@ -483,7 +521,7 @@ void UngroupModelImpl(UngroupModelCommand command)`
`483`	`521`	`UngroupModel(modelsToUngroup);`
`484`	`522`	`}`
`485`	`523`
`486`		`- void AddToGroupImpl(AddModelToGroupCommand command)`
	`524`	`+ private void AddToGroupImpl(AddModelToGroupCommand command)`
`487`	`525`	`{`
`488`	`526`	`if (command.ModelGuid == Guid.Empty)`
`489`	`527`	`return;`
`@@ -493,7 +531,7 @@ void AddToGroupImpl(AddModelToGroupCommand command)`
`493`	`531`	`AddToGroup(modelsToGroup);`
`494`	`532`	`}`
`495`	`533`
`496`		`- void UndoRedoImpl(UndoRedoCommand command)`
	`534`	`+ private void UndoRedoImpl(UndoRedoCommand command)`
`497`	`535`	`{`
`498`	`536`	`switch (command.CmdOperation)`
`499`	`537`	`{`
`@@ -506,15 +544,15 @@ void UndoRedoImpl(UndoRedoCommand command)`
`506`	`544`	`}`
`507`	`545`	`}`
`508`	`546`
`509`		`- void SendModelEventImpl(ModelEventCommand command)`
	`547`	`+ private void SendModelEventImpl(ModelEventCommand command)`
`510`	`548`	`{`
`511`	`549`	`foreach (var guid in command.ModelGuids)`
`512`	`550`	`{`
`513`	`551`	`CurrentWorkspace.SendModelEvent(guid, command.EventName, command.Value);`
`514`	`552`	`}`
`515`	`553`	`}`
`516`	`554`
`517`		`- void UpdateModelValueImpl(UpdateModelValueCommand command)`
	`555`	`+ private void UpdateModelValueImpl(UpdateModelValueCommand command)`
`518`	`556`	`{`
`519`	`557`	`WorkspaceModel targetWorkspace = CurrentWorkspace;`
`520`	`558`	`if (!command.WorkspaceGuid.Equals(Guid.Empty))`
`@@ -533,7 +571,7 @@ private void ConvertNodesToCodeImpl(ConvertNodesToCodeCommand command)`
`533`	`571`	`CurrentWorkspace.HasUnsavedChanges = true;`
`534`	`572`	`}`
`535`	`573`
`536`		`- void CreateCustomNodeImpl(CreateCustomNodeCommand command)`
	`574`	`+ private void CreateCustomNodeImpl(CreateCustomNodeCommand command)`
`537`	`575`	`{`
`538`	`576`	`var workspace = CustomNodeManager.CreateCustomNode(`
`539`	`577`	`command.Name,`
`@@ -545,19 +583,19 @@ void CreateCustomNodeImpl(CreateCustomNodeCommand command)`
`545`	`583`	`CurrentWorkspace = workspace;`
`546`	`584`	`}`
`547`	`585`
`548`		`- void SwitchWorkspaceImpl(SwitchTabCommand command)`
	`586`	`+ private void SwitchWorkspaceImpl(SwitchTabCommand command)`
`549`	`587`	`{`
`550`	`588`	`// We don't attempt to null-check here, we need it to fail fast.`
`551`	`589`	`CurrentWorkspace = Workspaces.ElementAt(command.WorkspaceModelIndex);`
`552`	`590`	`}`
`553`	`591`
`554`		`- void CreatePresetStateImpl(AddPresetCommand command)`
	`592`	`+ private void CreatePresetStateImpl(AddPresetCommand command)`
`555`	`593`	`{`
`556`	`594`	`var preset = this.CurrentWorkspace.AddPreset(command.PresetStateName,command.PresetStateDescription,command.ModelGuids);`
`557`	`595`
`558`	`596`	`CurrentWorkspace.RecordCreatedModel(preset);`
`559`	`597`	`}`
`560`		`- void SetWorkSpaceToStateImpl(ApplyPresetCommand command)`
	`598`	`+ private void SetWorkSpaceToStateImpl(ApplyPresetCommand command)`
`561`	`599`	`{`
`562`	`600`	`var workspaceToSet = this.Workspaces.Where(x => x.Guid == command.WorkSpaceID).First();`
`563`	`601`	`if (workspaceToSet == null)`
Original file line number	Diff line number	Diff line change
`@@ -225,7 +225,7 @@ internal void EndConnection(Guid nodeId, int portIndex, PortType portType)`
`225`	`225`	`this.SetActiveConnectors(null);`
`226`	`226`	`}`
`227`	`227`
`228`		`- internal void EndAndStartCtrlConnection(Guid nodeId, int portIndex, PortType portType)`
	`228`	`+ internal void BeginCreateConnections(Guid nodeId, int portIndex, PortType portType)`
`229`	`229`	`{`
`230`	`230`	`// Only handle ctrl connections if selected port is an input port`
`231`	`231`	`if (firstStartPort == null \|\| portType == PortType.Output) return;`
`@@ -790,6 +790,11 @@ internal bool HandlePortClicked(PortViewModel portViewModel)`
`790`	`790`	`multipleConnections = true;`
`791`	`791`	`mode = DynamoModel.MakeConnectionCommand.Mode.BeginShiftReconnections;`
`792`	`792`	`}`
	`793`	`+ else if (Keyboard.Modifiers == ModifierKeys.Control)`
	`794`	`+ {`
	`795`	`+ // If the control key is held down, check if there is a need to duplicate connections`
	`796`	`+ mode = DynamoModel.MakeConnectionCommand.Mode.BeginDuplicateConnection;`
	`797`	`+ }`
`793`	`798`
`794`	`799`	`var command = new DynamoModel.MakeConnectionCommand(nodeId, portIndex, portModel.PortType, mode);`
`795`	`800`	`owningWorkspace.DynamoViewModel.ExecuteCommand(command);`
`@@ -819,7 +824,7 @@ internal bool HandlePortClicked(PortViewModel portViewModel)`
`819`	`824`	`}`
`820`	`825`	`else if (Keyboard.Modifiers == ModifierKeys.Control) // If the control key is held down`
`821`	`826`	`{`
`822`		`- mode = DynamoModel.MakeConnectionCommand.Mode.EndAndStartCtrlConnection;`
	`827`	`+ mode = DynamoModel.MakeConnectionCommand.Mode.BeginCreateConnections;`
`823`	`828`	`this.currentState = State.Connection; // Start a new connection`
`824`	`829`	`owningWorkspace.CurrentCursor = CursorLibrary.GetCursor(CursorSet.ArcSelect); // Reassign the cursor`
`825`	`830`	`}`