diff options
| author | Simon Brandhof <simon.brandhof@gmail.com> | 2014-03-14 11:12:39 +0100 |
|---|---|---|
| committer | Simon Brandhof <simon.brandhof@gmail.com> | 2014-03-14 12:44:02 +0100 |
| commit | 4149bcb700a85338effe3d9efe94354467af7207 (patch) | |
| tree | 68d5fd67aa6b383217577a7b89e04550f36040fb /plugins | |
| parent | af03cde80a12ac335c3be04c24f5d099b2e84013 (diff) | |
| download | sonarqube-4149bcb700a85338effe3d9efe94354467af7207.tar.gz sonarqube-4149bcb700a85338effe3d9efe94354467af7207.zip | |
SONAR-4790 replace static factory FilePredicates by FileSystem#predicates()
Conflicts:
sonar-plugin-api/src/test/java/org/sonar/api/batch/fs/FilePredicatesTest.java
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/sonar-cpd-plugin/src/main/java/org/sonar/plugins/cpd/SonarBridgeEngine.java | 8 | ||||
| -rw-r--r-- | plugins/sonar-cpd-plugin/src/main/java/org/sonar/plugins/cpd/SonarEngine.java | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/plugins/sonar-cpd-plugin/src/main/java/org/sonar/plugins/cpd/SonarBridgeEngine.java b/plugins/sonar-cpd-plugin/src/main/java/org/sonar/plugins/cpd/SonarBridgeEngine.java index dec0a7d1b07..9fbe470b280 100644 --- a/plugins/sonar-cpd-plugin/src/main/java/org/sonar/plugins/cpd/SonarBridgeEngine.java +++ b/plugins/sonar-cpd-plugin/src/main/java/org/sonar/plugins/cpd/SonarBridgeEngine.java @@ -81,10 +81,10 @@ public class SonarBridgeEngine extends CpdEngine { public void analyse(Project project, String languageKey, SensorContext context) { String[] cpdExclusions = settings.getStringArray(CoreProperties.CPD_EXCLUSIONS); logExclusions(cpdExclusions, LOG); - List<InputFile> sourceFiles = Lists.newArrayList(fs.inputFiles(FilePredicates.and( - FilePredicates.hasType(InputFile.Type.MAIN), - FilePredicates.hasLanguage(languageKey), - FilePredicates.doesNotMatchPathPatterns(cpdExclusions) + List<InputFile> sourceFiles = Lists.newArrayList(fs.inputFiles(fs.predicates().and( + fs.predicates().hasType(InputFile.Type.MAIN), + fs.predicates().hasLanguage(languageKey), + fs.predicates().doesNotMatchPathPatterns(cpdExclusions) ))); if (sourceFiles.isEmpty()) { return; diff --git a/plugins/sonar-cpd-plugin/src/main/java/org/sonar/plugins/cpd/SonarEngine.java b/plugins/sonar-cpd-plugin/src/main/java/org/sonar/plugins/cpd/SonarEngine.java index f01761fbfb3..671cebb77da 100644 --- a/plugins/sonar-cpd-plugin/src/main/java/org/sonar/plugins/cpd/SonarEngine.java +++ b/plugins/sonar-cpd-plugin/src/main/java/org/sonar/plugins/cpd/SonarEngine.java @@ -93,10 +93,10 @@ public class SonarEngine extends CpdEngine { public void analyse(Project project, String languageKey, SensorContext context) { String[] cpdExclusions = settings.getStringArray(CoreProperties.CPD_EXCLUSIONS); logExclusions(cpdExclusions, LOG); - List<InputFile> sourceFiles = Lists.newArrayList(fs.inputFiles(FilePredicates.and( - FilePredicates.hasType(InputFile.Type.MAIN), - FilePredicates.hasLanguage(languageKey), - FilePredicates.doesNotMatchPathPatterns(cpdExclusions) + List<InputFile> sourceFiles = Lists.newArrayList(fs.inputFiles(fs.predicates().and( + fs.predicates().hasType(InputFile.Type.MAIN), + fs.predicates().hasLanguage(languageKey), + fs.predicates().doesNotMatchPathPatterns(cpdExclusions) ))); if (sourceFiles.isEmpty()) { return; |