From ba05cbc35820e64d70642615525377c9aa1b3069 Mon Sep 17 00:00:00 2001 From: Julien HENRY Date: Thu, 19 Jun 2014 14:50:08 +0200 Subject: [PATCH] SONAR-5389 Move Language --- .../api/batch/languages/package-info.java | 21 ------------------- .../DeprecatedLanguagesReferential.java | 2 -- .../{api => }/batch/languages/Language.java | 2 +- .../batch/languages/LanguagesReferential.java | 2 -- .../org/sonar/batch/rule/ModuleQProfiles.java | 4 ++-- .../sonar/batch/scan/LanguageVerifier.java | 2 +- .../scan/filesystem/LanguageDetection.java | 2 +- 7 files changed, 5 insertions(+), 30 deletions(-) delete mode 100644 sonar-batch/src/main/java/org/sonar/api/batch/languages/package-info.java rename sonar-batch/src/main/java/org/sonar/{api => }/batch/languages/Language.java (97%) diff --git a/sonar-batch/src/main/java/org/sonar/api/batch/languages/package-info.java b/sonar-batch/src/main/java/org/sonar/api/batch/languages/package-info.java deleted file mode 100644 index 40c79e60c99..00000000000 --- a/sonar-batch/src/main/java/org/sonar/api/batch/languages/package-info.java +++ /dev/null @@ -1,21 +0,0 @@ -/* - * SonarQube, open source software quality management tool. - * Copyright (C) 2008-2014 SonarSource - * mailto:contact AT sonarsource DOT com - * - * SonarQube is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 3 of the License, or (at your option) any later version. - * - * SonarQube is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ -@javax.annotation.ParametersAreNonnullByDefault -package org.sonar.api.batch.languages; \ No newline at end of file diff --git a/sonar-batch/src/main/java/org/sonar/batch/languages/DeprecatedLanguagesReferential.java b/sonar-batch/src/main/java/org/sonar/batch/languages/DeprecatedLanguagesReferential.java index ce8f60d9057..23591b15aec 100644 --- a/sonar-batch/src/main/java/org/sonar/batch/languages/DeprecatedLanguagesReferential.java +++ b/sonar-batch/src/main/java/org/sonar/batch/languages/DeprecatedLanguagesReferential.java @@ -19,8 +19,6 @@ */ package org.sonar.batch.languages; -import org.sonar.api.batch.languages.Language; - import org.sonar.api.resources.Languages; import javax.annotation.CheckForNull; diff --git a/sonar-batch/src/main/java/org/sonar/api/batch/languages/Language.java b/sonar-batch/src/main/java/org/sonar/batch/languages/Language.java similarity index 97% rename from sonar-batch/src/main/java/org/sonar/api/batch/languages/Language.java rename to sonar-batch/src/main/java/org/sonar/batch/languages/Language.java index 726c95152cc..daeb7d50626 100644 --- a/sonar-batch/src/main/java/org/sonar/api/batch/languages/Language.java +++ b/sonar-batch/src/main/java/org/sonar/batch/languages/Language.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.api.batch.languages; +package org.sonar.batch.languages; import java.util.Arrays; import java.util.Collection; diff --git a/sonar-batch/src/main/java/org/sonar/batch/languages/LanguagesReferential.java b/sonar-batch/src/main/java/org/sonar/batch/languages/LanguagesReferential.java index 761a03945c2..da1596c2c10 100644 --- a/sonar-batch/src/main/java/org/sonar/batch/languages/LanguagesReferential.java +++ b/sonar-batch/src/main/java/org/sonar/batch/languages/LanguagesReferential.java @@ -19,8 +19,6 @@ */ package org.sonar.batch.languages; -import org.sonar.api.batch.languages.Language; - import org.sonar.api.BatchComponent; import javax.annotation.CheckForNull; diff --git a/sonar-batch/src/main/java/org/sonar/batch/rule/ModuleQProfiles.java b/sonar-batch/src/main/java/org/sonar/batch/rule/ModuleQProfiles.java index 6abaa3e4ef3..c26b7767700 100644 --- a/sonar-batch/src/main/java/org/sonar/batch/rule/ModuleQProfiles.java +++ b/sonar-batch/src/main/java/org/sonar/batch/rule/ModuleQProfiles.java @@ -19,9 +19,9 @@ */ package org.sonar.batch.rule; -import org.sonar.api.batch.languages.Language; -import org.sonar.api.batch.rules.QProfile; +import org.sonar.batch.languages.Language; +import org.sonar.api.batch.rules.QProfile; import com.google.common.collect.ImmutableMap; import org.apache.commons.lang.StringUtils; import org.sonar.api.BatchComponent; diff --git a/sonar-batch/src/main/java/org/sonar/batch/scan/LanguageVerifier.java b/sonar-batch/src/main/java/org/sonar/batch/scan/LanguageVerifier.java index 88cc4365bed..801fadddd44 100644 --- a/sonar-batch/src/main/java/org/sonar/batch/scan/LanguageVerifier.java +++ b/sonar-batch/src/main/java/org/sonar/batch/scan/LanguageVerifier.java @@ -19,7 +19,7 @@ */ package org.sonar.batch.scan; -import org.sonar.api.batch.languages.Language; +import org.sonar.batch.languages.Language; import org.picocontainer.Startable; import org.slf4j.Logger; diff --git a/sonar-batch/src/main/java/org/sonar/batch/scan/filesystem/LanguageDetection.java b/sonar-batch/src/main/java/org/sonar/batch/scan/filesystem/LanguageDetection.java index 8bdddc89c90..fbfedb537b5 100644 --- a/sonar-batch/src/main/java/org/sonar/batch/scan/filesystem/LanguageDetection.java +++ b/sonar-batch/src/main/java/org/sonar/batch/scan/filesystem/LanguageDetection.java @@ -19,7 +19,7 @@ */ package org.sonar.batch.scan.filesystem; -import org.sonar.api.batch.languages.Language; +import org.sonar.batch.languages.Language; import com.google.common.base.Joiner; import com.google.common.collect.Lists; -- 2.39.5