Skip to content

Commit

Permalink
R# cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
@Hosch250
Hosch250 committed May 18, 2015
1 parent 2e42d87 commit d3e4ac0
Show file tree
Hide file tree
Showing 3 changed files with 39 additions and 39 deletions.
2 changes: 1 addition & 1 deletion RetailCoder.VBE/UI/Refactorings/ReorderParameters/ReorderParametersDialog.Designer.cs
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

34 changes: 17 additions & 17 deletions RetailCoder.VBE/UI/Refactorings/ReorderParameters/ReorderParametersDialog.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@ public partial class ReorderParametersDialog : Form, IReorderParametersView
{
public List<Parameter> Parameters { get; set; }
private Parameter _selectedItem;
private Rectangle _dragBoxFromMouseDown;
Point _startPoint;
private int _newRowIndex;

public ReorderParametersDialog()
{
Expand Down Expand Up @@ -41,36 +44,33 @@ private void MethodParametersGrid_SelectionChanged(object sender, EventArgs e)
SelectionChanged();
}

private Rectangle dragBoxFromMouseDown;
Point startPoint;
private int newRowIndex;
private void MethodParametersGrid_MouseMove(object sender, MouseEventArgs e)
{
if ((e.Button & MouseButtons.Left) == MouseButtons.Left)
{
if (dragBoxFromMouseDown != Rectangle.Empty && !dragBoxFromMouseDown.Contains(e.X, e.Y))
if (_dragBoxFromMouseDown != Rectangle.Empty && !_dragBoxFromMouseDown.Contains(e.X, e.Y))
{
DragDropEffects dropEffect = MethodParametersGrid.DoDragDrop(
MethodParametersGrid.Rows[newRowIndex],
var dropEffect = MethodParametersGrid.DoDragDrop(
MethodParametersGrid.Rows[_newRowIndex],
DragDropEffects.Move);
}
}
}

private void MethodParametersGrid_MouseDown(object sender, MouseEventArgs e)
{
newRowIndex = MethodParametersGrid.HitTest(e.X, e.Y).RowIndex;
_newRowIndex = MethodParametersGrid.HitTest(e.X, e.Y).RowIndex;

if (newRowIndex == -1)
if (_newRowIndex == -1)
{
dragBoxFromMouseDown = Rectangle.Empty;
_dragBoxFromMouseDown = Rectangle.Empty;
return;
}

startPoint = new Point(e.X, e.Y);
_startPoint = new Point(e.X, e.Y);

Size dragSize = SystemInformation.DragSize;
dragBoxFromMouseDown = new Rectangle(new Point(e.X - (dragSize.Width / 2), e.Y - (dragSize.Height / 2)), dragSize);
var dragSize = SystemInformation.DragSize;
_dragBoxFromMouseDown = new Rectangle(new Point(e.X - (dragSize.Width / 2), e.Y - (dragSize.Height / 2)), dragSize);
}

private void MethodParametersGrid_DragOver(object sender, DragEventArgs e)
Expand All @@ -80,15 +80,15 @@ private void MethodParametersGrid_DragOver(object sender, DragEventArgs e)

private void MethodParametersGrid_DragDrop(object sender, DragEventArgs e)
{
Point clientPoint = MethodParametersGrid.PointToClient(new Point(e.X, e.Y));
var clientPoint = MethodParametersGrid.PointToClient(new Point(e.X, e.Y));

if (e.Effect == DragDropEffects.Move && newRowIndex != -1)
if (e.Effect == DragDropEffects.Move && _newRowIndex != -1)
{
var rowIndexOfItemUnderMouse = MethodParametersGrid.HitTest(clientPoint.X, clientPoint.Y).RowIndex;

if (rowIndexOfItemUnderMouse < 0)
{
if (clientPoint.Y < startPoint.Y)
if (clientPoint.Y < _startPoint.Y)
{
rowIndexOfItemUnderMouse = 0;
}
Expand All @@ -98,8 +98,8 @@ private void MethodParametersGrid_DragDrop(object sender, DragEventArgs e)
}
}

var tmp = Parameters.ElementAt(newRowIndex);
Parameters.RemoveAt(newRowIndex);
var tmp = Parameters.ElementAt(_newRowIndex);
Parameters.RemoveAt(_newRowIndex);
Parameters.Insert(rowIndexOfItemUnderMouse, tmp);
ReselectParameter();
}
Expand Down
42 changes: 21 additions & 21 deletions RetailCoder.VBE/UI/Refactorings/ReorderParameters/ReorderParametersPresenter.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,23 +72,8 @@ private void OnOkButtonClicked(object sender, EventArgs e)
}
}

AdjustSignature();
AdjustSignatures();
AdjustReferences();

foreach (var withEvents in _declarations.Items.Where(item => item.IsWithEvents && item.AsTypeName == _view.Target.ComponentName))
{
foreach (var reference in _declarations.FindEventProcedures(withEvents))
{
AdjustSignature(reference);
}
}

var interfaceImplementations = _declarations.FindInterfaceImplementationMembers()
.Where(item => item.Project.Equals(_view.Target.Project) && item.IdentifierName.Contains(_view.Target.ComponentName));
foreach (var interfaceImplentation in interfaceImplementations)
{
AdjustSignature(interfaceImplentation);
}
}

private void AdjustReferences()
Expand Down Expand Up @@ -163,7 +148,7 @@ private void RewriteCall(IdentifierReference reference, VBAParser.ArgsCallContex
}
}

private void AdjustSignature()
private void AdjustSignatures()
{
var proc = (dynamic)_view.Target.Context;
var argList = (VBAParser.ArgListContext)proc.argList();
Expand All @@ -178,7 +163,7 @@ private void AdjustSignature()

if (setter != null)
{
AdjustSignature(setter);
AdjustSignatures(setter);
}

var letter = _declarations.Items.FirstOrDefault(item => item.ParentScope == _view.Target.ParentScope &&
Expand All @@ -187,14 +172,29 @@ private void AdjustSignature()

if (letter != null)
{
AdjustSignature(letter);
AdjustSignatures(letter);
}
}

RewriteSignature(argList, module);

foreach (var withEvents in _declarations.Items.Where(item => item.IsWithEvents && item.AsTypeName == _view.Target.ComponentName))
{
foreach (var reference in _declarations.FindEventProcedures(withEvents))
{
AdjustSignatures(reference);
}
}

var interfaceImplementations = _declarations.FindInterfaceImplementationMembers()
.Where(item => item.Project.Equals(_view.Target.Project) && item.IdentifierName.Contains(_view.Target.ComponentName));
foreach (var interfaceImplentation in interfaceImplementations)
{
AdjustSignatures(interfaceImplentation);
}
}

private void AdjustSignature(IdentifierReference reference)
private void AdjustSignatures(IdentifierReference reference)
{
var proc = (dynamic)reference.Context.Parent;
var module = reference.QualifiedModuleName.Component.CodeModule;
Expand All @@ -203,7 +203,7 @@ private void AdjustSignature(IdentifierReference reference)
RewriteSignature(argList, module);
}

private void AdjustSignature(Declaration reference)
private void AdjustSignatures(Declaration reference)
{
var proc = (dynamic)reference.Context.Parent;
var module = reference.QualifiedName.QualifiedModuleName.Component.CodeModule;
Expand Down

0 comments on commit d3e4ac0

Please sign in to comment.