From 289410eb50c73802c6e2f121c5ece5c254224588 Mon Sep 17 00:00:00 2001
From: buczekp <buczekp>
Date: Wed, 6 Oct 2010 07:33:21 +0000
Subject: [PATCH] [LMS-1795] minor: refactoring (renaming)
SVN: 18160
---
.../application/renderer/LinkRenderer.java | 31 +++++++++----------
.../ExperimentPlateLocationsSection.java | 2 +-
.../PlateLayoutSampleSection.java | 2 +-
.../specific/ScreeningLinkExtractor.java | 2 +-
4 files changed, 18 insertions(+), 19 deletions(-)
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/renderer/LinkRenderer.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/renderer/LinkRenderer.java
index f9f70c43628..384223dfdba 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/renderer/LinkRenderer.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/renderer/LinkRenderer.java
@@ -32,7 +32,6 @@ import com.google.gwt.user.client.ui.Hyperlink;
import com.google.gwt.user.client.ui.Widget;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.CommonViewContext.ClientStaticState;
-import ch.systemsx.cisd.openbis.generic.client.web.client.application.IViewContext;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.model.BaseEntityModel;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.util.IDelegatedAction;
@@ -128,12 +127,6 @@ public class LinkRenderer
return DOM.toString(anchor);
}
- public static interface IURLProvider
- {
- /** @return URL to which redicection should be made or null if no redirection should occur */
- String tryGetURL();
- }
-
/**
* @return {@link Anchor} GWT widget that is displayed as a link with given <var>text</var> and
* a <var>listener</var> registered on the click event.
@@ -214,30 +207,36 @@ public class LinkRenderer
return link;
}
+ public static interface IURLProvider
+ {
+ /** @return URL to which redicection should be made or null if no redirection should occur */
+ String tryGetURL();
+ }
+
/**
- * Sets the click listener which executes the specified action if we are in normal view mode
- * when the click occurs and redirects to the provided URL otherwise.
- *
- * @param viewContext
+ * Sets the click listener which executes the specified action when the click occurs if we are
+ * in normal view mode and redirects to the provided URL in simple view mode.
*/
- public static Widget createLink(Button button, final IDelegatedAction normalModeAction,
- final IURLProvider urlProvider, final IViewContext<?> viewContext)
+ @SuppressWarnings("deprecation")
+ public static Widget createButtonLink(Button button,
+ final IDelegatedAction normalViewModeAction,
+ final IURLProvider simpleViewModeUrlProvider)
{
button.addSelectionListener(new SelectionListener<ButtonEvent>()
{
@Override
public void componentSelected(ButtonEvent ce)
{
- if (viewContext.isSimpleMode())
+ if (ClientStaticState.isSimpleMode())
{
- String url = urlProvider.tryGetURL();
+ String url = simpleViewModeUrlProvider.tryGetURL();
if (url != null)
{
History.newItem(url); // redirects
}
} else
{
- normalModeAction.execute();
+ normalViewModeAction.execute();
}
}
});
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/client/application/detailviewers/ExperimentPlateLocationsSection.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/client/application/detailviewers/ExperimentPlateLocationsSection.java
index aeff845ff3c..486702d2ba9 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/client/application/detailviewers/ExperimentPlateLocationsSection.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/client/application/detailviewers/ExperimentPlateLocationsSection.java
@@ -123,7 +123,7 @@ public class ExperimentPlateLocationsSection extends TabContent
materialCriteria);
}
};
- return LinkRenderer.createLink(searchButton, normalModeAction, urlProvider, viewContext);
+ return LinkRenderer.createButtonLink(searchButton, normalModeAction, urlProvider);
}
private void showPlateMaterialReviewer()
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/client/application/detailviewers/PlateLayoutSampleSection.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/client/application/detailviewers/PlateLayoutSampleSection.java
index 4efbc1c4a8a..370a46897a1 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/client/application/detailviewers/PlateLayoutSampleSection.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/client/application/detailviewers/PlateLayoutSampleSection.java
@@ -480,7 +480,7 @@ public class PlateLayoutSampleSection extends TabContent
final IViewContext<IScreeningClientServiceAsync> viewContext)
{
String plateLinkUrl =
- ScreeningLinkExtractor.extractPlateMetadataBrowserLink(plate.getPermId());
+ ScreeningLinkExtractor.createPlateMetadataBrowserLink(plate.getPermId());
return LinkRenderer.getLinkWidget(viewContext.getMessage(Dict.BUTTON_SHOW),
new ClickHandler()
{
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/client/application/ui/columns/specific/ScreeningLinkExtractor.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/client/application/ui/columns/specific/ScreeningLinkExtractor.java
index b39b3696a64..3de72b6ed3e 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/client/application/ui/columns/specific/ScreeningLinkExtractor.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/client/application/ui/columns/specific/ScreeningLinkExtractor.java
@@ -46,7 +46,7 @@ public class ScreeningLinkExtractor extends LinkExtractor
public final static String WELL_SEARCH_MATERIAL_ITEMS_PARAMETER_KEY = "items";
- public static final String extractPlateMetadataBrowserLink(String platePermId)
+ public static final String createPlateMetadataBrowserLink(String platePermId)
{
URLMethodWithParameters url = new URLMethodWithParameters("");
url.addParameter(BasicConstant.LOCATOR_ACTION_PARAMETER, PLATE_METADATA_BROWSER_ACTION);
--
GitLab