You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by br...@apache.org on 2005/10/11 18:23:31 UTC
svn commit: r312909 - in /maven/components/trunk/maven-plugins:
maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/
maven-site-plugin/src/main/java/org/apache/maven/plugins/site/
Author: brett
Date: Tue Oct 11 09:23:20 2005
New Revision: 312909
URL: http://svn.apache.org/viewcvs?rev=312909&view=rev
Log:
sort reports alphabetically
Added:
maven/components/trunk/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/ReportComparator.java (with props)
Modified:
maven/components/trunk/maven-plugins/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/AbstractHttpUnitReportTestCase.java
maven/components/trunk/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteMojo.java
Modified: maven/components/trunk/maven-plugins/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/AbstractHttpUnitReportTestCase.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/AbstractHttpUnitReportTestCase.java?rev=312909&r1=312908&r2=312909&view=diff
==============================================================================
--- maven/components/trunk/maven-plugins/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/AbstractHttpUnitReportTestCase.java (original)
+++ maven/components/trunk/maven-plugins/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/AbstractHttpUnitReportTestCase.java Tue Oct 11 09:23:20 2005
@@ -49,8 +49,8 @@
// NavBar
assertEquals( "index.html", links[1].getURLString() );
assertEquals( "project-info.html", links[2].getURLString() );
- assertEquals( "integration.html", links[3].getURLString() );
- assertEquals( "dependencies.html", links[4].getURLString() );
+ assertEquals( "dependencies.html", links[3].getURLString() );
+ assertEquals( "integration.html", links[4].getURLString() );
assertEquals( "issue-tracking.html", links[5].getURLString() );
assertEquals( "license.html", links[6].getURLString() );
assertEquals( "mail-lists.html", links[7].getURLString() );
Added: maven/components/trunk/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/ReportComparator.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/ReportComparator.java?rev=312909&view=auto
==============================================================================
--- maven/components/trunk/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/ReportComparator.java (added)
+++ maven/components/trunk/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/ReportComparator.java Tue Oct 11 09:23:20 2005
@@ -0,0 +1,42 @@
+package org.apache.maven.plugins.site;
+
+/*
+ * Copyright 2001-2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import org.apache.maven.reporting.MavenReport;
+
+import java.util.Comparator;
+import java.util.Locale;
+
+/**
+ * Sorts reports.
+ *
+ * @todo move to reporting API?
+ * @todo allow reports to define their order in some other way?
+ * @author <a href="mailto:brett@apache.org">Brett Porter</a>
+ * @version $Id$
+ */
+public class ReportComparator
+ implements Comparator
+{
+ public int compare( Object o1, Object o2 )
+ {
+ MavenReport r1 = (MavenReport) o1;
+ MavenReport r2 = (MavenReport) o2;
+
+ return r1.getName( Locale.getDefault() ).compareTo( r2.getName( Locale.getDefault() ) );
+ }
+}
Propchange: maven/components/trunk/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/ReportComparator.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/ReportComparator.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified: maven/components/trunk/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteMojo.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteMojo.java?rev=312909&r1=312908&r2=312909&view=diff
==============================================================================
--- maven/components/trunk/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteMojo.java (original)
+++ maven/components/trunk/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteMojo.java Tue Oct 11 09:23:20 2005
@@ -51,6 +51,7 @@
import java.util.Locale;
import java.util.Map;
import java.util.StringTokenizer;
+import java.util.Comparator;
/**
* Generates the project site.
@@ -224,8 +225,9 @@
Map categories = categorizeReports( reports );
- List projectInfos = (List) categories.get( MavenReport.CATEGORY_PROJECT_INFORMATION );
- List projectReports = (List) categories.get( MavenReport.CATEGORY_PROJECT_REPORTS );
+ Comparator reportComparator = new ReportComparator();
+ List projectInfos = Collections.sort( (List) categories.get( MavenReport.CATEGORY_PROJECT_INFORMATION ), reportComparator );
+ List projectReports = Collections.sort( (List) categories.get( MavenReport.CATEGORY_PROJECT_REPORTS ), reportComparator );
if ( projectInfos == null )
{