Volian/SourceCode
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Change ‘Count’ to ‘MaxIndex’ for ‘vlnIndexedFormatList’

Browse Source 
Rename ‘Count’ to ‘MaxIndex’ in ‘vlnIndexedFormatList’ to clarify what variable is, fix plural of box (boxes)
This commit is contained in:
Kathy Ruffing
2015-07-20 14:29:34 +00:00
parent a98f4998da
commit 6c6f895834
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs
View File

@@ -5562,7 +5562,7 @@ namespace VEPROMS.CSLA.Library
{
get
{
return(_TransTypeList == null || _TransTypeList.Count==0)? _TransTypeList = new TransTypeList(SelectNodes("TransTypeData/TransTypes"),MyFormat): _TransTypeList;
return(_TransTypeList == null || _TransTypeList.MaxIndex==0)? _TransTypeList = new TransTypeList(SelectNodes("TransTypeData/TransTypes"),MyFormat): _TransTypeList;
}
}
public TransData(XmlNode xmlNode) : base(xmlNode) { }

7
PROMS/VEPROMS.CSLA.Library/Format/vlnFormat.cs
View File

@@ -600,7 +600,7 @@ namespace VEPROMS.CSLA.Library
return null;
}
}
public new int Count
public int MaxIndex
{
get
{
@@ -613,7 +613,7 @@ namespace VEPROMS.CSLA.Library
vlnIndexedFormatList<T> parent = InheritedList; //Check Inherited Value
if (parent != null)
{
int max2 = parent.Count;
int max2 = parent.MaxIndex;
if (max2 > max)
return max2;
}
@@ -780,6 +780,7 @@ namespace VEPROMS.CSLA.Library
{
if (name.EndsWith("y")) return name.Substring(0, name.Length - 1) + "ies";
if (name.EndsWith("ss")) return name + "es";
if (name.EndsWith("x")) return name + "es";
else return name + "s";
}
public override object ConvertTo(ITypeDescriptorContext context, System.Globalization.CultureInfo culture, object value, Type destType)
@@ -787,7 +788,7 @@ namespace VEPROMS.CSLA.Library
if (destType == typeof(string) && value is T)
{
// Return department and department role separated by comma.
return ((T)value).Count.ToString() + " " + (((T)value).Count == 1 ? typeof(C).Name : Plural(typeof(C).Name));
return ((T)value).MaxIndex.ToString() + " " + (((T)value).MaxIndex == 1 ? typeof(C).Name : Plural(typeof(C).Name));
}
return base.ConvertTo(context, culture, value, destType);
}