Author: brett
Date: Sat Mar 21 07:20:09 2009
New Revision: 756883
URL: http://svn.apache.org/viewvc?rev=756883&view=rev
Log:
[MRM-1096] [MRM-989] fix plugin download type, add default for other types such
as javadoc, clean all icons
Added:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/images/download-type-archetype.png
(with props)
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/images/download-type-maven-plugin.png
(with props)
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/images/download-type-other.png
(with props)
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/images/download-type-skin.png
(with props)
Removed:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/images/download-type-java-source.png
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/DownloadArtifact.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/images/download-type-jar.png
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/images/download-type-pom.png
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/DownloadArtifact.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/DownloadArtifact.java?rev=756883&r1=756882&r2=756883&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/DownloadArtifact.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/DownloadArtifact.java
Sat Mar 21 07:20:09 2009
@@ -40,7 +40,9 @@
import java.io.IOException;
import java.io.Writer;
import java.text.DecimalFormat;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -56,6 +58,8 @@
public class DownloadArtifact
extends Component
{
+ private static final String DEFAULT_DOWNLOAD_IMAGE =
"download-type-other.png";
+
/**
* @plexus.requirement role-hint="jdo"
*/
@@ -81,6 +85,18 @@
private DecimalFormat decimalFormat;
+ private static final Map<String, String> DOWNLOAD_IMAGES = new
HashMap<String,String>();
+
+ static
+ {
+ DOWNLOAD_IMAGES.put( "jar", "download-type-jar.png" );
+ DOWNLOAD_IMAGES.put( "java-source", "download-type-jar.png" );
+ DOWNLOAD_IMAGES.put( "pom", "download-type-pom.png" );
+ DOWNLOAD_IMAGES.put( "maven-plugin", "download-type-maven-plugin.png"
);
+ DOWNLOAD_IMAGES.put( "maven-archetype", "download-type-archetype.png"
);
+ DOWNLOAD_IMAGES.put( "maven-skin", "download-type-skin.png" );
+ }
+
public DownloadArtifact( ValueStack stack, PageContext pageContext )
{
super( stack );
@@ -238,10 +254,16 @@
ArchivaArtifact artifact )
{
String type = artifact.getType();
- String linkText = "<img src=\"" + req.getContextPath() +
"/images/download-type-" + type + ".png\" />";
+ String linkText = "<img src=\"" + req.getContextPath() + "/images/" +
getDownloadImage( type ) + "\" />";
appendLink( sb, prefix, repo, artifact, linkText );
}
+ private String getDownloadImage( String type )
+ {
+ String name = DOWNLOAD_IMAGES.get( type );
+ return name != null ? name : DEFAULT_DOWNLOAD_IMAGE;
+ }
+
private static void appendLink( StringBuffer sb, String prefix,
ManagedRepositoryContent repo,
ArchivaArtifact artifact, String linkText )
{
Added:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/images/download-type-archetype.png
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/images/download-type-archetype.png?rev=756883&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/images/download-type-archetype.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/images/download-type-jar.png
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/images/download-type-jar.png?rev=756883&r1=756882&r2=756883&view=diff
==============================================================================
Binary files - no diff available.
Added:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/images/download-type-maven-plugin.png
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/images/download-type-maven-plugin.png?rev=756883&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/images/download-type-maven-plugin.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Added:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/images/download-type-other.png
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/images/download-type-other.png?rev=756883&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/images/download-type-other.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/images/download-type-pom.png
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/images/download-type-pom.png?rev=756883&r1=756882&r2=756883&view=diff
==============================================================================
Binary files - no diff available.
Added:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/images/download-type-skin.png
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/images/download-type-skin.png?rev=756883&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/images/download-type-skin.png
------------------------------------------------------------------------------
svn:mime-type = image/png
