Author: dennisl Date: Sat Oct 31 22:21:29 2009 New Revision: 831608 URL: http://svn.apache.org/viewvc?rev=831608&view=rev Log: o Fix errors reported by Checkstyle.
Modified: maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/announcement/AnnouncementMojo.java maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ChangesXML.java maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/schema/ChangesSchemaValidator.java maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/schema/DefaultChangesSchemaValidator.java maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/AbstractJiraDownloader.java maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/trac/TracMojo.java maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/trac/TracReportGenerator.java maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/trac/TracTicket.java Modified: maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/announcement/AnnouncementMojo.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/announcement/AnnouncementMojo.java?rev=831608&r1=831607&r2=831608&view=diff ============================================================================== --- maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/announcement/AnnouncementMojo.java (original) +++ maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/announcement/AnnouncementMojo.java Sat Oct 31 22:21:29 2009 @@ -461,7 +461,7 @@ } release = getRelease( releases, pomVersion ); - isFound = (release != null); + isFound = ( release != null ); if ( !isFound ) { @@ -476,7 +476,7 @@ } - protected Release getRelease(List releases, String version) + protected Release getRelease( List releases, String version ) { Release release = null; for ( int i = 0; i < releases.size(); i++ ) Modified: maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ChangesXML.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ChangesXML.java?rev=831608&r1=831607&r2=831608&view=diff ============================================================================== --- maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ChangesXML.java (original) +++ maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ChangesXML.java Sat Oct 31 22:21:29 2009 @@ -43,54 +43,54 @@ private String author; private String title; - + private String authorEmail; - + private ChangesDocument changesDocument; public ChangesXML( File xmlPath, Log log ) { - - if (xmlPath == null || !xmlPath.exists()) + + if ( xmlPath == null || !xmlPath.exists() ) { log.error( "changes xml file is null or not exists " ); return; } - + try { - + ChangesXpp3Reader reader = new ChangesXpp3Reader(); - changesDocument = reader.read( new FileInputStream( xmlPath), false ); - - if (changesDocument == null) + changesDocument = reader.read( new FileInputStream( xmlPath ), false ); + + if ( changesDocument == null ) { log.error( "cannot build changes from file " + xmlPath.getPath() ); return; } - + Properties properties = changesDocument.getProperties(); - - if (properties != null) + + if ( properties != null ) { if ( properties.getAuthor() != null ) { this.author = properties.getAuthor().getName(); - this.authorEmail = properties.getAuthor().getName(); + this.authorEmail = properties.getAuthor().getName(); } - this.title = properties.getTitle(); + this.title = properties.getTitle(); } - - + + Body body = changesDocument.getBody(); - - + + if ( body != null ) { this.releaseList = changesDocument.getBody().getReleases(); } - + } catch ( Throwable e ) { Modified: maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/schema/ChangesSchemaValidator.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/schema/ChangesSchemaValidator.java?rev=831608&r1=831607&r2=831608&view=diff ============================================================================== --- maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/schema/ChangesSchemaValidator.java (original) +++ maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/schema/ChangesSchemaValidator.java Sat Oct 31 22:21:29 2009 @@ -31,11 +31,11 @@ /** * @param file * @param schemaVersion - * @param failOnValidationError if false SchemaValidatorException will not be throw + * @param failOnValidationError if false SchemaValidatorException will not be throw * @return {...@link XmlValidationHandler} * @throws SchemaValidatorException */ - public XmlValidationHandler validateXmlWithSchema( File file, String schemaVersion, boolean failOnValidationError ) + XmlValidationHandler validateXmlWithSchema( File file, String schemaVersion, boolean failOnValidationError ) throws SchemaValidatorException; - + } Modified: maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/schema/DefaultChangesSchemaValidator.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/schema/DefaultChangesSchemaValidator.java?rev=831608&r1=831607&r2=831608&view=diff ============================================================================== --- maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/schema/DefaultChangesSchemaValidator.java (original) +++ maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/schema/DefaultChangesSchemaValidator.java Sat Oct 31 22:21:29 2009 @@ -34,11 +34,11 @@ import org.xml.sax.SAXException; /** - * + * * @author <a href="mailto:ol...@apache.org">olamy</a> * @since 28 juil. 2008 * @version $Id$ - * + * * @plexus.component role="org.apache.maven.plugin.changes.schema.ChangesSchemaValidator" role-hint="default" */ public class DefaultChangesSchemaValidator @@ -46,10 +46,10 @@ { /** property schema */ - public static final String W3C_XML_SCHEMA = "http://www.w3.org/2001/XMLSchema"; - + public static final String W3C_XML_SCHEMA = "http://www.w3.org/2001/XMLSchema"; + public static final String CHANGES_SCHEMA_PATH = "META-INF/changes/xsd/"; - + private Map compiledSchemas = new FastMap(); public XmlValidationHandler validateXmlWithSchema( File file, String schemaVersion, boolean failOnValidationError ) @@ -58,17 +58,17 @@ try { String schemaPath = CHANGES_SCHEMA_PATH + "changes-" + schemaVersion + ".xsd"; - + Schema schema = getSchema( schemaPath ); - + Validator validator = schema.newValidator(); - + XmlValidationHandler baseHandler = new XmlValidationHandler( failOnValidationError ); - + validator.setErrorHandler( baseHandler ); - + validator.validate( new StreamSource( new FileReader( file ) ) ); - + return baseHandler; } catch ( IOException e ) @@ -93,9 +93,9 @@ return (Schema) this.compiledSchemas.get( schemaPath ); } Schema schema = this.compileJAXPSchema( schemaPath ); - + this.compiledSchemas.put( schemaPath, schema ); - + return schema; } @@ -112,7 +112,7 @@ if ( is == null ) { - throw new NullPointerException(" impossible to load schema with path " + uriSchema ); + throw new NullPointerException( " impossible to load schema with path " + uriSchema ); } //newInstance de SchemaFactory not ThreadSafe @@ -135,7 +135,7 @@ throw new SchemaValidatorException( "SAXException : " + e.getMessage(), e ); } - } + } } Modified: maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/AbstractJiraDownloader.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/AbstractJiraDownloader.java?rev=831608&r1=831607&r2=831608&view=diff ============================================================================== --- maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/AbstractJiraDownloader.java (original) +++ maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/AbstractJiraDownloader.java Sat Oct 31 22:21:29 2009 @@ -382,11 +382,11 @@ fullURL += ( "&tempMax=" + nbEntriesMax + "&reset=true&decorator=none" ); - if (log.isDebugEnabled()) + if ( log.isDebugEnabled() ) { log.debug( "download jira issues from url " + fullURL ); } - + // execute the GET download( client, fullURL ); } Modified: maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/trac/TracMojo.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/trac/TracMojo.java?rev=831608&r1=831607&r2=831608&view=diff ============================================================================== --- maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/trac/TracMojo.java (original) +++ maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/trac/TracMojo.java Sat Oct 31 22:21:29 2009 @@ -145,7 +145,7 @@ ArrayList ticketList = new ArrayList(); TracTicket matchTicket; - TracReportGenerator report = new TracReportGenerator(columnNames); + TracReportGenerator report = new TracReportGenerator( columnNames ); if ( queryResult.length == 0 ) { @@ -162,10 +162,10 @@ params = new Object[] { queryResult[i] }; try { - Object[] Ticketresult = null; + Object[] ticketresult = null; matchTicket = new TracTicket(); - Ticketresult = (Object[]) client.execute( "ticket.get", params ); - ticketList.add( setQueryResult( Ticketresult, matchTicket ) ); + ticketresult = (Object[]) client.execute( "ticket.get", params ); + ticketList.add( setQueryResult( ticketresult, matchTicket ) ); } catch ( XmlRpcException e ) Modified: maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/trac/TracReportGenerator.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/trac/TracReportGenerator.java?rev=831608&r1=831607&r2=831608&view=diff ============================================================================== --- maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/trac/TracReportGenerator.java (original) +++ maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/trac/TracReportGenerator.java Sat Oct 31 22:21:29 2009 @@ -68,8 +68,9 @@ private int[] columnOrder; - public TracReportGenerator(String columnNames) throws MavenReportException { - + public TracReportGenerator( String columnNames ) + throws MavenReportException + { String[] columnNamesArray = columnNames.split( "," ); int validColumnNames = 0; columnOrder = new int[columnNamesArray.length]; Modified: maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/trac/TracTicket.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/trac/TracTicket.java?rev=831608&r1=831607&r2=831608&view=diff ============================================================================== --- maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/trac/TracTicket.java (original) +++ maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/trac/TracTicket.java Sat Oct 31 22:21:29 2009 @@ -1,10 +1,5 @@ package org.apache.maven.plugin.trac; -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.util.Calendar; -import java.util.Date; - /* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file @@ -24,6 +19,11 @@ * under the License. */ +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.Date; + /** * A Trac Ticket. * @@ -189,7 +189,7 @@ { long millis = Long.parseLong( timeCreated ); Calendar cld = Calendar.getInstance(); - cld.setTimeInMillis( millis * 1000l ); + cld.setTimeInMillis( millis * 1000L ); return cld.getTime(); } catch ( NumberFormatException e )