diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/columns/framework/renderers/SimpleImageHtmlRenderer.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/columns/framework/renderers/SimpleImageHtmlRenderer.java index 378740d457df2cb51e44ed3c2c3cc923612795d8..9d4d1a9330fe6767ca539013d74c6a5680303924 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/columns/framework/renderers/SimpleImageHtmlRenderer.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/columns/framework/renderers/SimpleImageHtmlRenderer.java @@ -34,7 +34,7 @@ public class SimpleImageHtmlRenderer methodWithParameters.addParameter("mode", "thumbnail" + width + "x" + height); String imageURL = methodWithParameters.toString(); - return URLMethodWithParameters.createEmbededImageHtml(imageURL, linkURL); + return URLMethodWithParameters.createEmbededImageHtml(imageURL, linkURL, width, height); } } diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/URLMethodWithParameters.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/URLMethodWithParameters.java index e597865162d549ace686e41593f810080a86c6b6..2f344ac531c0637a3b08e0341015638813d04679 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/URLMethodWithParameters.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/URLMethodWithParameters.java @@ -88,7 +88,7 @@ public class URLMethodWithParameters implements IsSerializable } /** Creates HTML which displays an image linking to the given URL (if it is specified). */ - public static String createEmbededImageHtml(String imageURL, String linkURLOrNull) + public static String createEmbededImageHtml(String imageURL, String linkURLOrNull, int width, int height) { String linkStart = "", linkEnd = ""; if (linkURLOrNull != null) @@ -96,7 +96,16 @@ public class URLMethodWithParameters implements IsSerializable linkStart = "<a class='link-style' href='" + linkURLOrNull + "' target='_blank'>"; linkEnd = "</a>"; } + StringBuilder builder = new StringBuilder(); + if (width > 0) + { + builder.append("width='").append(width).append("' "); + } + if (height > 0) + { + builder.append("height='").append(height).append("' "); + } return "<div align='center'>" + linkStart + "<img src='" + imageURL + "' alt='" + " image " - + "'/>" + linkEnd + "</div>"; + + "'" + builder + "/>" + linkEnd + "</div>"; } } diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/GeneratedImageTableCell.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/GeneratedImageTableCell.java index 9a55a13d19330b8077315424ad0eceedaf8ba1fa..9dbe87461543d2e1c898029d572f3f55f75ab346 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/GeneratedImageTableCell.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/GeneratedImageTableCell.java @@ -151,7 +151,7 @@ public class GeneratedImageTableCell implements ISerializableComparable urlMethodThumb.addParameter(IMAGE_HEIGHT_PARAM, thumbnailHeight); return URLMethodWithParameters.createEmbededImageHtml(urlMethodThumb.toString(), - urlMethodImage.toString()); + urlMethodImage.toString(), 0, 0); } } diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/GeneratedImageTableCellTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/GeneratedImageTableCellTest.java index 0791435d384932ccc504783076dedd0fb9adc17f..5a57a511f470c3d7b4b60910308ce3b14fda6718 100644 --- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/GeneratedImageTableCellTest.java +++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/GeneratedImageTableCellTest.java @@ -21,7 +21,8 @@ public class GeneratedImageTableCellTest extends AssertJUnit URLMethodWithParameters .createEmbededImageHtml( "http://my.server.ch/servletName?sessionID=sessionToken&code=CODE_8472&w=60&h=60", - "http://my.server.ch/servletName?sessionID=sessionToken&code=CODE_8472&w=600&h=300"); + "http://my.server.ch/servletName?sessionID=sessionToken&code=CODE_8472&w=600&h=300", + 600, 300); assertEquals(cellHTML, rendererHTML); } }