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 2f344ac531c0637a3b08e0341015638813d04679..02481faf3785ad9c7e3e07dd43d601b6ed825a9a 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 @@ -99,11 +99,11 @@ public class URLMethodWithParameters implements IsSerializable StringBuilder builder = new StringBuilder(); if (width > 0) { - builder.append("width='").append(width).append("' "); + builder.append(" width='").append(width).append("'"); } if (height > 0) { - builder.append("height='").append(height).append("' "); + builder.append(" height='").append(height).append("'"); } return "<div align='center'>" + linkStart + "<img src='" + imageURL + "' alt='" + " image " + "'" + 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 9dbe87461543d2e1c898029d572f3f55f75ab346..477a0d39bbeee42e5243dd930f838f36c0881d7a 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(), 0, 0); + urlMethodImage.toString(), thumbnailWidth, thumbnailHeight); } } 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 5a57a511f470c3d7b4b60910308ce3b14fda6718..f373fd46e8badc70cd6a2ea2756c20aa88f77294 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 @@ -14,15 +14,15 @@ public class GeneratedImageTableCellTest extends AssertJUnit @Test public void testAgainstSimpleImageHTMLRenderer() { - GeneratedImageTableCell cell = new GeneratedImageTableCell("servletName", 600, 300, 60, 60); + GeneratedImageTableCell cell = new GeneratedImageTableCell("servletName", 600, 300, 60, 30); cell.addParameter("code", "CODE_8472"); String cellHTML = cell.getHTMLString("http://my.server.ch", "sessionToken"); String rendererHTML = 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=60&h=30", "http://my.server.ch/servletName?sessionID=sessionToken&code=CODE_8472&w=600&h=300", - 600, 300); + 60, 30); assertEquals(cellHTML, rendererHTML); } }