phoedos/pmd
1
1 Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pmd: rework CPD CLI to use jcommander

Browse Source
This commit is contained in:
Romain PELISSE committed 2012-12-21 20:17:47 +01:00
1 parent 6de8aa5e06
commit 5dc9cbc324
5 files changed
+411 -276
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

pmd/src/main/java/net/sourceforge/pmd/cpd/CPD.java
+6 -82
View File
@@ -10,7 +10,6 @@ import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Properties;
import java.util.Set;
import java.util.TreeMap;
@@ -18,12 +17,8 @@ import net.sourceforge.pmd.util.FileFinder;
public class CPD {
private static final int MISSING_FILES = 1;
private static final int MISSING_ARGS = 2;
private static final int DUPLICATE_CODE_FOUND = 4;
private CPDConfiguration configuration;
private Map<String, SourceCode> source = new TreeMap<String, SourceCode>();
private CPDListener listener = new CPDNullListener();
private Tokens tokens = new Tokens();
@@ -39,11 +34,7 @@ public class CPD {
public void go() {
TokenEntry.clearImages();
matchAlgorithm = new MatchAlgorithm(
source, tokens,
configuration.minimumTileSize(),
listener
);
matchAlgorithm = new MatchAlgorithm(source, tokens,configuration.getMinimumTileSize(),listener);
matchAlgorithm.findMatches();
}
@@ -82,7 +73,7 @@ public class CPD {
private void add(int fileCount, File file) throws IOException {
if (configuration.skipDuplicates()) {
if (configuration.isSkipDuplicates()) {
// TODO refactor this thing into a separate class
String signature = file.getName() + '_' + file.length();
if (current.contains(signature)) {
@@ -103,74 +94,7 @@ public class CPD {
source.put(sourceCode.getFileName(), sourceCode);
}
private static void setSystemProperties(String[] args) {
boolean ignoreLiterals = CPDConfiguration.findBooleanSwitch(args, "--ignore-literals");
boolean ignoreIdentifiers = CPDConfiguration.findBooleanSwitch(args, "--ignore-identifiers");
boolean ignoreAnnotations = CPDConfiguration.findBooleanSwitch(args, "--ignore-annotations");
Properties properties = System.getProperties();
if (ignoreLiterals) {
properties.setProperty(JavaTokenizer.IGNORE_LITERALS, "true");
}
if (ignoreIdentifiers) {
properties.setProperty(JavaTokenizer.IGNORE_IDENTIFIERS, "true");
}
if (ignoreAnnotations) {
properties.setProperty(JavaTokenizer.IGNORE_ANNOTATIONS, "true");
}
System.setProperties(properties);
}
public static void main(String[] args) {
if (args.length == 0) {
showUsage();
System.exit(MISSING_ARGS);
}
try {
CPDConfiguration config = new CPDConfiguration(args);
// Pass extra parameters as System properties to allow language
// implementation to retrieve their associate values...
setSystemProperties(args);
CPD cpd = new CPD(config);
/* FIXME: Improve this !!! */
boolean missingFiles = true;
for (int position = 0; position < args.length; position++) {
if (args[position].equals("--files")) {
cpd.addRecursively(args[position + 1]);
if ( missingFiles ) {
missingFiles = false;
}
}
}
if ( missingFiles ) {
System.out.println("No " + "--files" + " value passed in");
showUsage();
System.exit(MISSING_FILES);
}
cpd.go();
if (cpd.getMatches().hasNext()) {
System.out.println(config.renderer().render(cpd.getMatches()));
System.exit(DUPLICATE_CODE_FOUND);
}
} catch (Exception e) {
e.printStackTrace();
}
}
public static void showUsage() {
System.out.println("Usage:");
System.out.println(" java net.sourceforge.pmd.cpd.CPD --minimum-tokens xxx --files xxx [--language xxx] [--encoding xxx] [--format (xml|text|csv|vs)] [--skip-duplicate-files] ");
System.out.println("i.e: ");
System.out.println(" java net.sourceforge.pmd.cpd.CPD --minimum-tokens 100 --files c:\\jdk14\\src\\java ");
System.out.println("or: ");
System.out.println(" java net.sourceforge.pmd.cpd.CPD --minimum-tokens 100 --files /path/to/c/code --language c ");
System.out.println("or: ");
System.out.println(" java net.sourceforge.pmd.cpd.CPD --minimum-tokens 100 --encoding UTF-16LE --files /path/to/java/code --format xml");
}
public static void main(String[] args) {
CPDCommandLineInterface.main(args);
}
}
pmd/src/main/java/net/sourceforge/pmd/cpd/CPDCommandLineInterface.java
+93
View File
@@ -0,0 +1,93 @@
/**
* BSD-style license; for more info see http://pmd.sourceforge.net/license.html
*/
package net.sourceforge.pmd.cpd;
import java.io.IOException;
import java.util.List;
import com.beust.jcommander.JCommander;
import com.beust.jcommander.ParameterException;
public class CPDCommandLineInterface {
private static final int DUPLICATE_CODE_FOUND = 4;
public static final String NO_EXIT_AFTER_RUN = "net.sourceforge.pmd.cli.noExit";
public static final String STATUS_CODE_PROPERTY = "net.sourceforge.pmd.cli.status";
private static final String progName = "cpd";
public static void setStatusCodeOrExit(int status) {
if (isExitAfterRunSet())
System.exit(status);
else
setStatusCode(status);
}
private static boolean isExitAfterRunSet() {
return (System.getenv(NO_EXIT_AFTER_RUN) == null ? false : true);
}
private static void setStatusCode(int statusCode) {
System.setProperty(STATUS_CODE_PROPERTY, Integer.toString(statusCode));
}
public static void main(String[] args) {
CPDConfiguration arguments = new CPDConfiguration();
JCommander jcommander = new JCommander(arguments);
jcommander.setProgramName(progName);
try {
jcommander.parse(args);
if (arguments.isHelp()) {
jcommander.usage();
// System.out.println(buildUsageText());
setStatusCodeOrExit(0);
}
} catch (ParameterException e) {
jcommander.usage();
System.out.println(buildUsageText());
System.out.println(e.getMessage());
// setStatusCodeOrExit(ERROR_STATUS);
}
arguments.postContruct();
// Pass extra parameters as System properties to allow language
// implementation to retrieve their associate values...
CPDConfiguration.setSystemProperties(arguments);
CPD cpd = new CPD(arguments);
addSourcesFilesToCPD(arguments.getFiles(),cpd);
cpd.go();
if (cpd.getMatches().hasNext()) {
System.out.println(arguments.getRenderer().render(cpd.getMatches()));
System.exit(DUPLICATE_CODE_FOUND);
}
}
private static void addSourcesFilesToCPD(List<String> files, CPD cpd) {
try {
for (String file : files)
cpd.addRecursively(file);
} catch (IOException e) {
throw new IllegalStateException(e);
}
}
private static final char EOL = '\n';
public static String buildUsageText() {
String helpText = "Usage:";
helpText += " java net.sourceforge.pmd.cpd.CPD --minimum-tokens xxx --files xxx [--language xxx] [--encoding xxx] [--format (xml|text|csv|vs)] [--skip-duplicate-files] " + EOL;
helpText += "i.e: " + EOL;
helpText += " java net.sourceforge.pmd.cpd.CPD --minimum-tokens 100 --files c:\\jdk14\\src\\java " + EOL;
helpText += "or: " + EOL;
helpText += " java net.sourceforge.pmd.cpd.CPD --minimum-tokens 100 --files /path/to/c/code --language c " + EOL;
helpText += "or: " + EOL;
helpText += " java net.sourceforge.pmd.cpd.CPD --minimum-tokens 100 --encoding UTF-16LE --files /path/to/java/code --format xml" + EOL;
return helpText;
}
}
pmd/src/main/java/net/sourceforge/pmd/cpd/CPDConfiguration.java
+209 -96
View File
File diff suppressed because it is too large. Load diff
pmd/src/main/java/net/sourceforge/pmd/cpd/CPDTask.java
+5 -3
View File
@@ -57,9 +57,11 @@ public class CPDTask extends Task {
log("Starting run, minimumTokenCount is " + minimumTokenCount, Project.MSG_INFO);
log("Tokenizing files", Project.MSG_INFO);
CPDConfiguration config = new CPDConfiguration(
minimumTokenCount, createLanguage(), encoding
);
CPDConfiguration config = new CPDConfiguration();
config.setMinimumTileSize(minimumTokenCount);
config.setLanguage(createLanguage());
config.setEncoding(encoding);
CPD cpd = new CPD(config);
tokenizeFiles(cpd);
pmd/src/main/java/net/sourceforge/pmd/cpd/GUI.java
+98 -95
View File
File diff suppressed because it is too large. Load diff