diff options
author | Cedric Beust <cedric@beust.com> | 2015-03-13 06:52:10 -0700 |
---|---|---|
committer | Cedric Beust <cedric@beust.com> | 2015-03-13 06:52:10 -0700 |
commit | d9c0accf47cd03ad0694b4f41a72b522462a23ac (patch) | |
tree | ea2a8ef40be4acac95888ed7462c1d28085c4a11 | |
parent | 78c4431a617cc9d3c9561ef1b5f111febf15f720 (diff) | |
parent | cea0c1642b084285d232968a701086267b4b3ec3 (diff) | |
download | platform_external_jcommander-d9c0accf47cd03ad0694b4f41a72b522462a23ac.tar.gz platform_external_jcommander-d9c0accf47cd03ad0694b4f41a72b522462a23ac.tar.bz2 platform_external_jcommander-d9c0accf47cd03ad0694b4f41a72b522462a23ac.zip |
Merge pull request #219 from TKlerx/master
Added default converters for Path, URI and URL
-rw-r--r-- | src/main/java/com/beust/jcommander/JCommander.java | 5 | ||||
-rw-r--r-- | src/main/java/com/beust/jcommander/internal/DefaultConverterFactory.java | 9 |
2 files changed, 14 insertions, 0 deletions
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<? extends Enum>) type)); + } out.append("\n"); } 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<? extends IStringConverter<?>> getConverter(Class forType) { |