diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/AbstractTabItemFactory.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/AbstractTabItemFactory.java
index 109c7351b246235f7180c1c86b31827db123338c..8809ab0e52fc477b09c9bac1eb07a95501d74533 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/AbstractTabItemFactory.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/AbstractTabItemFactory.java
@@ -48,6 +48,9 @@ public abstract class AbstractTabItemFactory
/**
* Returns a short description of contents of the tab that can be used in tab or page title.
+ * <p>
+ * NOTE: implementation has been changed such that it is used only internally and page title is
+ * always exactly the same as the tab title.
*/
public abstract String getTabTitle();
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/ComponentProvider.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/ComponentProvider.java
index 45d21d8d6d75a8b067fb9a0f6d3545a6e03250df..966c2fc242bb58a9e57c2fc2cc42bf78f35564c2 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/ComponentProvider.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/ComponentProvider.java
@@ -114,7 +114,7 @@ public final class ComponentProvider
IDisposableComponent browser =
SampleBrowserGrid.create(viewContext, initialGroupOrNull,
initialSampleTypeOrNull);
- return createTab(getMessage(Dict.SAMPLE_BROWSER), browser);
+ return createTab(getTabTitle(), browser);
}
@Override
@@ -132,16 +132,8 @@ public final class ComponentProvider
@Override
public String getTabTitle()
{
- StringBuilder sb = new StringBuilder();
- if (initialGroupOrNull != null)
- {
- sb.append(getMessage(Dict.GROUP) + "=" + initialGroupOrNull);
- }
- if (initialSampleTypeOrNull != null)
- {
- sb.append("type=" + initialSampleTypeOrNull);
- }
- return getMessage(Dict.SAMPLE_BROWSER) + " " + sb.toString();
+
+ return getMessage(Dict.SAMPLE_BROWSER);
}
};
}
@@ -166,7 +158,7 @@ public final class ComponentProvider
IDisposableComponent browser =
MaterialBrowserGrid.createWithTypeChooser(viewContext,
initialMaterialTypeOrNull);
- return createTab(getMessage(Dict.MATERIAL_BROWSER), browser);
+ return createTab(getTabTitle(), browser);
}
@Override
@@ -184,12 +176,7 @@ public final class ComponentProvider
@Override
public String getTabTitle()
{
- StringBuilder sb = new StringBuilder();
- if (initialMaterialTypeOrNull != null)
- {
- sb.append("type=" + initialMaterialTypeOrNull);
- }
- return getMessage(Dict.MATERIAL_BROWSER) + " " + sb.toString();
+ return getMessage(Dict.MATERIAL_BROWSER);
}
};
@@ -680,7 +667,6 @@ public final class ComponentProvider
return new HelpPageIdentifier(HelpPageDomain.EXPERIMENT, HelpPageAction.BROWSE);
}
- // FIXME
@Override
public String getTabTitle()
{
@@ -870,7 +856,6 @@ public final class ComponentProvider
return new HelpPageIdentifier(HelpPageDomain.DATA_SET, HelpPageAction.SEARCH);
}
- // FIXME
@Override
public String getTabTitle()
{
@@ -902,7 +887,6 @@ public final class ComponentProvider
return new HelpPageIdentifier(HelpPageDomain.SAMPLE, HelpPageAction.SEARCH);
}
- // FIXME
@Override
public String getTabTitle()
{
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/DefaultTabItem.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/DefaultTabItem.java
index e9742b9e71a9fa713f9353387831e07ab4536fc7..221c6978b21a7e6da430ada29b37e59feae281be 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/DefaultTabItem.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/DefaultTabItem.java
@@ -19,7 +19,9 @@ package ch.systemsx.cisd.openbis.generic.client.web.client.application.framework
import com.extjs.gxt.ui.client.widget.Component;
import com.extjs.gxt.ui.client.widget.ContentPanel;
import com.extjs.gxt.ui.client.widget.Header;
+import com.google.gwt.user.client.Window;
+import ch.systemsx.cisd.openbis.generic.client.web.client.application.CommonViewContext;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.IViewContext;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.grid.IDisposableComponent;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.util.IDelegatedAction;
@@ -150,6 +152,8 @@ public class DefaultTabItem implements ITabItem
{
lastModificationStateUpdaterOrNull.update();
}
+ Window.setTitle(getTabTitleUpdater().getCurrentTitle() + " - "
+ + CommonViewContext.ClientStaticState.getPageTitleSuffix());
}
public void onClose()
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/DispatcherHelper.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/DispatcherHelper.java
index 66a55ecaf1b49e1c8d8e1dca6fe3fbf73df0edce..3a2715792cb0e25b6bee3c21f530ccb825b5bde9 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/DispatcherHelper.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/DispatcherHelper.java
@@ -19,9 +19,6 @@ package ch.systemsx.cisd.openbis.generic.client.web.client.application.framework
import com.extjs.gxt.ui.client.event.EventType;
import com.extjs.gxt.ui.client.mvc.AppEvent;
import com.extjs.gxt.ui.client.mvc.Dispatcher;
-import com.google.gwt.user.client.Window;
-
-import ch.systemsx.cisd.openbis.generic.client.web.client.application.CommonViewContext;
/**
* A helper for using {@link Dispatcher}.
@@ -52,8 +49,6 @@ public final class DispatcherHelper
{
AppEvent event = createEvent(AppEvents.NAVI_EVENT, tabItemFactory);
Dispatcher.get().dispatch(event);
- Window.setTitle(tabItemFactory.getTabTitle() + " "
- + CommonViewContext.ClientStaticState.getPageTitleSuffix());
}
private final static AppEvent createEvent(EventType eventType, Object data)
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/TabTitleUpdater.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/TabTitleUpdater.java
index 564992afdb66aede6113373609d13b7076dbdce0..9bbcb228e73a69a2cf5bb6a90613579502daf4f3 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/TabTitleUpdater.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/TabTitleUpdater.java
@@ -18,6 +18,14 @@ public class TabTitleUpdater
this.title = initialTitle;
}
+ /**
+ * Returns current title of the tab.
+ */
+ String getCurrentTitle()
+ {
+ return title;
+ }
+
/**
* Updates the tab title if binded, stores the title value otherwise.
*/