more work on the CLI instructions

ansell · ansell · commit 9fe075df1976 · 2015-03-01T14:50:45.000+11:00
diff --git a/tools/src/main/java/com/github/jsonldjava/tools/Playground.java b/tools/src/main/java/com/github/jsonldjava/tools/Playground.java
@@ -95,7 +95,8 @@ public RDFFormat convert(String arg0) {
                                 if(formats.containsKey(formatName)) {
                                    return formats.get(formatName);
                                 }
-                                throw new ValueConversionException("Format was not known: " + arg0);
+                                throw new ValueConversionException("Format was not known: " + arg0 + " (Valid values are: " + formats + ")"
+                                        );
                             }
 
                             @Override
@@ -109,7 +110,7 @@ public Class<RDFFormat> valueType() {
                             }
                         })
                         .describedAs(
-                                "The output file format to use. Defaults to nquads.");
+                                "The output file format to use. Defaults to nquads. Valid values are: " + formats);
         
         final OptionSpec<String> processingOption = parser.accepts("process")
                 .withRequiredArg()
@@ -121,7 +122,8 @@ public String convert(String value) {
                         if(getProcessingOptions().contains(value.toLowerCase())) {
                             return value.toLowerCase();
                         }
-                        throw new ValueConversionException("Processing option was not known: " + value);
+                        throw new ValueConversionException("Processing option was not known: " + value 
+                                + " (Valid values are: " + getProcessingOptions() + ")");
                     }
 
                     @Override
@@ -134,7 +136,7 @@ public String valuePattern() {
                         return null;
                     }
                 })
-                .describedAs("The processing to perform. One of: " + getProcessingOptions().toString());
+                .describedAs("The processing to perform. Valid values are: " + getProcessingOptions().toString());
         
         final OptionSpec<String> outputForm = parser.accepts("outputForm")
                 .withOptionalArg()
@@ -146,7 +148,7 @@ public String convert(String value) {
                         if(outputForms.contains(value.toLowerCase())) {
                             return value.toLowerCase();
                         }
-                        throw new ValueConversionException("Output form was not known: " + value);
+                        throw new ValueConversionException("Output form was not known: " + value + " (Valid values are: " + outputForms + ")");
                     }
 
                     @Override
@@ -159,7 +161,7 @@ public Class<String> valueType() {
                         return String.class;
                     }
                 })
-                .describedAs("The way to output the results from fromRDF. Defaults to expanded.");
+                .describedAs("The way to output the results from fromRDF. Defaults to expanded. Valid values are: " + outputForms);
 
         OptionSet options = null;
         

Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,8 @@ public RDFFormat convert(String arg0) {`
`95`	`95`	`if(formats.containsKey(formatName)) {`
`96`	`96`	`return formats.get(formatName);`
`97`	`97`	`}`
`98`		`- throw new ValueConversionException("Format was not known: " + arg0);`
	`98`	`+ throw new ValueConversionException("Format was not known: " + arg0 + " (Valid values are: " + formats + ")"`
	`99`	`+ );`
`99`	`100`	`}`
`100`	`101`
`101`	`102`	`@Override`
`@@ -109,7 +110,7 @@ public Class<RDFFormat> valueType() {`
`109`	`110`	`}`
`110`	`111`	`})`
`111`	`112`	`.describedAs(`
`112`		`- "The output file format to use. Defaults to nquads.");`
	`113`	`+ "The output file format to use. Defaults to nquads. Valid values are: " + formats);`
`113`	`114`
`114`	`115`	`final OptionSpec<String> processingOption = parser.accepts("process")`
`115`	`116`	`.withRequiredArg()`
`@@ -121,7 +122,8 @@ public String convert(String value) {`
`121`	`122`	`if(getProcessingOptions().contains(value.toLowerCase())) {`
`122`	`123`	`return value.toLowerCase();`
`123`	`124`	`}`
`124`		`- throw new ValueConversionException("Processing option was not known: " + value);`
	`125`	`+ throw new ValueConversionException("Processing option was not known: " + value`
	`126`	`+ + " (Valid values are: " + getProcessingOptions() + ")");`
`125`	`127`	`}`
`126`	`128`
`127`	`129`	`@Override`
`@@ -134,7 +136,7 @@ public String valuePattern() {`
`134`	`136`	`return null;`
`135`	`137`	`}`
`136`	`138`	`})`
`137`		`- .describedAs("The processing to perform. One of: " + getProcessingOptions().toString());`
	`139`	`+ .describedAs("The processing to perform. Valid values are: " + getProcessingOptions().toString());`
`138`	`140`
`139`	`141`	`final OptionSpec<String> outputForm = parser.accepts("outputForm")`
`140`	`142`	`.withOptionalArg()`
`@@ -146,7 +148,7 @@ public String convert(String value) {`
`146`	`148`	`if(outputForms.contains(value.toLowerCase())) {`
`147`	`149`	`return value.toLowerCase();`
`148`	`150`	`}`
`149`		`- throw new ValueConversionException("Output form was not known: " + value);`
	`151`	`+ throw new ValueConversionException("Output form was not known: " + value + " (Valid values are: " + outputForms + ")");`
`150`	`152`	`}`
`151`	`153`
`152`	`154`	`@Override`
`@@ -159,7 +161,7 @@ public Class<String> valueType() {`
`159`	`161`	`return String.class;`
`160`	`162`	`}`
`161`	`163`	`})`
`162`		`- .describedAs("The way to output the results from fromRDF. Defaults to expanded.");`
	`164`	`+ .describedAs("The way to output the results from fromRDF. Defaults to expanded. Valid values are: " + outputForms);`
`163`	`165`
`164`	`166`	`OptionSet options = null;`
`165`	`167`