Skip to content

Cleanup DataGridViewBand #665

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zsd4yr merged 4 commits into from
Apr 15, 2019
Merged

Cleanup DataGridViewBand #665

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fa7b6b8
Cleanip DataGridViewBand and update param names
hughbe Apr 2, 2019
65054c4
Rename parameters and fix some more param names
hughbe Apr 2, 2019
f1e55eb
Address PR feedback across winforms
hughbe Apr 4, 2019
78a4506
PR feedback
hughbe Apr 15, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/System.Windows.Forms/src/System/Windows/Forms/ButtonBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -406,7 +406,7 @@ public int ImageIndex {
}
set {
if (value < -1) {
throw new ArgumentOutOfRangeException(nameof(ImageIndex), string.Format(SR.InvalidLowBoundArgumentEx, "ImageIndex", (value).ToString(CultureInfo.CurrentCulture), (-1).ToString(CultureInfo.CurrentCulture)));
throw new ArgumentOutOfRangeException(nameof(value), value, string.Format(SR.InvalidLowBoundArgumentEx, nameof(ImageIndex), value, -1));
}
if (imageIndex.Index != value) {
if (value != -1) {
Expand Down
4 changes: 2 additions & 2 deletions src/System.Windows.Forms/src/System/Windows/Forms/ButtonInternal/ButtonBaseAdapter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -979,7 +979,7 @@ private int xCompose(Composition composition, int checkSize, int imageSize, int
case Composition.AllCombined:
return Math.Max(Math.Max(checkSize, imageSize), textSize);
default:
Debug.Fail(string.Format(SR.InvalidArgument, "composition", composition.ToString()));
Debug.Fail(string.Format(SR.InvalidArgument, nameof(composition), composition.ToString()));
return -7107;
}
}
Expand All @@ -1006,7 +1006,7 @@ private int xDecompose(Composition composition, int checkSize, int imageSize, in
case Composition.AllCombined:
return proposedSize;
default:
Debug.Fail(string.Format(SR.InvalidArgument, "composition", composition.ToString()));
Debug.Fail(string.Format(SR.InvalidArgument, nameof(composition), composition.ToString()));
return -7109;
}
}
Expand Down
4 changes: 2 additions & 2 deletions src/System.Windows.Forms/src/System/Windows/Forms/CheckedListBox.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -504,7 +504,7 @@ protected override ListBox.ObjectCollection CreateItemCollection() {
public CheckState GetItemCheckState(int index) {

if (index < 0 || index >= Items.Count)
throw new ArgumentOutOfRangeException(nameof(index), string.Format(SR.InvalidArgument, "index", (index).ToString(CultureInfo.CurrentCulture)));
throw new ArgumentOutOfRangeException(nameof(index), index, string.Format(SR.InvalidArgument, nameof(index), index));
return CheckedItems.GetCheckedState(index);
}

Expand Down Expand Up @@ -958,7 +958,7 @@ protected override void RefreshItems() {
/// </devdoc>
public void SetItemCheckState(int index, CheckState value) {
if (index < 0 || index >= Items.Count) {
throw new ArgumentOutOfRangeException(nameof(index), string.Format(SR.InvalidArgument, "index", (index).ToString(CultureInfo.CurrentCulture)));
throw new ArgumentOutOfRangeException(nameof(index), index, string.Format(SR.InvalidArgument, nameof(index), index));
}
// valid values are 0-2 inclusive.
if (!ClientUtils.IsEnumValid(value,(int)value, (int)CheckState.Unchecked, (int)CheckState.Indeterminate)){
Expand Down
4 changes: 2 additions & 2 deletions src/System.Windows.Forms/src/System/Windows/Forms/Clipboard.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,11 +111,11 @@ public static void SetDataObject(object data, bool copy, int retryTimes, int ret
}

if (retryTimes < 0) {
throw new ArgumentOutOfRangeException(nameof(retryTimes), string.Format(SR.InvalidLowBoundArgumentEx, "retryTimes", retryTimes.ToString(CultureInfo.CurrentCulture), (0).ToString(CultureInfo.CurrentCulture)));
throw new ArgumentOutOfRangeException(nameof(retryTimes), retryTimes, string.Format(SR.InvalidLowBoundArgumentEx, nameof(retryTimes), retryTimes, 0));
}

if (retryDelay < 0) {
throw new ArgumentOutOfRangeException(nameof(retryDelay), string.Format(SR.InvalidLowBoundArgumentEx, "retryDelay", retryDelay.ToString(CultureInfo.CurrentCulture), (0).ToString(CultureInfo.CurrentCulture)));
throw new ArgumentOutOfRangeException(nameof(retryDelay), retryDelay, string.Format(SR.InvalidLowBoundArgumentEx, nameof(retryDelay), retryDelay, 0));
}


Expand Down
2 changes: 1 addition & 1 deletion src/System.Windows.Forms/src/System/Windows/Forms/ColumnHeader.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ public int ImageIndex {
}
set {
if (value < -1) {
throw new ArgumentOutOfRangeException(nameof(ImageIndex), string.Format(SR.InvalidLowBoundArgumentEx, "ImageIndex", (value).ToString(CultureInfo.CurrentCulture), (-1).ToString(CultureInfo.CurrentCulture)));
throw new ArgumentOutOfRangeException(nameof(value), value, string.Format(SR.InvalidLowBoundArgumentEx, nameof(ImageIndex), value, -1));
}

if (imageIndexer.Index != value) {
Expand Down
28 changes: 14 additions & 14 deletions src/System.Windows.Forms/src/System/Windows/Forms/ComboBox.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -517,7 +517,7 @@ public int DropDownWidth {

set {
if (value < 1) {
throw new ArgumentOutOfRangeException(nameof(DropDownWidth), string.Format(SR.InvalidArgument, "DropDownWidth", (value).ToString(CultureInfo.CurrentCulture)));
throw new ArgumentOutOfRangeException(nameof(value), value, string.Format(SR.InvalidArgument, nameof(DropDownWidth), value));
}
if (Properties.GetInteger(PropDropDownWidth) != value) {
Properties.SetInteger(PropDropDownWidth, value);
Expand Down Expand Up @@ -552,7 +552,7 @@ public int DropDownHeight {
}
set {
if (value < 1) {
throw new ArgumentOutOfRangeException(nameof(DropDownHeight), string.Format(SR.InvalidArgument, "DropDownHeight", (value).ToString(CultureInfo.CurrentCulture)));
throw new ArgumentOutOfRangeException(nameof(value), value, string.Format(SR.InvalidArgument, nameof(DropDownHeight), value));
}
if (Properties.GetInteger(PropDropDownHeight) != value) {
Properties.SetInteger(PropDropDownHeight, value);
Expand Down Expand Up @@ -722,7 +722,7 @@ public int ItemHeight {

set {
if (value < 1) {
throw new ArgumentOutOfRangeException(nameof(ItemHeight), string.Format(SR.InvalidArgument, "ItemHeight", (value).ToString(CultureInfo.CurrentCulture)));
throw new ArgumentOutOfRangeException(nameof(value), value, string.Format(SR.InvalidArgument, nameof(ItemHeight), value));
}

ResetHeightCache();
Expand Down Expand Up @@ -788,7 +788,7 @@ public int MaxDropDownItems {
}
set {
if (value < 1 || value > 100) {
throw new ArgumentOutOfRangeException(nameof(MaxDropDownItems), string.Format(SR.InvalidBoundArgument, "MaxDropDownItems", (value).ToString(CultureInfo.CurrentCulture), (1).ToString(CultureInfo.CurrentCulture), (100).ToString(CultureInfo.CurrentCulture)));
throw new ArgumentOutOfRangeException(nameof(value), value, string.Format(SR.InvalidBoundArgument, nameof(MaxDropDownItems), value, 1, 100));
}
maxDropDownItems = (short)value;
}
Expand Down Expand Up @@ -1019,7 +1019,7 @@ public override int SelectedIndex {
}

if (value < -1 || value >= itemCount) {
throw new ArgumentOutOfRangeException(nameof(SelectedIndex), string.Format(SR.InvalidArgument, "SelectedIndex", (value).ToString(CultureInfo.CurrentCulture)));
throw new ArgumentOutOfRangeException(nameof(value), value, string.Format(SR.InvalidArgument, nameof(SelectedIndex), value));
}

if (IsHandleCreated) {
Expand Down Expand Up @@ -1146,7 +1146,7 @@ public int SelectionStart {
}
set {
if (value < 0) {
throw new ArgumentOutOfRangeException(nameof(SelectionStart), string.Format(SR.InvalidArgument, "SelectionStart", value.ToString(CultureInfo.CurrentCulture)));
throw new ArgumentOutOfRangeException(nameof(value), value, string.Format(SR.InvalidArgument, nameof(SelectionStart), value));
}
Select(value, SelectionLength);
}
Expand Down Expand Up @@ -2115,7 +2115,7 @@ public int GetItemHeight(int index) {
}

if (index < 0 || itemsCollection == null || index >= itemsCollection.Count) {
throw new ArgumentOutOfRangeException(nameof(index), string.Format(SR.InvalidArgument, "index", (index).ToString(CultureInfo.CurrentCulture)));
throw new ArgumentOutOfRangeException(nameof(index), index, string.Format(SR.InvalidArgument, nameof(index), index));
}

if (IsHandleCreated) {
Expand Down Expand Up @@ -3187,14 +3187,14 @@ private void SetAutoComplete(bool reset, bool recreate) {
/// </devdoc>
public void Select(int start, int length) {
if (start < 0) {
throw new ArgumentOutOfRangeException(nameof(start), string.Format(SR.InvalidArgument, "start", start.ToString(CultureInfo.CurrentCulture)));
throw new ArgumentOutOfRangeException(nameof(start), start, string.Format(SR.InvalidArgument, nameof(start), start));
}
// the Length can be negative to support Selecting in the "reverse" direction..
int end = start + length;

// but end cannot be negative... this means Length is far negative...
if (end < 0) {
throw new ArgumentOutOfRangeException(nameof(length), string.Format(SR.InvalidArgument, "length", length.ToString(CultureInfo.CurrentCulture)));
throw new ArgumentOutOfRangeException(nameof(length), length, string.Format(SR.InvalidArgument, nameof(length), length));
}

SendMessage(NativeMethods.CB_SETEDITSEL, 0, NativeMethods.Util.MAKELPARAM(start, end));
Expand Down Expand Up @@ -3291,7 +3291,7 @@ internal override bool ShouldSerializeText() {
public override string ToString() {

string s = base.ToString();
return s + ", Items.Count: " + ((itemsCollection == null) ? (0).ToString(CultureInfo.CurrentCulture) : itemsCollection.Count.ToString(CultureInfo.CurrentCulture));
return s + ", Items.Count: " + ((itemsCollection == null) ? "0" : itemsCollection.Count.ToString(CultureInfo.CurrentCulture));
}

/// <devdoc>
Expand Down Expand Up @@ -4122,7 +4122,7 @@ internal void AddRangeInternal(IList items) {
public virtual object this[int index] {
get {
if (index < 0 || index >= InnerList.Count) {
throw new ArgumentOutOfRangeException(nameof(index), string.Format(SR.InvalidArgument, "index", (index).ToString(CultureInfo.CurrentCulture)));
throw new ArgumentOutOfRangeException(nameof(index), index, string.Format(SR.InvalidArgument, nameof(index), index));
}

return InnerList[index];
Expand Down Expand Up @@ -4210,7 +4210,7 @@ public void Insert(int index, object item) {
}

if (index < 0 || index > InnerList.Count) {
throw new ArgumentOutOfRangeException(nameof(index), string.Format(SR.InvalidArgument, "index", (index).ToString(CultureInfo.CurrentCulture)));
throw new ArgumentOutOfRangeException(nameof(index), index, string.Format(SR.InvalidArgument, nameof(index), index));
}

// If the combo box is sorted, then nust treat this like an add
Expand Down Expand Up @@ -4252,7 +4252,7 @@ public void RemoveAt(int index) {
owner.CheckNoDataSource();

if (index < 0 || index >= InnerList.Count) {
throw new ArgumentOutOfRangeException(nameof(index), string.Format(SR.InvalidArgument, "index", (index).ToString(CultureInfo.CurrentCulture)));
throw new ArgumentOutOfRangeException(nameof(index), index, string.Format(SR.InvalidArgument, nameof(index), index));
}

if (owner.IsHandleCreated) {
Expand Down Expand Up @@ -4289,7 +4289,7 @@ internal void SetItemInternal(int index, object value) {
}

if (index < 0 || index >= InnerList.Count) {
throw new ArgumentOutOfRangeException(nameof(index), string.Format(SR.InvalidArgument, "index", (index).ToString(CultureInfo.CurrentCulture)));
throw new ArgumentOutOfRangeException(nameof(index), index, string.Format(SR.InvalidArgument, nameof(index), index));
}

InnerList[index] = value;
Expand Down
2 changes: 1 addition & 1 deletion src/System.Windows.Forms/src/System/Windows/Forms/Control.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3811,7 +3811,7 @@ public int TabIndex {
}
set {
if (value < 0) {
throw new ArgumentOutOfRangeException(nameof(TabIndex), string.Format(SR.InvalidLowBoundArgumentEx, "TabIndex", value.ToString(CultureInfo.CurrentCulture), (0).ToString(CultureInfo.CurrentCulture)));
throw new ArgumentOutOfRangeException(nameof(value), value, string.Format(SR.InvalidLowBoundArgumentEx, nameof(TabIndex), value, 0));
}

if (tabIndex != value) {
Expand Down
17 changes: 9 additions & 8 deletions src/System.Windows.Forms/src/System/Windows/Forms/DataGridView.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1765,7 +1765,7 @@ public int ColumnCount
{
if (value < 0)
{
throw new ArgumentOutOfRangeException(nameof(ColumnCount), string.Format(SR.InvalidLowBoundArgumentEx, "ColumnCount", value.ToString(CultureInfo.CurrentCulture), (0).ToString(CultureInfo.CurrentCulture)));
throw new ArgumentOutOfRangeException(nameof(value), value, string.Format(SR.InvalidLowBoundArgumentEx, nameof(ColumnCount), value, 0));
}
if (this.DataSource != null)
{
Expand Down Expand Up @@ -1989,11 +1989,11 @@ public int ColumnHeadersHeight
{
if (value < minimumColumnHeadersHeight)
{
throw new ArgumentOutOfRangeException(nameof(ColumnHeadersHeight), string.Format(SR.InvalidLowBoundArgumentEx, "ColumnHeadersHeight", (value).ToString(CultureInfo.CurrentCulture), (minimumColumnHeadersHeight).ToString(CultureInfo.CurrentCulture)));
throw new ArgumentOutOfRangeException(nameof(value), string.Format(SR.InvalidLowBoundArgumentEx, nameof(ColumnHeadersHeight), value, minimumColumnHeadersHeight));
}
if (value > maxHeadersThickness)
{
throw new ArgumentOutOfRangeException(nameof(ColumnHeadersHeight), string.Format(SR.InvalidHighBoundArgumentEx, "ColumnHeadersHeight", (value).ToString(CultureInfo.CurrentCulture), (maxHeadersThickness).ToString(CultureInfo.CurrentCulture)));
throw new ArgumentOutOfRangeException(nameof(value), string.Format(SR.InvalidHighBoundArgumentEx, nameof(ColumnHeadersHeight), value, maxHeadersThickness));
}
if (this.ColumnHeadersHeightSizeMode == DataGridViewColumnHeadersHeightSizeMode.AutoSize)
{
Expand Down Expand Up @@ -3492,7 +3492,7 @@ public int HorizontalScrollingOffset
// int widthNotVisible = this.Columns.GetColumnsWidth(DataGridViewElementStates.Visible) - this.layout.Data.Width;
if (value < 0)
{
throw new ArgumentOutOfRangeException(nameof(HorizontalScrollingOffset), string.Format(SR.InvalidLowBoundArgumentEx, "HorizontalScrollingOffset", (value).ToString(CultureInfo.CurrentCulture), (0).ToString(CultureInfo.CurrentCulture)));
throw new ArgumentOutOfRangeException(nameof(value), value, string.Format(SR.InvalidLowBoundArgumentEx, nameof(HorizontalScrollingOffset), value, 0));
}
// Intentionally ignoring the out of range situation.
// else if (value > widthNotVisible && widthNotVisible > 0)
Expand Down Expand Up @@ -4021,14 +4021,14 @@ public int RowCount
{
if (value < 1)
{
throw new ArgumentOutOfRangeException(nameof(RowCount), string.Format(SR.InvalidLowBoundArgumentEx, "RowCount", value.ToString(CultureInfo.CurrentCulture), (1).ToString(CultureInfo.CurrentCulture)));
throw new ArgumentOutOfRangeException(nameof(value), value, string.Format(SR.InvalidLowBoundArgumentEx, nameof(RowCount), value, 1));
}
}
else
{
if (value < 0)
{
throw new ArgumentOutOfRangeException(nameof(RowCount), string.Format(SR.InvalidLowBoundArgumentEx, "RowCount", value.ToString(CultureInfo.CurrentCulture), (0).ToString(CultureInfo.CurrentCulture)));
throw new ArgumentOutOfRangeException(nameof(value), value, string.Format(SR.InvalidLowBoundArgumentEx, nameof(RowCount), value, 0));
}
}
if (this.DataSource != null)
Expand Down Expand Up @@ -4279,12 +4279,13 @@ public int RowHeadersWidth
{
if (value < minimumRowHeadersWidth)
{
throw new ArgumentOutOfRangeException(nameof(RowHeadersWidth), string.Format(SR.InvalidLowBoundArgumentEx, "RowHeadersWidth", (value).ToString(CultureInfo.CurrentCulture), (minimumRowHeadersWidth).ToString(CultureInfo.CurrentCulture)));
throw new ArgumentOutOfRangeException(nameof(value), value, string.Format(SR.InvalidLowBoundArgumentEx, nameof(RowHeadersWidth), value, minimumRowHeadersWidth));
}
if (value > maxHeadersThickness)
{
throw new ArgumentOutOfRangeException(nameof(RowHeadersWidth), string.Format(SR.InvalidHighBoundArgumentEx, "RowHeadersWidth", (value).ToString(CultureInfo.CurrentCulture), (maxHeadersThickness).ToString(CultureInfo.CurrentCulture)));
throw new ArgumentOutOfRangeException(nameof(value), value, string.Format(SR.InvalidHighBoundArgumentEx, nameof(RowHeadersWidth), value, maxHeadersThickness));
}

if (this.RowHeadersWidthSizeMode != DataGridViewRowHeadersWidthSizeMode.EnableResizing &&
this.RowHeadersWidthSizeMode != DataGridViewRowHeadersWidthSizeMode.DisableResizing)
{
Expand Down
Loading