Author: hboutemy
Date: Sat Jun 11 21:47:41 2011
New Revision: 1134780
URL: http://svn.apache.org/viewvc?rev=1134780&view=rev
Log:
fixed little formatting issue
Modified:
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/JiraMojo.java
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/JiraXML.java
maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugin/jira/JiraUnicodeTestCase.java
maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugin/jira/JiraUnicodeTestProjectStub.java
maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugin/jira/MockJiraDownloader.java
Modified:
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/JiraMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/JiraMojo.java?rev=1134780&r1=1134779&r2=1134780&view=diff
==============================================================================
---
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/JiraMojo.java
(original)
+++
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/JiraMojo.java
Sat Jun 11 21:47:41 2011
@@ -310,7 +310,7 @@ public class JiraMojo
*/
public boolean canGenerateReport()
{
- if ( mockDownloader != null)
+ if ( mockDownloader != null )
{
return true;
}
@@ -333,10 +333,12 @@ public class JiraMojo
{
// Download issues
AbstractJiraDownloader issueDownloader;
- if ( mockDownloader != null)
+ if ( mockDownloader != null )
{
issueDownloader = mockDownloader;
- } else {
+ }
+ else
+ {
issueDownloader = new JiraDownloader();
}
configureIssueDownloader( issueDownloader );
Modified:
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/JiraXML.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/JiraXML.java?rev=1134780&r1=1134779&r2=1134780&view=diff
==============================================================================
---
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/JiraXML.java
(original)
+++
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/JiraXML.java
Sat Jun 11 21:47:41 2011
@@ -20,8 +20,7 @@ package org.apache.maven.plugin.jira;
*/
import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
+import java.io.InputStream;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
@@ -35,6 +34,7 @@ import javax.xml.parsers.SAXParserFactor
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.issues.Issue;
import org.apache.maven.plugin.logging.Log;
+import org.codehaus.plexus.util.IOUtil;
import org.xml.sax.Attributes;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
@@ -98,7 +98,7 @@ public class JiraXML
public void parseXML( File xmlPath )
throws MojoExecutionException
{
- FileInputStream xmlStream = null;
+ InputStream xmlStream = null;
try
{
InputSource inputSource = new InputSource( xmlStream );
@@ -106,17 +106,7 @@ public class JiraXML
}
finally
{
- if ( xmlStream != null )
- {
- try
- {
- xmlStream.close();
- }
- catch ( IOException e )
- {
- //
- }
- }
+ IOUtil.close( xmlStream );
}
}
Modified:
maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugin/jira/JiraUnicodeTestCase.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugin/jira/JiraUnicodeTestCase.java?rev=1134780&r1=1134779&r2=1134780&view=diff
==============================================================================
---
maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugin/jira/JiraUnicodeTestCase.java
(original)
+++
maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugin/jira/JiraUnicodeTestCase.java
Sat Jun 11 21:47:41 2011
@@ -1,3 +1,5 @@
+package org.apache.maven.plugin.jira;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -17,8 +19,6 @@
* under the License.
*/
-package org.apache.maven.plugin.jira;
-
import java.io.File;
import java.io.InputStream;
@@ -29,14 +29,18 @@ import org.apache.maven.plugin.testing.A
/**
*
*/
-public class JiraUnicodeTestCase extends AbstractMojoTestCase
+public class JiraUnicodeTestCase
+ extends AbstractMojoTestCase
{
/*
* Something in Doxia escapes all non-Ascii even when the charset is UTF-8.
* This test will fail if that ever changes.
*/
private final static String TEST_TURTLES =
"海龟一路下跌。";
- public void testUnicodeReport() throws Exception {
+
+ public void testUnicodeReport()
+ throws Exception
+ {
File pom = new File( getBasedir(),
"/src/test/unit/jira-plugin-config.xml" );
assertNotNull( pom );
Modified:
maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugin/jira/JiraUnicodeTestProjectStub.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugin/jira/JiraUnicodeTestProjectStub.java?rev=1134780&r1=1134779&r2=1134780&view=diff
==============================================================================
---
maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugin/jira/JiraUnicodeTestProjectStub.java
(original)
+++
maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugin/jira/JiraUnicodeTestProjectStub.java
Sat Jun 11 21:47:41 2011
@@ -1,3 +1,5 @@
+package org.apache.maven.plugin.jira;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -16,7 +18,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.maven.plugin.jira;
import java.util.Collections;
import java.util.List;
Modified:
maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugin/jira/MockJiraDownloader.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugin/jira/MockJiraDownloader.java?rev=1134780&r1=1134779&r2=1134780&view=diff
==============================================================================
---
maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugin/jira/MockJiraDownloader.java
(original)
+++
maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugin/jira/MockJiraDownloader.java
Sat Jun 11 21:47:41 2011
@@ -1,3 +1,5 @@
+package org.apache.maven.plugin.jira;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -17,8 +19,6 @@
* under the License.
*/
-package org.apache.maven.plugin.jira;
-
import java.io.StringReader;
import java.util.List;
@@ -30,7 +30,8 @@ import org.xml.sax.InputSource;
* Allow test cases in the jira mojo without actually talking to jira.
*
*/
-public class MockJiraDownloader extends AbstractJiraDownloader
+public class MockJiraDownloader
+ extends AbstractJiraDownloader
{
@Override
public void doExecute()
@@ -40,12 +41,13 @@ public class MockJiraDownloader extends
}
private String jiraXml;
+
@Override
public List<Issue> getIssueList()
throws MojoExecutionException
{
JiraXML jira = new JiraXML( log, jiraDatePattern );
- InputSource inputSource = new InputSource ( new StringReader( jiraXml
));
+ InputSource inputSource = new InputSource( new StringReader( jiraXml )
);
jira.parse( inputSource );
log.info( "The JIRA version is '" + jira.getJiraVersion() + "'" );
return jira.getIssueList();
