Skip to content
This repository was archived by the owner on Jan 29, 2020. It is now read-only.

[MPMD-209] Upgrade to PMD 5.3.0 #50

Closed
wants to merge 2 commits into from
Closed

[MPMD-209] Upgrade to PMD 5.3.0 #50

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4595bdd
[MPMD-209] Upgrade to PMD 5.3.0
adangel Apr 3, 2015
5bd46b6
[MPMD-209] Upgrade to PMD 5.3.1
adangel Apr 20, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion maven-pmd-plugin/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ under the License.
<javaVersion>1.6</javaVersion>
<maven.compiler.source>${javaVersion}</maven.compiler.source>
<maven.compiler.target>${javaVersion}</maven.compiler.target>
<pmdVersion>5.2.3</pmdVersion>
<pmdVersion>5.3.1</pmdVersion>
<sitePluginVersion>3.4</sitePluginVersion>
<projectInfoReportsPluginVersion>2.8</projectInfoReportsPluginVersion>
</properties>
Expand Down
5 changes: 3 additions & 2 deletions maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/CpdReportGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
import java.util.Map;
import java.util.ResourceBundle;

import net.sourceforge.pmd.cpd.Mark;
import net.sourceforge.pmd.cpd.Match;
import net.sourceforge.pmd.cpd.TokenEntry;

Expand Down Expand Up @@ -185,10 +186,10 @@ public void generate( Iterator<Match> matches )
sink.tableRow_();

// Iterating on every token entry
for ( Iterator<TokenEntry> occurrences = match.iterator(); occurrences.hasNext(); )
for ( Iterator<Mark> occurrences = match.iterator(); occurrences.hasNext(); )
{

TokenEntry mark = occurrences.next();
TokenEntry mark = occurrences.next().getToken();
generateFileLine( mark );
}

Expand Down
7 changes: 5 additions & 2 deletions maven-pmd-plugin/src/test/java/org/apache/maven/plugin/pmd/CpdReportTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
import net.sourceforge.pmd.cpd.CPD;
import net.sourceforge.pmd.cpd.CPDConfiguration;
import net.sourceforge.pmd.cpd.JavaLanguage;
import net.sourceforge.pmd.cpd.Mark;
import net.sourceforge.pmd.cpd.Match;
import net.sourceforge.pmd.cpd.TokenEntry;

Expand Down Expand Up @@ -196,8 +197,10 @@ public void testWriteNonHtml()
TokenEntry tFirstEntry = new TokenEntry( "public java", "MyClass.java", 34 );
TokenEntry tSecondEntry = new TokenEntry( "public java", "MyClass3.java", 55 );
List<Match> tList = new ArrayList<Match>();
Match tMatch = new Match( 2, tFirstEntry, tSecondEntry );
tMatch.setSourceCodeSlice( "// ----- ACCESSEURS avec �l�ments -----" );
Mark tFirstMark = new Mark( tFirstEntry );
Mark tSecondMark = new Mark( tSecondEntry );
tFirstMark.setSoureCodeSlice( "// ----- ACCESSEURS avec �l�ments -----" );
Match tMatch = new Match( 2, tFirstMark, tSecondMark );
tList.add( tMatch );

CPDConfiguration cpdConfiguration = new CPDConfiguration();
Expand Down