svn commit: r1098310 - in /maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes: ChangesValidatorMojo.java schema/XmlValidationHandler.java

[de...@apache.org]

Author: dennisl
Date: Sun May  1 14:10:27 2011
New Revision: 1098310

URL: http://svn.apache.org/viewvc?rev=1098310&view=rev
Log:
[MCHANGES-210] Update to Java 5

- Start using generics in ChangesValidatorMojo and XmlValidationHandler

Modified:
    maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ChangesValidatorMojo.java
    maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/schema/XmlValidationHandler.java

Modified: maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ChangesValidatorMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ChangesValidatorMojo.java?rev=1098310&r1=1098309&r2=1098310&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ChangesValidatorMojo.java (original)
+++ maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ChangesValidatorMojo.java Sun May  1 14:10:27 2011
@@ -20,7 +20,6 @@ package org.apache.maven.plugin.changes;
  */
 
 import java.io.File;
-import java.util.Iterator;
 import java.util.List;
 
 import org.apache.maven.plugin.AbstractMojo;
@@ -29,7 +28,7 @@ import org.apache.maven.plugin.MojoFailu
 import org.apache.maven.plugin.changes.schema.ChangesSchemaValidator;
 import org.apache.maven.plugin.changes.schema.SchemaValidatorException;
 import org.apache.maven.plugin.changes.schema.XmlValidationHandler;
-import org.xml.sax.SAXException;
+import org.xml.sax.SAXParseException;
 
 /**
  * 
@@ -114,13 +113,12 @@ public class ChangesValidatorMojo
         }
     }
 
-    private void logSchemaValidation( List /*SAXException*/errors )
+    private void logSchemaValidation( List<SAXParseException> errors )
     {
         getLog().warn( "failed to validate changes.xml file " + xmlPath.getAbsolutePath() );
         getLog().warn( "validation errors: " );
-        for ( Iterator iterator = errors.iterator(); iterator.hasNext(); )
+        for ( SAXParseException error : errors )
         {
-            SAXException error = (SAXException) iterator.next();
             getLog().warn( error.getMessage() );
         }
     }

Modified: maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/schema/XmlValidationHandler.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/schema/XmlValidationHandler.java?rev=1098310&r1=1098309&r2=1098310&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/schema/XmlValidationHandler.java (original)
+++ maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/schema/XmlValidationHandler.java Sun May  1 14:10:27 2011
@@ -38,11 +38,11 @@ public class XmlValidationHandler
    
     private boolean parsingError = false;
 
-    private List /* SAXParseException */errors = new ArrayList();
+    private List<SAXParseException> errors = new ArrayList<SAXParseException>();
 
-    private List /* SAXParseException */fatalErrors = new ArrayList();
+    private List<SAXParseException> fatalErrors = new ArrayList<SAXParseException>();
 
-    private List /* SAXParseException */warnings = new ArrayList();
+    private List<SAXParseException> warnings = new ArrayList<SAXParseException>();
 
     private boolean failOnValidationError;
 
@@ -115,32 +115,32 @@ public class XmlValidationHandler
         this.parsingError = error;
     }
 
-    public List /* SAXParseException */getErrors()
+    public List<SAXParseException> getErrors()
     {
         return errors;
     }
 
-    public void setErrors( List errors )
+    public void setErrors( List<SAXParseException> errors )
     {
         this.errors = errors;
     }
 
-    public List /* SAXParseException */getFatalErrors()
+    public List<SAXParseException> getFatalErrors()
     {
         return fatalErrors;
     }
 
-    public void setFatalErrors( List fatalErrors )
+    public void setFatalErrors( List<SAXParseException> fatalErrors )
     {
         this.fatalErrors = fatalErrors;
     }
 
-    public List /* SAXParseException */ getWarnings()
+    public List<SAXParseException> getWarnings()
     {
         return warnings;
     }
 
-    public void setWarnings( List warnings )
+    public void setWarnings( List<SAXParseException> warnings )
     {
         this.warnings = warnings;
     }