[LMS-1504] refactorization of common code

SVN: 15755

openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/model/renderer/MaterialPropertyColRenderer.java

@@ -59,9 +59,7 @@ class MaterialPropertyColRenderer<T extends IEntityPropertiesHolder> extends
             // }
             // }
             String href = LinkExtractor.tryExtract(identifier);
-            final Widget link =
-                    LinkRenderer.getLinkWidget(identifier.getCode(), null, false,
-                            href != null ? ("#" + href) : null);
+            final Widget link = LinkRenderer.getLinkWidget(identifier.getCode(), null, href);
 
             FlowPanel panel = new FlowPanel();
             panel.add(link);

openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/renderer/LinkRenderer.java

@@ -128,7 +128,18 @@ public class LinkRenderer
      */
     public static Widget getLinkWidget(final String text, final ClickHandler listener)
     {
-        return getLinkWidget(text, listener, false, null);
+        return getLinkWidget(text, listener, null);
+    }
+
+    /**
+     * @return {@link Hyperlink} GWT widget that is displayed as a link with given <var>text</var>
+     *         and if simple mode is not active a <var>listener</var> registered on the click event.
+     *         If <var>historyHref</var> is not null it will be attached to the link after '#'.
+     */
+    public static Widget getLinkWidget(final String text, final ClickHandler listener,
+            final String historyHref)
+    {
+        return getLinkWidget(text, listener, historyHref, false);
     }
 
     /**
@@ -138,7 +149,7 @@ public class LinkRenderer
      *         false).
      */
     public static Widget getLinkWidget(final String text, final ClickHandler listener,
-            boolean invalidate, String href)
+            final String historyHref, final boolean invalidate)
     {
         Anchor link = new Anchor();
         link.setText(text);
@@ -147,9 +158,9 @@ public class LinkRenderer
         {
             link.addClickHandler(listener);
         }
-        if (href != null)
+        if (historyHref != null)
         {
-            link.setHref(href);
+            link.setHref("#" + historyHref);
         }
         if (invalidate)
         {

openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/PropertyValueRenderers.java

@@ -296,9 +296,7 @@ public final class PropertyValueRenderers
                         new OpenEntityDetailsTabClickListener(material, viewContext);
 
                 String href = LinkExtractor.tryExtract(material);
-                final Widget link =
-                        LinkRenderer.getLinkWidget(material.getCode(), listener, false,
-                                href != null ? ("#" + href) : null);
+                final Widget link = LinkRenderer.getLinkWidget(material.getCode(), listener, href);
 
                 FlowPanel panel = new FlowPanel();
                 panel.add(link);
@@ -425,9 +423,7 @@ public final class PropertyValueRenderers
             final ClickHandler listener =
                     new OpenEntityDetailsTabClickListener(entity, viewContext);
             String href = LinkExtractor.tryExtract(entity);
-            final Widget link =
-                    LinkRenderer.getLinkWidget(displayText, listener, invalidate,
-                            href != null ? "#" + href : null);
+            final Widget link = LinkRenderer.getLinkWidget(displayText, listener, href, invalidate);
 
             // putting link into a panel makes it a block/row
             // which is important if they are rendered as an array
@@ -485,9 +481,7 @@ public final class PropertyValueRenderers
                     }
                 };
             String href = LinkExtractor.tryExtract(project);
-            final Widget link =
-                    LinkRenderer.getLinkWidget(displayText, listener, false, href != null ? "#"
-                            + href : null);
+            final Widget link = LinkRenderer.getLinkWidget(displayText, listener, href, false);
 
             return link;
         }

openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/experiment/ProjectSelectionTreeGridContainer.java

@@ -220,7 +220,7 @@ public final class ProjectSelectionTreeGridContainer extends LayoutContainer imp
                     final Widget detailsLink =
                             LinkRenderer.getLinkWidget(viewContext
                                     .getMessage(Dict.PROJECT_SELECTOR_DETAILS_LINK_LABEL),
-                                    listener, false, href != null ? "#" + href : null);
+                                    listener, href);
                     detailsLink.setTitle(viewContext
                             .getMessage(Dict.PROJECT_SELECTOR_DETAILS_LINK_TOOLTIP));
                     projectLinks.put(project, detailsLink);