svn commit: r1207591 - in /maven/plugins/trunk/maven-pmd-plugin: pom.xml src/main/java/org/apache/maven/plugin/pmd/CpdReportGenerator.java src/test/java/org/apache/maven/plugin/pmd/CpdReportTest.java

[de...@apache.org]

Author: dennisl
Date: Mon Nov 28 20:51:13 2011
New Revision: 1207591

URL: http://svn.apache.org/viewvc?rev=1207591&view=rev
Log:
[PMD-135] Update to use and require Java 5

o Update the PMD library to the Java 5 version
o Adjust the plugin code accordingly

Modified:
    maven/plugins/trunk/maven-pmd-plugin/pom.xml
    maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/CpdReportGenerator.java
    maven/plugins/trunk/maven-pmd-plugin/src/test/java/org/apache/maven/plugin/pmd/CpdReportTest.java

Modified: maven/plugins/trunk/maven-pmd-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pmd-plugin/pom.xml?rev=1207591&r1=1207590&r2=1207591&view=diff
==============================================================================
--- maven/plugins/trunk/maven-pmd-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-pmd-plugin/pom.xml Mon Nov 28 20:51:13 2011
@@ -146,7 +146,7 @@ under the License.
     <!-- pmd -->
     <dependency>
       <groupId>pmd</groupId>
-      <artifactId>pmd-jdk14</artifactId>
+      <artifactId>pmd</artifactId>
       <version>4.2.5</version>
     </dependency>
 

Modified: maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/CpdReportGenerator.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/CpdReportGenerator.java?rev=1207591&r1=1207590&r2=1207591&view=diff
==============================================================================
--- maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/CpdReportGenerator.java (original)
+++ maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/CpdReportGenerator.java Mon Nov 28 20:51:13 2011
@@ -107,7 +107,7 @@ public class CpdReportGenerator
      *
      * @param matches
      */
-    public void generate( Iterator matches )
+    public void generate( Iterator<Match> matches )
     {
         beginDocument();
 
@@ -120,7 +120,7 @@ public class CpdReportGenerator
 
         while ( matches.hasNext() )
         {
-            Match match = (Match) matches.next();
+            Match match = matches.next();
             String filename1 = match.getFirstMark().getTokenSrcID();
 
             File file = new File( filename1 );

Modified: maven/plugins/trunk/maven-pmd-plugin/src/test/java/org/apache/maven/plugin/pmd/CpdReportTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pmd-plugin/src/test/java/org/apache/maven/plugin/pmd/CpdReportTest.java?rev=1207591&r1=1207590&r2=1207591&view=diff
==============================================================================
--- maven/plugins/trunk/maven-pmd-plugin/src/test/java/org/apache/maven/plugin/pmd/CpdReportTest.java (original)
+++ maven/plugins/trunk/maven-pmd-plugin/src/test/java/org/apache/maven/plugin/pmd/CpdReportTest.java Mon Nov 28 20:51:13 2011
@@ -196,7 +196,7 @@ public class CpdReportTest
 
         TokenEntry tFirstEntry = new TokenEntry( "public java", "MyClass.java", 34 );
         TokenEntry tSecondEntry = new TokenEntry( "public java", "MyClass3.java", 55 );
-        List tList = new ArrayList();
+        List<Match> tList = new ArrayList<Match>();
         Match tMatch = new Match( 2, tFirstEntry, tSecondEntry );
         tMatch.setSourceCodeSlice( "// ----- ACCESSEURS  avec �l�ments -----" );
         tList.add( tMatch );
@@ -218,15 +218,15 @@ public class CpdReportTest
         extends CPD
     {
 
-        private Iterator matches;
+        private Iterator<Match> matches;
 
-        public MockCpd( int minimumTileSize, Language language, Iterator tMatch )
+        public MockCpd( int minimumTileSize, Language language, Iterator<Match> tMatch )
         {
             super( minimumTileSize, language );
             matches = tMatch;
         }
 
-        public Iterator getMatches()
+        public Iterator<Match> getMatches()
         {
             return matches;
         }