diff --git a/baksmali/src/main/java/org/jf/baksmali/AnalysisArguments.java b/baksmali/src/main/java/org/jf/baksmali/AnalysisArguments.java index cdcb15e8..008ec460 100644 --- a/baksmali/src/main/java/org/jf/baksmali/AnalysisArguments.java +++ b/baksmali/src/main/java/org/jf/baksmali/AnalysisArguments.java @@ -33,7 +33,7 @@ package org.jf.baksmali; import com.beust.jcommander.Parameter; import com.google.common.collect.Lists; -import org.jf.util.jcommander.CommaColonParameterSplitter; +import org.jf.util.jcommander.ColonParameterSplitter; import org.jf.util.jcommander.ExtendedParameter; import java.util.List; @@ -45,18 +45,18 @@ public class AnalysisArguments { public int apiLevel = 15; @Parameter(names = {"-b", "--bootclasspath", "--bcp"}, - description = "A comma/colon separated list of the jar/oat files to include in the " + + description = "A colon separated list of the jar/oat files to include in the " + "bootclasspath when analyzing the dex file. If not specified, baksmali will attempt to choose an " + "appropriate default. This is analogous to Android's BOOTCLASSPATH environment variable.", - splitter = CommaColonParameterSplitter.class) + splitter = ColonParameterSplitter.class) @ExtendedParameter(argumentNames = "classpath") public List bootClassPath = null; @Parameter(names = {"-c", "--classpath", "--cp"}, - description = "A comma/colon separated list of additional jar/oat files to include in the classpath " + + description = "A colon separated list of additional jar/oat files to include in the classpath " + "when analyzing the dex file. These will be added to the classpath after any bootclasspath " + "entries.", - splitter = CommaColonParameterSplitter.class) + splitter = ColonParameterSplitter.class) @ExtendedParameter(argumentNames = "classpath") public List classPath = Lists.newArrayList(); diff --git a/util/src/main/java/org/jf/util/jcommander/CommaColonParameterSplitter.java b/util/src/main/java/org/jf/util/jcommander/ColonParameterSplitter.java similarity index 92% rename from util/src/main/java/org/jf/util/jcommander/CommaColonParameterSplitter.java rename to util/src/main/java/org/jf/util/jcommander/ColonParameterSplitter.java index b0b9e804..eb628aff 100644 --- a/util/src/main/java/org/jf/util/jcommander/CommaColonParameterSplitter.java +++ b/util/src/main/java/org/jf/util/jcommander/ColonParameterSplitter.java @@ -37,11 +37,11 @@ import java.util.Arrays; import java.util.List; /** - * A JCommander parameter splitter that splits a parameter value by either commas or colons + * A JCommander parameter splitter that splits a parameter value by colon */ -public class CommaColonParameterSplitter implements IParameterSplitter { +public class ColonParameterSplitter implements IParameterSplitter { @Override public List split(String value) { - return Arrays.asList(value.split(":|,")); + return Arrays.asList(value.split(":")); } }