From 495a006cacb2a62449b74474fc57ca2e1b37d85d Mon Sep 17 00:00:00 2001 From: TKlerx Date: Fri, 13 Mar 2015 10:01:51 +0100 Subject: Added default converters for Path, URI and URL --- .../com/beust/jcommander/internal/DefaultConverterFactory.java | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'src/main') diff --git a/src/main/java/com/beust/jcommander/internal/DefaultConverterFactory.java b/src/main/java/com/beust/jcommander/internal/DefaultConverterFactory.java index f98a111..2b8a10c 100644 --- a/src/main/java/com/beust/jcommander/internal/DefaultConverterFactory.java +++ b/src/main/java/com/beust/jcommander/internal/DefaultConverterFactory.java @@ -29,10 +29,16 @@ import com.beust.jcommander.converters.ISO8601DateConverter; import com.beust.jcommander.converters.IntegerConverter; import com.beust.jcommander.converters.LongConverter; import com.beust.jcommander.converters.StringConverter; +import com.beust.jcommander.converters.PathConverter; +import com.beust.jcommander.converters.URIConverter; +import com.beust.jcommander.converters.URLConverter; import java.io.File; import java.math.BigDecimal; import java.util.Date; +import java.net.URI; +import java.net.URL; +import java.nio.file.Path; import java.util.Map; public class DefaultConverterFactory implements IStringConverterFactory { @@ -57,6 +63,9 @@ public class DefaultConverterFactory implements IStringConverterFactory { m_classConverters.put(File.class, FileConverter.class); m_classConverters.put(BigDecimal.class, BigDecimalConverter.class); m_classConverters.put(Date.class, ISO8601DateConverter.class); + m_classConverters.put(Path.class, PathConverter.class); + m_classConverters.put(URI.class, URIConverter.class); + m_classConverters.put(URL.class, URLConverter.class); } public Class> getConverter(Class forType) { -- cgit v1.2.3 From cea0c1642b084285d232968a701086267b4b3ec3 Mon Sep 17 00:00:00 2001 From: TKlerx Date: Fri, 13 Mar 2015 10:08:50 +0100 Subject: Added enum constants to usage output --- src/main/java/com/beust/jcommander/JCommander.java | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'src/main') diff --git a/src/main/java/com/beust/jcommander/JCommander.java b/src/main/java/com/beust/jcommander/JCommander.java index 98f112e..2e049a1 100644 --- a/src/main/java/com/beust/jcommander/JCommander.java +++ b/src/main/java/com/beust/jcommander/JCommander.java @@ -1113,6 +1113,11 @@ public class JCommander { out.append("\n" + s(indentCount + 1)) .append("Default: " + (parameter.password()?"********" : displayedDef)); } + Class type = pd.getParameterized().getType(); + if(type.isEnum()){ + out.append("\n" + s(indentCount + 1)) + .append("Possible Values: " + EnumSet.allOf((Class) type)); + } out.append("\n"); } -- cgit v1.2.3