From 3457a487f1fe17d4f15664ddfb4a860dea9d9932 Mon Sep 17 00:00:00 2001 From: Brett Porter Date: Sat, 21 Mar 2009 07:20:09 +0000 Subject: [PATCH] [MRM-1096] [MRM-989] fix plugin download type, add default for other types such as javadoc, clean all icons git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@756883 13f79535-47bb-0310-9956-ffa450edef68 --- .../archiva/web/tags/DownloadArtifact.java | 24 +++++++++++++++++- .../webapp/images/download-type-archetype.png | Bin 0 -> 4735 bytes .../main/webapp/images/download-type-jar.png | Bin 969 -> 4583 bytes .../images/download-type-java-source.png | Bin 969 -> 0 bytes .../images/download-type-maven-plugin.png | Bin 0 -> 4779 bytes .../webapp/images/download-type-other.png | Bin 0 -> 4549 bytes .../main/webapp/images/download-type-pom.png | Bin 946 -> 4762 bytes .../main/webapp/images/download-type-skin.png | Bin 0 -> 4861 bytes 8 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 archiva-modules/archiva-web/archiva-webapp/src/main/webapp/images/download-type-archetype.png delete mode 100644 archiva-modules/archiva-web/archiva-webapp/src/main/webapp/images/download-type-java-source.png create mode 100644 archiva-modules/archiva-web/archiva-webapp/src/main/webapp/images/download-type-maven-plugin.png create mode 100644 archiva-modules/archiva-web/archiva-webapp/src/main/webapp/images/download-type-other.png create mode 100644 archiva-modules/archiva-web/archiva-webapp/src/main/webapp/images/download-type-skin.png diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/DownloadArtifact.java b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/DownloadArtifact.java index f3eac7111..23dcadd84 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/DownloadArtifact.java +++ b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/DownloadArtifact.java @@ -40,7 +40,9 @@ import org.codehaus.plexus.component.repository.exception.ComponentLookupExcepti 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 @@ import javax.servlet.jsp.PageContext; 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 @@ public class DownloadArtifact private DecimalFormat decimalFormat; + private static final Map DOWNLOAD_IMAGES = new HashMap(); + + 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 @@ public class DownloadArtifact ArchivaArtifact artifact ) { String type = artifact.getType(); - String linkText = ""; + String linkText = ""; 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 ) { diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/images/download-type-archetype.png b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/images/download-type-archetype.png new file mode 100644 index 0000000000000000000000000000000000000000..c0a19dac7777e50097d713e0c0ff288c1bae58a0 GIT binary patch literal 4735 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 RPrLvC002ovPDHLkV1lJ&%&!0d literal 969 zcmWksZEO@}5MC&P)U+WQO;a!uH7YT|n)HuG64W-dX=xhTgqUd309Fz;KtyARF@)Ga zizFcWV@Yigkrd2X?x<(MwkY&^ZEvyd^?Jv(*K6;tx4p03z1_Y2cz56T9k)MbCeO_L zn0cP3yR~IsMR|2O!!Q+%4Rr^cTD2ZemN_|c^U)N;Y`oOk++J@F{jikPAQj9C>J?8g z5}oHb?(8)mogUfzEoD(tvE*HyE6Wi5TNd z5pv2Z?-)M7p)s(8@1^qni5Tf(wxavT+krR6n93qXXFs-cnr zl41|}7J~_SW=Y6MmaHIICs(~e%Oa9SEKF@oHMO)R5}b}GI+j$MU}9qk#7)_tlz;49 z^vcU9wG^GE~P97tgK8{)}UA- zy`I^k29Aml^V>Gj4V%6FA5kUM0F(Q3IveUBNM6>dq)|bIyOW7fTwomuDcA&3 zbEZ(DIKPrfDh?1!&Zk&6v0_lUAJX5pnbfWK*OB)aNm+$JT`f}%q6CLud9p99ta)XI zJNU}yT~+SMH+G-Db*tyl)BewP|9!Ooa82MyU*Mgd+OneyqsO+l>(6orr+x}}n)gn& zG1WD$%l9^4Jj>j8Zhy}?<|{ul&nOUW$*i+zL<|N xqc-Y#b3CwT81Zkva0>6iZM|JX7ts8%kG5AHAO7({t8+ZlSl?3j$9o-T{s+qUzM%jB diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/images/download-type-java-source.png b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/images/download-type-java-source.png deleted file mode 100644 index 9660957eb94f60ac89b6a24ab7d2c50dbf25e039..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 969 zcmWksZEO@}5MC&P)U+XfrJ)*$8kLw}P57gc1hoxqTAGG7Ato9d&`P2Ph-eHkh7cQQ zD+!4HSW+8ABn4ATk9rntt3t2W-Yv9uz20%{_1e4ZZSQM$Z+CA$-re_o$L)`q$ul!Q zW}fHiYH8kAQNF#LVVH`B`q~3dty+&q%bXm!e&5G18!xmpwbj`pKP+W6NCmTkddU@x zMCUnGWbA3)^%N$ zWrUE82?wya3c#_VD279j$OENtf1yB;>>B)C)(9cA>(@y_DWSjt_sd_Q-dl61|7!}s za^Q@m5{ae3Le`oD=db&K?O3>n6rD^2d6zeiEvx71Bqq)#(13d>4alZ_!@=2@h%wF- zK{u&t5ZfZj0z_BUf4JnozGY9OU?4j9-y)s4d~0f%61#)t5>at3UeHX!i*RKm#By9V ztFPn?%d(^rE+}9iGCm!j2-NHB>S{ zQtT1WVlW}kE(saQk`*NDy!^(E3GBvWZ#z;`?`A*1DFhhUbdMZ+SIq@pA08V?~?mtnxzRD5v) zu`DafwnKfoK(Z3J!)CE)eSd8#5(bRvx!=6gfs|$1NL3>95J`x0DP`GjWo5Fm2E`KT zbp?tVI4VNSYuiLOZ1&~@qDra(Cimw|J``I8sRR>|ysT46qk;;zrxT&Lz&a9AunDB* zOrb<^ekGGs93YmQPqA)d#h_^5l%hjM1Ra4YAsgu?vIob*(Rlu*)=r1zFOw&BhS`5VC%8^_r745$DUY^4a}w9bz^Ti(XhX6OJr-s=ISSVN*_LOT0;%B zZ@0ZNGZq-CJYBQxRHE;b3mXsim+$PX`f|tdGSy)f?g)`>bGN? x+IL3>UZ3>u8Abe?&z;13aBFYp$T>8B^n>ckW1~ObZE=og8tR&B|9GeU^#Ah~zS95z diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/images/download-type-maven-plugin.png b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/images/download-type-maven-plugin.png new file mode 100644 index 0000000000000000000000000000000000000000..3f27ddb6df54facd5152a3d2b0d2aea4c2772d58 GIT binary patch literal 4779 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 literal 0 HcmV?d00001 diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/images/download-type-pom.png b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/images/download-type-pom.png index d0e4c12bf701ce436233f4ffa7d627f0beba015a..7ed1db58311e6c07f38ec922e08182907637a3b8 100644 GIT binary patch literal 4762 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 delta 935 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 literal 0 HcmV?d00001 -- 2.39.5