From 0e75ca866db13c0704b051f17b883862f31980b0 Mon Sep 17 00:00:00 2001
From: tpylak <tpylak>
Date: Wed, 18 Aug 2010 10:03:46 +0000
Subject: [PATCH] LMS-1645 small refactoring, fix test
SVN: 17498
---
.../renderers/SimpleImageHtmlRenderer.java | 13 +------------
.../shared/basic/URLMethodWithParameters.java | 12 ++++++++++++
.../shared/basic/dto/GeneratedImageTableCell.java | 8 ++------
.../basic/dto/GeneratedImageTableCellTest.java | 4 ++--
.../application/detailviewers/ImageUrlUtils.java | 7 +++----
.../detailviewers/WellContentDialog.java | 4 ++--
6 files changed, 22 insertions(+), 26 deletions(-)
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 02aec0623e6..378740d457d 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,18 +34,7 @@ public class SimpleImageHtmlRenderer
methodWithParameters.addParameter("mode", "thumbnail" + width + "x" + height);
String imageURL = methodWithParameters.toString();
- return createEmbededImageHtml(imageURL, linkURL);
+ return URLMethodWithParameters.createEmbededImageHtml(imageURL, linkURL);
}
- public static String createEmbededImageHtml(String imageURL, String linkURLOrNull)
- {
- String linkStart = "", linkEnd = "";
- if (linkURLOrNull != null)
- {
- linkStart = "<a class='link-style' href='" + linkURLOrNull + "' target='_blank'>";
- linkEnd = "</a>";
- }
- return "<div align='center'>" + linkStart + "<img src='" + imageURL + "' alt='" + " image "
- + "'/>" + linkEnd + "</div>";
- }
}
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 dae06cdb600..e597865162d 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
@@ -87,4 +87,16 @@ public class URLMethodWithParameters implements IsSerializable
return builder.toString();
}
+ /** Creates HTML which displays an image linking to the given URL (if it is specified). */
+ public static String createEmbededImageHtml(String imageURL, String linkURLOrNull)
+ {
+ String linkStart = "", linkEnd = "";
+ if (linkURLOrNull != null)
+ {
+ linkStart = "<a class='link-style' href='" + linkURLOrNull + "' target='_blank'>";
+ linkEnd = "</a>";
+ }
+ return "<div align='center'>" + linkStart + "<img src='" + imageURL + "' alt='" + " image "
+ + "'/>" + 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 92b3088fd6d..9a55a13d193 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
@@ -150,12 +150,8 @@ public class GeneratedImageTableCell implements ISerializableComparable
urlMethodThumb.addParameter(IMAGE_WIDTH_PARAM, thumbnailWidth);
urlMethodThumb.addParameter(IMAGE_HEIGHT_PARAM, thumbnailHeight);
- return getEmbededImageHtml(urlMethodThumb.toString(), urlMethodImage.toString());
+ return URLMethodWithParameters.createEmbededImageHtml(urlMethodThumb.toString(),
+ urlMethodImage.toString());
}
- private String getEmbededImageHtml(String thumbURL, String imageURL)
- {
- return "<div align='center'><a class='link-style' href='" + imageURL
- + "' target='_blank'><img src='" + thumbURL + "' alt='" + "image" + "'/></a></div>";
- }
}
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 d38c5ff1bb2..0791435d384 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
@@ -3,7 +3,7 @@ package ch.systemsx.cisd.openbis.generic.shared.basic.dto;
import org.testng.AssertJUnit;
import org.testng.annotations.Test;
-import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.columns.framework.renderers.SimpleImageHtmlRenderer;
+import ch.systemsx.cisd.openbis.generic.shared.basic.URLMethodWithParameters;
/**
* @author Chandrasekhar Ramakrishnan
@@ -18,7 +18,7 @@ public class GeneratedImageTableCellTest extends AssertJUnit
cell.addParameter("code", "CODE_8472");
String cellHTML = cell.getHTMLString("http://my.server.ch", "sessionToken");
String rendererHTML =
- SimpleImageHtmlRenderer
+ 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");
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/client/application/detailviewers/ImageUrlUtils.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/client/application/detailviewers/ImageUrlUtils.java
index a20947e7498..1633796bd7d 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/client/application/detailviewers/ImageUrlUtils.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/client/application/detailviewers/ImageUrlUtils.java
@@ -20,10 +20,9 @@ import com.extjs.gxt.ui.client.widget.Component;
import com.extjs.gxt.ui.client.widget.Html;
import com.extjs.gxt.ui.client.widget.LayoutContainer;
-import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.columns.framework.renderers.SimpleImageHtmlRenderer;
import ch.systemsx.cisd.openbis.generic.shared.basic.URLMethodWithParameters;
-import ch.systemsx.cisd.openbis.plugin.screening.shared.basic.dto.WellImageChannelStack;
import ch.systemsx.cisd.openbis.plugin.screening.shared.basic.dto.ScreeningConstants;
+import ch.systemsx.cisd.openbis.plugin.screening.shared.basic.dto.WellImageChannelStack;
/**
* Generates URLs pointing to the images on Data Store server.
@@ -75,7 +74,7 @@ public class ImageUrlUtils
methodWithParameters.addParameter("mode", "thumbnail" + width + "x" + height);
String imageURL = methodWithParameters.toString();
- return SimpleImageHtmlRenderer.createEmbededImageHtml(imageURL, linkURL);
+ return URLMethodWithParameters.createEmbededImageHtml(imageURL, linkURL);
}
/** creates a widget which displays the specified URL and adds it to the container */
@@ -107,7 +106,7 @@ public class ImageUrlUtils
methodWithParameters.addParameter("mode", "thumbnail" + width + "x" + height);
String imageURL = methodWithParameters.toString();
- return SimpleImageHtmlRenderer.createEmbededImageHtml(imageURL, linkURL);
+ return URLMethodWithParameters.createEmbededImageHtml(imageURL, linkURL);
}
private static URLMethodWithParameters createBasicImageURL(String sessionID, WellImages images,
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/client/application/detailviewers/WellContentDialog.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/client/application/detailviewers/WellContentDialog.java
index cd5645e507c..263c9a1721b 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/client/application/detailviewers/WellContentDialog.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/client/application/detailviewers/WellContentDialog.java
@@ -274,14 +274,14 @@ public class WellContentDialog extends Dialog
private static int getDialogWidth(WellImages images)
{
float imageSizeMultiplyFactor = getImageSizeMultiplyFactor(images);
- return (int) (ONE_IMAGE_WIDTH_PX * imageSizeMultiplyFactor) * images.getTileColsNum() + 100;
+ return (int) (ONE_IMAGE_WIDTH_PX * imageSizeMultiplyFactor) * images.getTileColsNum() + 30;
}
private static int getDialogHeight(WellImages images)
{
float imageSizeMultiplyFactor = getImageSizeMultiplyFactor(images);
return Math.max((int) (ONE_IMAGE_HEIGHT_PX * imageSizeMultiplyFactor)
- * images.getTileRowsNum() + 100, 300);
+ * images.getTileRowsNum() + 300, 300);
}
private static int getImageHeight(WellImages images)
--
GitLab