From 561c33f966fcc7290234077e3ecbde586e2885f0 Mon Sep 17 00:00:00 2001 From: Evgeny Mandrikov Date: Thu, 20 Jan 2011 17:45:08 +0300 Subject: [PATCH] SONAR-2126: Rename ProjectDirectory to FileSystemDirectory --- .../org/sonar/batch/bootstrap/ProjectDefinition.java | 8 ++++---- ...irectory.java => DefaultFileSystemDirectory.java} | 12 ++++++------ ...rojectDirectory.java => FileSystemDirectory.java} | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) rename sonar-plugin-api/src/main/java/org/sonar/api/resources/{DefaultProjectDirectory.java => DefaultFileSystemDirectory.java} (84%) rename sonar-plugin-api/src/main/java/org/sonar/api/resources/{ProjectDirectory.java => FileSystemDirectory.java} (98%) diff --git a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/ProjectDefinition.java b/sonar-batch/src/main/java/org/sonar/batch/bootstrap/ProjectDefinition.java index 578ca9e4a16..d12dc1a9af1 100644 --- a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/ProjectDefinition.java +++ b/sonar-batch/src/main/java/org/sonar/batch/bootstrap/ProjectDefinition.java @@ -2,7 +2,7 @@ package org.sonar.batch.bootstrap; import com.google.common.collect.Lists; import org.apache.commons.configuration.Configuration; -import org.sonar.api.resources.ProjectDirectory; +import org.sonar.api.resources.FileSystemDirectory; import java.io.File; import java.util.List; @@ -20,7 +20,7 @@ public class ProjectDefinition { private File workDir; private File basedir; - private List dirs = Lists.newArrayList(); + private List dirs = Lists.newArrayList(); private ProjectDefinition parent; private List modules; @@ -63,11 +63,11 @@ public class ProjectDefinition { /** * @return project directories. */ - public List getDirs() { + public List getDirs() { return dirs; } - public void addDir(ProjectDirectory dir) { + public void addDir(FileSystemDirectory dir) { this.dirs.add(dir); } diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/resources/DefaultProjectDirectory.java b/sonar-plugin-api/src/main/java/org/sonar/api/resources/DefaultFileSystemDirectory.java similarity index 84% rename from sonar-plugin-api/src/main/java/org/sonar/api/resources/DefaultProjectDirectory.java rename to sonar-plugin-api/src/main/java/org/sonar/api/resources/DefaultFileSystemDirectory.java index bdf4ba1a6bb..44461fb4772 100644 --- a/sonar-plugin-api/src/main/java/org/sonar/api/resources/DefaultProjectDirectory.java +++ b/sonar-plugin-api/src/main/java/org/sonar/api/resources/DefaultFileSystemDirectory.java @@ -25,7 +25,7 @@ import java.io.File; import java.util.Collections; import java.util.List; -public class DefaultProjectDirectory implements ProjectDirectory { +public class DefaultFileSystemDirectory implements FileSystemDirectory { private String nature; private File location; @@ -37,7 +37,7 @@ public class DefaultProjectDirectory implements ProjectDirectory { return nature; } - public DefaultProjectDirectory setNature(String nature) { + public DefaultFileSystemDirectory setNature(String nature) { this.nature = nature; return this; } @@ -46,7 +46,7 @@ public class DefaultProjectDirectory implements ProjectDirectory { return location; } - public DefaultProjectDirectory setLocation(File location) { + public DefaultFileSystemDirectory setLocation(File location) { this.location = location; return this; } @@ -55,7 +55,7 @@ public class DefaultProjectDirectory implements ProjectDirectory { return outputLocation; } - public DefaultProjectDirectory setOutputLocation(File outputLocation) { + public DefaultFileSystemDirectory setOutputLocation(File outputLocation) { this.outputLocation = outputLocation; return this; } @@ -70,7 +70,7 @@ public class DefaultProjectDirectory implements ProjectDirectory { /** * @param pattern Ant-like inclusion pattern */ - public DefaultProjectDirectory addInclusionPattern(String pattern) { + public DefaultFileSystemDirectory addInclusionPattern(String pattern) { if (inclusionPatterns == null) { inclusionPatterns = Lists.newArrayList(); } @@ -88,7 +88,7 @@ public class DefaultProjectDirectory implements ProjectDirectory { /** * @param pattern Ant-like exclusion pattern */ - public DefaultProjectDirectory addExclusionPattern(String pattern) { + public DefaultFileSystemDirectory addExclusionPattern(String pattern) { if (exclusionPatterns == null) { exclusionPatterns = Lists.newArrayList(); } diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/resources/ProjectDirectory.java b/sonar-plugin-api/src/main/java/org/sonar/api/resources/FileSystemDirectory.java similarity index 98% rename from sonar-plugin-api/src/main/java/org/sonar/api/resources/ProjectDirectory.java rename to sonar-plugin-api/src/main/java/org/sonar/api/resources/FileSystemDirectory.java index 4b645a553ce..17c8298836c 100644 --- a/sonar-plugin-api/src/main/java/org/sonar/api/resources/ProjectDirectory.java +++ b/sonar-plugin-api/src/main/java/org/sonar/api/resources/FileSystemDirectory.java @@ -48,7 +48,7 @@ import java.util.List; * * @since 2.6 */ -public interface ProjectDirectory { +public interface FileSystemDirectory { /** * @return nature of underlying files. -- 2.39.5