Works on interface members

retailcoder · May 18, 2015 · 53040c6 · 53040c6
1 parent 4c8350a
commit 53040c6
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 4 deletions.
diff --git a/RetailCoder.VBE/UI/Refactorings/ReorderParameters/ReorderParametersPresenter.cs b/RetailCoder.VBE/UI/Refactorings/ReorderParameters/ReorderParametersPresenter.cs
@@ -65,7 +65,8 @@ private void OnOkButtonClicked(object sender, EventArgs e)
                 {
                     if (!_view.Parameters.ElementAt(index).IsOptional)
                     {
-                        MessageBox.Show("Optional parameters must be specified at the end of the parameter list.", "Reorder Parameters", MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
+                        var message = "Optional parameters must be specified at the end of the parameter list.";
+                        MessageBox.Show(message, RubberduckUI.ReorderParamsDialog_TitleText, MessageBoxButtons.OK, MessageBoxIcon.Error);
                         return;
                     }
                 }
@@ -81,6 +82,16 @@ private void OnOkButtonClicked(object sender, EventArgs e)
                     AdjustSignature(reference);
                 }
             }
+
+            if (_view.Target.DeclarationType == DeclarationType.Procedure)
+            {
+                foreach (var interfaceImplentation in
+                    _declarations.FindInterfaceImplementationMembers()
+                                 .Where(item => item.Project.Equals(_view.Target.Project) && item.IdentifierName.Contains(_view.Target.ComponentName)))
+                {
+                    AdjustSignature(interfaceImplentation);
+                }
+            }
         }
 
         private void AdjustReferences()
@@ -307,9 +318,9 @@ private void PromptIfTargetImplementsInterface(ref Declaration target)
             }
 
             var interfaceMember = _declarations.FindInterfaceMember(interfaceImplementation);
-            var message = string.Format(RubberduckUI.RenamePresenter_TargetIsInterfaceMemberImplementation, target.IdentifierName, interfaceMember.ComponentName, interfaceMember.IdentifierName);
+            var message = string.Format(RubberduckUI.ReorderPresenter_TargetIsInterfaceMemberImplementation, target.IdentifierName, interfaceMember.ComponentName, interfaceMember.IdentifierName);
 
-            var confirm = MessageBox.Show(message, RubberduckUI.RenameDialog_TitleText, MessageBoxButtons.YesNo, MessageBoxIcon.Exclamation);
+            var confirm = MessageBox.Show(message, RubberduckUI.ReorderParamsDialog_TitleText, MessageBoxButtons.YesNo, MessageBoxIcon.Exclamation);
             if (confirm == DialogResult.No)
             {
                 target = null;

diff --git a/RetailCoder.VBE/UI/RubberduckUI.Designer.cs b/RetailCoder.VBE/UI/RubberduckUI.Designer.cs
diff --git a/RetailCoder.VBE/UI/RubberduckUI.resx b/RetailCoder.VBE/UI/RubberduckUI.resx
@@ -255,4 +255,8 @@
   <data name="ReorderParamsDialog_TitleText" xml:space="preserve">
     <value>Reorder parameters</value>
   </data>
+  <data name="ReorderPresenter_TargetIsInterfaceMemberImplementation" xml:space="preserve">
+    <value>Method '{0}' implements '{1}.{2}'. Reorder interface member parameters?</value>
+    <comment>0: Selected target; 1: Interface name; 2: Interface member name</comment>
+  </data>
 </root>