From abe6ff61656cdaf2ea2ef5dee440117fac517ca5 Mon Sep 17 00:00:00 2001
From: buczekp <buczekp>
Date: Wed, 8 Jun 2011 11:59:46 +0000
Subject: [PATCH] minor: don't show separator if there is only one widget in
breadcrumbs
SVN: 21652
---
.../client/application/ui/AbstractViewer.java | 18 ++++++++++++++++--
1 file changed, 16 insertions(+), 2 deletions(-)
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/AbstractViewer.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/AbstractViewer.java
index c94d00f344d..c36674880b2 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/AbstractViewer.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/AbstractViewer.java
@@ -230,9 +230,16 @@ public abstract class AbstractViewer<D extends IEntityInformationHolder> extends
breadcrumbContainer.removeAll();
List<Widget> widgets = new ArrayList<Widget>();
fillBreadcrumbWidgets(widgets);
- for (Widget widget : widgets)
+ if (widgets.size() == 1)
{
- breadcrumbContainer.addBreadcrumb(widget);
+ // add raw widget without separator if there is just one widget
+ breadcrumbContainer.addWidget(widgets.get(0));
+ } else
+ {
+ for (Widget widget : widgets)
+ {
+ breadcrumbContainer.addBreadcrumb(widget);
+ }
}
breadcrumbContainer.layout();
titleLabel.removeStyleName("xtb-text"); // WORKAROUND for consistent style of text
@@ -383,9 +390,16 @@ public abstract class AbstractViewer<D extends IEntityInformationHolder> extends
return tableRowLayout;
}
+ /** adds the <var>widget</var> with a separator prefix to breadcrumbs */
public void addBreadcrumb(Widget widget)
{
add(new Html(SEPARATOR));
+ addWidget(widget);
+ }
+
+ /** adds the <var>widget</var> to breadcrumbs (without separator prefix) */
+ public void addWidget(Widget widget)
+ {
add(widget);
}
--
GitLab