| Chunk |
|---|
| Conflicting content |
|---|
CPDConfiguration.setSystemProperties(arguments);
CPD cpd = new CPD(arguments);
<<<<<<< HEAD
try {
// Add files
if (null != arguments.getFiles() && !arguments.getFiles().isEmpty()) {
addSourcesFilesToCPD(arguments.getFiles(), arguments.filenameFilter(), cpd, !arguments.isNonRecursive());
}
// Add Database URIS
if (null != arguments.getURI() && !"".equals(arguments.getURI())) {
addSourceURIToCPD(arguments.getURI(), cpd);
}
cpd.go();
if (cpd.getMatches().hasNext()) {
System.out.println(arguments.getRenderer().render(cpd.getMatches()));
if (arguments.isFailOnViolation()) {
setStatusCodeOrExit(DUPLICATE_CODE_FOUND);
} else {
setStatusCodeOrExit(0);
=======
//Add files
if ( null != arguments.getFiles() && ! arguments.getFiles().isEmpty() )
{
addSourcesFilesToCPD(arguments.getFiles(), cpd, !arguments.isNonRecursive());
>>>>>>> 8c4d307ddd1f271d32572672fb22493da97e7e4f
}
} else {
setStatusCodeOrExit(0); |
| Solution content |
|---|
try {
CPDConfiguration.setSystemProperties(arguments);
CPD cpd = new CPD(arguments);
// Add files
if (null != arguments.getFiles() && !arguments.getFiles().isEmpty()) {
addSourcesFilesToCPD(arguments.getFiles(), cpd, !arguments.isNonRecursive());
}
// Add Database URIS
if (null != arguments.getURI() && !"".equals(arguments.getURI())) {
addSourceURIToCPD(arguments.getURI(), cpd);
}
cpd.go();
if (cpd.getMatches().hasNext()) {
System.out.println(arguments.getRenderer().render(cpd.getMatches()));
if (arguments.isFailOnViolation()) {
setStatusCodeOrExit(DUPLICATE_CODE_FOUND);
} else {
setStatusCodeOrExit(0);
}
} else {
setStatusCodeOrExit(0); |
| File |
|---|
| CPDCommandLineInterface.java |
| Developer's decision |
|---|
| Combination |
| Kind of conflict |
|---|
| Comment |
| If statement |
| Method invocation |
| Try statement |