You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2012/02/29 10:14:29 UTC
svn commit: r1295024 -
/archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultBrowseService.java
Author: olamy
Date: Wed Feb 29 09:14:28 2012
New Revision: 1295024
URL: http://svn.apache.org/viewvc?rev=1295024&view=rev
Log:
correctly sort versions on artifact view
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultBrowseService.java
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultBrowseService.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultBrowseService.java?rev=1295024&r1=1295023&r2=1295024&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultBrowseService.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultBrowseService.java Wed Feb 29 09:14:28 2012
@@ -18,6 +18,7 @@ package org.apache.archiva.rest.services
* under the License.
*/
+import org.apache.archiva.common.utils.VersionComparator;
import org.apache.archiva.metadata.model.ProjectVersionMetadata;
import org.apache.archiva.metadata.repository.MetadataResolutionException;
import org.apache.archiva.metadata.repository.MetadataResolver;
@@ -185,7 +186,7 @@ public class DefaultBrowseService
}
- private Set<String> getVersions( List<String> selectedRepos, String groupId, String artifactId )
+ private Collection<String> getVersions( List<String> selectedRepos, String groupId, String artifactId )
throws MetadataResolutionException
{
@@ -202,7 +203,12 @@ public class DefaultBrowseService
metadataResolver.resolveProjectVersions( repositorySession, repoId, groupId, artifactId ) );
}
- return versions;
+ List<String> sortedVersions = new ArrayList<String>( versions );
+
+ Collections.sort( sortedVersions, VersionComparator.getInstance() );
+
+
+ return sortedVersions;
}
finally
{
@@ -226,7 +232,7 @@ public class DefaultBrowseService
try
{
- Set<String> projectVersions = getVersions( selectedRepos, groupId, artifactId );
+ Collection<String> projectVersions = getVersions( selectedRepos, groupId, artifactId );
repositorySession = repositorySessionFactory.createSession();