Name refactoring

gsscoder · gsscoder · commit 9e531e399367 · 2015-07-30T06:43:00.000+02:00
diff --git a/src/CommandLine/ParserResult.cs b/src/CommandLine/ParserResult.cs
@@ -8,23 +8,23 @@ namespace CommandLine
 {
     sealed class TypeInfo
     {
-        private readonly Type single;
-        private readonly IEnumerable<Type> multiple; 
+        private readonly Type current;
+        private readonly IEnumerable<Type> choices; 
 
-        private TypeInfo(Type single, IEnumerable<Type> multiple)
+        private TypeInfo(Type current, IEnumerable<Type> choices)
         {
-            this.single = single;
-            this.multiple = multiple;
+            this.current = current;
+            this.choices = choices;
         }
 
-        public Type Single
+        public Type Current
         {
-            get { return single; }
+            get { return this.current; }
         }
 
-        public IEnumerable<Type> Multiple
+        public IEnumerable<Type> Choices
         {
-            get { return multiple; }
+            get { return this.choices; }
         }
 
         public static TypeInfo Create(Type single)
diff --git a/src/CommandLine/Text/HelpText.cs b/src/CommandLine/Text/HelpText.cs
@@ -223,10 +223,10 @@ public static HelpText AutoBuild<T>(
             ReflectionHelper.GetAttribute<AssemblyUsageAttribute>()
                 .Do(usage => usage.AddToHelpText(auto, true));
 
-            if ((verbsIndex && parserResult.TypeInfo.Multiple.Any()) || errors.Any(e => e.Tag == ErrorType.NoVerbSelectedError))
+            if ((verbsIndex && parserResult.TypeInfo.Choices.Any()) || errors.Any(e => e.Tag == ErrorType.NoVerbSelectedError))
             {
                 auto.AddDashesToOption = false;
-                auto.AddVerbs(parserResult.TypeInfo.Multiple.ToArray());
+                auto.AddVerbs(parserResult.TypeInfo.Choices.ToArray());
             }
             else
                 auto.AddOptions(parserResult);
@@ -335,7 +335,7 @@ public HelpText AddOptions<T>(ParserResult<T> result)
             if (result == null) throw new ArgumentNullException("result");
 
             return AddOptionsImpl(
-                GetSpecificationsFromType(result.TypeInfo.Single),
+                GetSpecificationsFromType(result.TypeInfo.Current),
                 SentenceBuilder.RequiredWord(),
                 MaximumDisplayWidth);
         }
@@ -368,7 +368,7 @@ public HelpText AddOptions<T>(int maximumLength, ParserResult<T> result)
             if (result == null) throw new ArgumentNullException("result");
 
             return AddOptionsImpl(
-                GetSpecificationsFromType(result.TypeInfo.Single),
+                GetSpecificationsFromType(result.TypeInfo.Current),
                 SentenceBuilder.RequiredWord(),
                 maximumLength);
         }
@@ -426,12 +426,12 @@ public static string RenderParsingErrorsText<T>(
                 .ToString();
         }
 
-        public static string RenderUsageText<T>(ParserResult<T> parserResult)
-        {
-            if (parserResult == null) throw new ArgumentNullException("parserResult");
+        //public static string RenderUsageText<T>(ParserResult<T> parserResult)
+        //{
+        //    if (parserResult == null) throw new ArgumentNullException("parserResult");
 
-
-        }
+        //    var examples = GetUsageFromType()
+        //}
 
         /// <summary>
         /// Returns the help screen as a <see cref="System.String"/>.

Original file line number	Diff line number	Diff line change
`@@ -8,23 +8,23 @@ namespace CommandLine`
`8`	`8`	`{`
`9`	`9`	`sealed class TypeInfo`
`10`	`10`	`{`
`11`		`- private readonly Type single;`
`12`		`- private readonly IEnumerable<Type> multiple;`
	`11`	`+ private readonly Type current;`
	`12`	`+ private readonly IEnumerable<Type> choices;`
`13`	`13`
`14`		`- private TypeInfo(Type single, IEnumerable<Type> multiple)`
	`14`	`+ private TypeInfo(Type current, IEnumerable<Type> choices)`
`15`	`15`	`{`
`16`		`- this.single = single;`
`17`		`- this.multiple = multiple;`
	`16`	`+ this.current = current;`
	`17`	`+ this.choices = choices;`
`18`	`18`	`}`
`19`	`19`
`20`		`- public Type Single`
	`20`	`+ public Type Current`
`21`	`21`	`{`
`22`		`- get { return single; }`
	`22`	`+ get { return this.current; }`
`23`	`23`	`}`
`24`	`24`
`25`		`- public IEnumerable<Type> Multiple`
	`25`	`+ public IEnumerable<Type> Choices`
`26`	`26`	`{`
`27`		`- get { return multiple; }`
	`27`	`+ get { return this.choices; }`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`public static TypeInfo Create(Type single)`