You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@labs.apache.org by si...@apache.org on 2009/12/10 12:59:45 UTC
svn commit: r889217 - in /labs/magma/trunk:
website-file/src/main/java/org/apache/magma/website/htmlpieces/MagFileHtml.java
website-image/src/main/java/org/apache/magma/website/htmlpieces/MagImageHtml.java
Author: simoneg
Date: Thu Dec 10 11:59:41 2009
New Revision: 889217
URL: http://svn.apache.org/viewvc?rev=889217&view=rev
Log:
LABS-380 : fix on null image/file values
Modified:
labs/magma/trunk/website-file/src/main/java/org/apache/magma/website/htmlpieces/MagFileHtml.java
labs/magma/trunk/website-image/src/main/java/org/apache/magma/website/htmlpieces/MagImageHtml.java
Modified: labs/magma/trunk/website-file/src/main/java/org/apache/magma/website/htmlpieces/MagFileHtml.java
URL: http://svn.apache.org/viewvc/labs/magma/trunk/website-file/src/main/java/org/apache/magma/website/htmlpieces/MagFileHtml.java?rev=889217&r1=889216&r2=889217&view=diff
==============================================================================
--- labs/magma/trunk/website-file/src/main/java/org/apache/magma/website/htmlpieces/MagFileHtml.java (original)
+++ labs/magma/trunk/website-file/src/main/java/org/apache/magma/website/htmlpieces/MagFileHtml.java Thu Dec 10 11:59:41 2009
@@ -29,6 +29,7 @@
}
public String output(MagFile value) {
+ if (value == null) return "";
return "<a class=\"MagmaFileLink FileType-" + value.getExtension() + "\" href=\"magma:/files/" + link.makeLink((Object)value.getSpec()) + "/" + value.getOriginalName() + "\"><span class=\"MagmaFileName\">" + value.getOriginalName() + "</span> <span class=\"MagmaFileInfo\">" + value.getLength() + " bytes</span></a>";
}
Modified: labs/magma/trunk/website-image/src/main/java/org/apache/magma/website/htmlpieces/MagImageHtml.java
URL: http://svn.apache.org/viewvc/labs/magma/trunk/website-image/src/main/java/org/apache/magma/website/htmlpieces/MagImageHtml.java?rev=889217&r1=889216&r2=889217&view=diff
==============================================================================
--- labs/magma/trunk/website-image/src/main/java/org/apache/magma/website/htmlpieces/MagImageHtml.java (original)
+++ labs/magma/trunk/website-image/src/main/java/org/apache/magma/website/htmlpieces/MagImageHtml.java Thu Dec 10 11:59:41 2009
@@ -28,6 +28,7 @@
}
public String output(MagImage value) {
+ if (value == null) return "";
return "<img class=\"MagmaImage\" src=\"magma:/files/" + link.makeLink((Object)value.getSpec()) + "/" + value.getOriginalName() + "\"/>";
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@labs.apache.org
For additional commands, e-mail: commits-help@labs.apache.org