From: Evgeny Mandrikov Date: Tue, 22 May 2012 19:12:25 +0000 (+0600) Subject: SONAR-3182 Remove unused code X-Git-Tag: 3.1~127 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=2580f03cb0b6e1d5de27b449daa21e1fad89ba5e;p=sonarqube.git SONAR-3182 Remove unused code --- diff --git a/plugins/sonar-pmd-plugin/src/main/java/org/sonar/plugins/pmd/JavaCpdMapping.java b/plugins/sonar-pmd-plugin/src/main/java/org/sonar/plugins/pmd/JavaCpdMapping.java deleted file mode 100644 index 61c700f0f65..00000000000 --- a/plugins/sonar-pmd-plugin/src/main/java/org/sonar/plugins/pmd/JavaCpdMapping.java +++ /dev/null @@ -1,64 +0,0 @@ -/* - * Sonar, open source software quality management tool. - * Copyright (C) 2008-2012 SonarSource - * mailto:contact AT sonarsource DOT com - * - * Sonar 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. - * - * Sonar 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 Sonar; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02 - */ -package org.sonar.plugins.pmd; - -import net.sourceforge.pmd.cpd.JavaTokenizer; -import net.sourceforge.pmd.cpd.Tokenizer; -import org.sonar.api.CoreProperties; -import org.sonar.api.batch.CpdMapping; -import org.sonar.api.config.Settings; -import org.sonar.api.resources.Java; -import org.sonar.api.resources.JavaFile; -import org.sonar.api.resources.Language; -import org.sonar.api.resources.Resource; - -import java.io.File; -import java.util.List; -import java.util.Properties; - -import static com.google.common.base.Objects.firstNonNull; - -public class JavaCpdMapping implements CpdMapping { - private final String ignoreLiterals; - private final String ignoreIdentifiers; - - public JavaCpdMapping(Settings settings) { - ignoreLiterals = firstNonNull(settings.getString(CoreProperties.CPD_IGNORE_LITERALS_PROPERTY), CoreProperties.CPD_IGNORE_LITERALS_DEFAULT_VALUE); - ignoreIdentifiers = firstNonNull(settings.getString(CoreProperties.CPD_IGNORE_IDENTIFIERS_PROPERTY), CoreProperties.CPD_IGNORE_IDENTIFIERS_DEFAULT_VALUE); - } - - public Tokenizer getTokenizer() { - Properties props = new Properties(); - props.setProperty(JavaTokenizer.IGNORE_LITERALS, ignoreLiterals); - props.setProperty(JavaTokenizer.IGNORE_IDENTIFIERS, ignoreIdentifiers); - - JavaTokenizer tokenizer = new JavaTokenizer(); - tokenizer.setProperties(props); - return tokenizer; - } - - public Resource createResource(File file, List sourceDirs) { - return JavaFile.fromIOFile(file, sourceDirs, false); - } - - public Language getLanguage() { - return Java.INSTANCE; - } -} diff --git a/plugins/sonar-pmd-plugin/src/main/java/org/sonar/plugins/pmd/PmdPlugin.java b/plugins/sonar-pmd-plugin/src/main/java/org/sonar/plugins/pmd/PmdPlugin.java index 5206ed9a549..d3ed73a54f2 100644 --- a/plugins/sonar-pmd-plugin/src/main/java/org/sonar/plugins/pmd/PmdPlugin.java +++ b/plugins/sonar-pmd-plugin/src/main/java/org/sonar/plugins/pmd/PmdPlugin.java @@ -39,7 +39,6 @@ public class PmdPlugin extends SonarPlugin { SonarWayProfile.class, SonarWayWithFindbugsProfile.class, SunConventionsProfile.class, - JavaCpdMapping.class, PmdViolationToRuleViolation.class); } }