svn commit: r1054085 - /maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/trac/TracMojo.java

[dennisl]

Author: dennisl
Date: Fri Dec 31 10:30:15 2010
New Revision: 1054085

URL: http://svn.apache.org/viewvc?rev=1054085&view=rev
Log:
o Refactoring: group the code into distinct chunks of work

Modified:
    
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/trac/TracMojo.java

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=1054085&r1=1054084&r2=1054085&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
 Fri Dec 31 10:30:15 2010
@@ -104,6 +104,7 @@ public class TracMojo
             throw new MavenReportException( "Issue Management is out of 
order." );
         }
 
+        // Create and configure an XML-RPC client
         XmlRpcClientConfigImpl config = new XmlRpcClientConfigImpl();
 
         try
@@ -119,11 +120,11 @@ public class TracMojo
         config.setBasicUserName( tracUser );
         config.setBasicPassword( tracPassword );
 
-        Object[] queryResult = null;
         XmlRpcClient client = new XmlRpcClient();
 
         client.setConfig( config );
 
+        // Fetch tickets from Trac
         String qstr = "";
 
         if ( !StringUtils.isEmpty( query ) )
@@ -132,61 +133,44 @@ public class TracMojo
         }
 
         Object[] params = new Object[] { new String( qstr ) };
+        Object[] queryResult = null;
+        ArrayList ticketList = new ArrayList();
         try
         {
             queryResult = (Object[]) client.execute( "ticket.query", params );
+
+            for ( int i = 0; i < queryResult.length; i++ )
+            {
+                params = new Object[] { queryResult[i] };
+                Object[] ticketGetResult = null;
+                ticketGetResult = (Object[]) client.execute( "ticket.get", 
params );
+                ticketList.add( createTicket( ticketGetResult ) );
+            }
         }
         catch ( XmlRpcException e )
         {
             throw new MavenReportException( "XmlRpc Error.", e );
         }
 
-        ArrayList ticketList = new ArrayList();
-        TracTicket matchTicket;
-
+        // Generate the report
         TracReportGenerator report = new TracReportGenerator( columnNames );
 
-        if ( queryResult.length == 0 )
+        if ( ticketList.isEmpty() )
         {
-
             report.doGenerateEmptyReport( getBundle( locale ), getSink() );
             getLog().warn( "No ticket has matched." );
-
         }
         else
         {
-
-            for ( int i = 0; i < queryResult.length; i++ )
-            {
-                params = new Object[] { queryResult[i] };
-                try
-                {
-                    Object[] ticketresult = null;
-                    matchTicket = new TracTicket();
-                    ticketresult = (Object[]) client.execute( "ticket.get", 
params );
-                    ticketList.add( setQueryResult( ticketresult, matchTicket 
) );
-
-                }
-                catch ( XmlRpcException e )
-                {
-                    throw new MavenReportException( "XmlRpc Error.", e );
-                }
-            }
             try
             {
-
                 report.doGenerateReport( getBundle( locale ), getSink(), 
ticketList );
-
             }
             catch ( Exception e )
-
             {
                 e.printStackTrace();
-
             }
-
         }
-
     }
 
     public String getName( Locale locale )
@@ -232,8 +216,9 @@ public class TracMojo
         return tracUrl;
     }
 
-    private TracTicket setQueryResult( Object[] ticketObj, TracTicket ticket )
+    private TracTicket createTicket( Object[] ticketObj )
     {
+        TracTicket ticket = new TracTicket();
 
         ticket.setId( String.valueOf( ticketObj[0] ) );