Apache/archiva
1
0
Fork 0
mirror of https://github.com/apache/archiva.git synced 2025-03-08 01:43:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

[MRM-1285][MRM-404] preserve correct ordering in download box

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/archiva/branches/MRM-1025@892778 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Brett Porter 2009-12-21 11:48:08 +00:00
parent 2a2fb9d321
commit e4c08941e9
1 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/ShowArtifactAction.java
View File

@ -22,7 +22,9 @@
import java.text.DecimalFormat;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
import java.util.Collections;
import java.util.Comparator;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
@ -39,6 +41,7 @@
import org.apache.maven.archiva.repository.RepositoryContentFactory;
import org.apache.maven.archiva.repository.RepositoryException;
import org.apache.maven.archiva.repository.layout.LayoutException;
import org.apache.maven.artifact.versioning.DefaultArtifactVersion;
/**
* Browse the repository.
@ -99,7 +102,7 @@ public class ShowArtifactAction
public String artifact()
{
ProjectVersionMetadata versionMetadata = null;
artifacts = new HashMap<String, List<ArtifactDownloadInfo>>();
artifacts = new LinkedHashMap<String, List<ArtifactDownloadInfo>>();
List<String> repos = getObservableRepos();
// In the future, this should be replaced by the repository grouping mechanism, so that we are only making
@ -115,7 +118,21 @@ public String artifact()
{
repositoryId = repoId;
Collection<ArtifactMetadata> artifacts = metadataResolver.getArtifacts( repoId, groupId, artifactId, version );
List<ArtifactMetadata> artifacts = new ArrayList<ArtifactMetadata>(
metadataResolver.getArtifacts( repoId, groupId, artifactId, version ) );
Collections.sort( artifacts, new Comparator<ArtifactMetadata>()
{
public int compare( ArtifactMetadata o1, ArtifactMetadata o2 )
{
// sort by version (reverse), then ID
// TODO: move version sorting into repository handling (maven2 specific), and perhaps add a
// way to get latest instead
int result = new DefaultArtifactVersion( o2.getVersion() ).compareTo(
new DefaultArtifactVersion( o1.getVersion() ) );
return result != 0 ? result : o1.getId().compareTo( o2.getId() );
}
} );
for ( ArtifactMetadata artifact : artifacts )
{
List<ArtifactDownloadInfo> l = this.artifacts.get( artifact.getVersion() );
@ -158,7 +175,7 @@ public String dependencies()
public String mailingLists()
{
String result = artifact();
this.mailingLists = model.getMailingLists();
return result;
@ -281,7 +298,7 @@ public List<ProjectVersionReference> getDependees()
return dependees;
}
public String getRepositoryId()
public String getRepositoryId()
{
return repositoryId;
}
@ -317,6 +334,7 @@ public boolean isDependencyTree()
}
// TODO: move this into the artifact metadata itself via facets where necessary
public class ArtifactDownloadInfo
{
private String type;