You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by br...@apache.org on 2009/12/10 14:42:23 UTC
svn commit: r889260 -
/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/reports/GenerateReportAction.java
Author: brett
Date: Thu Dec 10 13:42:22 2009
New Revision: 889260
URL: http://svn.apache.org/viewvc?rev=889260&view=rev
Log:
[MRM-1301] remove exception that is thrown and caught here only
Modified:
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/reports/GenerateReportAction.java
Modified: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/reports/GenerateReportAction.java
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/reports/GenerateReportAction.java?rev=889260&r1=889259&r2=889260&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/reports/GenerateReportAction.java (original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/reports/GenerateReportAction.java Thu Dec 10 13:42:22 2009
@@ -49,7 +49,6 @@
import org.apache.maven.archiva.database.constraints.UniqueFieldConstraint;
import org.apache.maven.archiva.model.RepositoryProblem;
import org.apache.maven.archiva.model.RepositoryProblemReport;
-import org.apache.maven.archiva.reporting.ArchivaReportException;
import org.apache.maven.archiva.security.ArchivaRoleConstants;
import org.apache.maven.archiva.web.action.PlexusActionSupport;
import org.apache.struts2.interceptor.ServletRequestAware;
@@ -171,113 +170,107 @@
addFieldError( "rowCount", "Row count must be larger than 10." );
return INPUT;
}
- try
+ Date startDateInDF;
+ Date endDateInDF;
+
+ if ( selectedRepositories.size() > 1 )
{
- Date startDateInDF;
- Date endDateInDF;
+ numPages = 1;
- if ( selectedRepositories.size() > 1 )
+ try
{
- numPages = 1;
+ startDateInDF = getStartDateInDateFormat();
+ endDateInDF = getEndDateInDateFormat();
+ }
+ catch ( ParseException e )
+ {
+ addActionError( "Error parsing date(s)." );
+ return ERROR;
+ }
- try
- {
- startDateInDF = getStartDateInDateFormat();
- endDateInDF = getEndDateInDateFormat();
- }
- catch ( ParseException e )
+ if ( startDateInDF != null && endDateInDF != null && startDateInDF.after( endDateInDF ) )
+ {
+ addFieldError( "startDate", "Start Date must be earlier than the End Date" );
+ return INPUT;
+ }
+
+ // multiple repos
+ for ( String repo : selectedRepositories )
+ {
+ List<RepositoryStatistics> stats =
+ repositoryStatisticsManager.getStatisticsInRange( repo, startDateInDF, endDateInDF );
+ if ( stats.isEmpty() )
{
- addActionError( "Error parsing date(s)." );
- return ERROR;
+ log.info( "No statistics available for repository '" + repo + "'." );
+ // TODO set repo's stats to 0
+ continue;
}
+ repositoryStatistics.add( stats.get( 0 ) );
+ }
+ }
+ else if ( selectedRepositories.size() == 1 )
+ {
+ repositoryId = selectedRepositories.get( 0 );
+ try
+ {
+ startDateInDF = getStartDateInDateFormat();
+ endDateInDF = getEndDateInDateFormat();
+
if ( startDateInDF != null && endDateInDF != null && startDateInDF.after( endDateInDF ) )
{
addFieldError( "startDate", "Start Date must be earlier than the End Date" );
return INPUT;
}
- // multiple repos
- for ( String repo : selectedRepositories )
- {
- List<RepositoryStatistics> stats =
- repositoryStatisticsManager.getStatisticsInRange( repo, startDateInDF, endDateInDF );
- if ( stats.isEmpty() )
- {
- log.info( "No statistics available for repository '" + repo + "'." );
- // TODO set repo's stats to 0
- continue;
- }
+ List<RepositoryStatistics> stats =
+ repositoryStatisticsManager.getStatisticsInRange( repositoryId, startDateInDF, endDateInDF );
- repositoryStatistics.add( stats.get( 0 ) );
- }
- }
- else if ( selectedRepositories.size() == 1 )
- {
- repositoryId = selectedRepositories.get( 0 );
- try
+ if ( stats.isEmpty() )
{
- startDateInDF = getStartDateInDateFormat();
- endDateInDF = getEndDateInDateFormat();
+ addActionError(
+ "No statistics available for repository. Repository might not have been scanned." );
+ return ERROR;
+ }
- if ( startDateInDF != null && endDateInDF != null && startDateInDF.after( endDateInDF ) )
- {
- addFieldError( "startDate", "Start Date must be earlier than the End Date" );
- return INPUT;
- }
-
- List<RepositoryStatistics> stats =
- repositoryStatisticsManager.getStatisticsInRange( repositoryId, startDateInDF, endDateInDF );
-
- if ( stats.isEmpty() )
- {
- addActionError(
- "No statistics available for repository. Repository might not have been scanned." );
- return ERROR;
- }
-
- int rowCount = getRowCount();
- int extraPage = ( stats.size() % rowCount ) != 0 ? 1 : 0;
- int totalPages = ( stats.size() / rowCount ) + extraPage;
- numPages = totalPages;
-
- int currentPage = getPage();
- if ( currentPage > totalPages )
- {
- throw new ArchivaReportException( "The requested page exceeds the total number of pages." );
- }
-
- int start = rowCount * ( currentPage - 1 );
- int end = ( start + rowCount ) - 1;
-
- if ( end > stats.size() )
- {
- end = stats.size() - 1;
- }
+ int rowCount = getRowCount();
+ int extraPage = ( stats.size() % rowCount ) != 0 ? 1 : 0;
+ int totalPages = ( stats.size() / rowCount ) + extraPage;
+ numPages = totalPages;
- repositoryStatistics = stats.subList( start, end + 1 );
- }
- catch ( ParseException pe )
+ int currentPage = getPage();
+ if ( currentPage > totalPages )
{
- addActionError( pe.getMessage() );
+ addActionError(
+ "Error encountered while generating report :: The requested page exceeds the total number of pages." );
return ERROR;
}
- }
- else
- {
- addFieldError( "availableRepositories", "Please select a repository (or repositories) from the list." );
- return INPUT;
- }
- if ( repositoryStatistics.isEmpty() )
+ int start = rowCount * ( currentPage - 1 );
+ int end = ( start + rowCount ) - 1;
+
+ if ( end > stats.size() )
+ {
+ end = stats.size() - 1;
+ }
+
+ repositoryStatistics = stats.subList( start, end + 1 );
+ }
+ catch ( ParseException pe )
{
- return BLANK;
+ addActionError( pe.getMessage() );
+ return ERROR;
}
}
- catch ( ArchivaReportException e )
+ else
{
- addActionError( "Error encountered while generating report :: " + e.getMessage() );
- return ERROR;
+ addFieldError( "availableRepositories", "Please select a repository (or repositories) from the list." );
+ return INPUT;
+ }
+
+ if ( repositoryStatistics.isEmpty() )
+ {
+ return BLANK;
}
return SUCCESS;