diff options
Diffstat (limited to 'plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web')
5 files changed, 31 insertions, 3 deletions
diff --git a/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/AbstractCommonView.java b/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/AbstractCommonView.java index 358fdff7156..101384d6e94 100644 --- a/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/AbstractCommonView.java +++ b/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/AbstractCommonView.java @@ -13,6 +13,7 @@ package org.eclipse.osee.display.view.web; import org.eclipse.osee.display.api.search.SearchPresenter; import org.eclipse.osee.display.view.web.components.ComponentUtility; import org.eclipse.osee.display.view.web.components.OseeSearchHeaderComponent; +import org.eclipse.osee.vaadin.widgets.HasViewTitle; import org.eclipse.osee.vaadin.widgets.Navigator; import com.vaadin.Application; import com.vaadin.ui.Alignment; @@ -22,9 +23,9 @@ import com.vaadin.ui.VerticalLayout; * @author Shawn F. Cook */ @SuppressWarnings("serial") -public abstract class AbstractCommonView extends VerticalLayout implements Navigator.View { +public abstract class AbstractCommonView extends VerticalLayout implements Navigator.View, HasViewTitle { - private OseeSearchHeaderComponent searchHeader; + protected OseeSearchHeaderComponent searchHeader; private SearchPresenter searchPresenter; private boolean isLayoutComplete = false; @@ -55,6 +56,7 @@ public abstract class AbstractCommonView extends VerticalLayout implements Navig @Override public final void navigateTo(String requestedDataId) { + ComponentUtility.setUrl(this, requestedDataId); searchPresenter = ComponentUtility.getPresenter(this); initialUrl = requestedDataId; if (searchPresenter != null) { diff --git a/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/components/ComponentUtility.java b/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/components/ComponentUtility.java index 0182804acf2..05a5b121d9e 100644 --- a/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/components/ComponentUtility.java +++ b/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/components/ComponentUtility.java @@ -57,6 +57,13 @@ public final class ComponentUtility { return url; } + public static void setUrl(Component component, String url) { + Application app = component.getApplication(); + if (app instanceof HasUrl) { + ((HasUrl) app).setUrl(url); + } + } + public static SearchPresenter<?, ?> getPresenter(Component component) { SearchPresenter presenter = null; Application app = component.getApplication(); diff --git a/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/components/OseeDisplayOptionsComponentImpl.java b/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/components/OseeDisplayOptionsComponentImpl.java index 75300222eff..ad336dae9b2 100644 --- a/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/components/OseeDisplayOptionsComponentImpl.java +++ b/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/components/OseeDisplayOptionsComponentImpl.java @@ -76,7 +76,7 @@ public class OseeDisplayOptionsComponentImpl extends VerticalLayout implements D String url = ComponentUtility.getUrl(OseeDisplayOptionsComponentImpl.this); SearchNavigator navigator = ComponentUtility.getNavigator(OseeDisplayOptionsComponentImpl.this); - SearchPresenter presenter = ComponentUtility.getPresenter(OseeDisplayOptionsComponentImpl.this); + SearchPresenter<?, ?> presenter = ComponentUtility.getPresenter(OseeDisplayOptionsComponentImpl.this); if (presenter != null) { presenter.selectDisplayOptions(url, options, navigator); } else { diff --git a/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/search/OseeArtifactView.java b/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/search/OseeArtifactView.java index 87b13e00871..a15f615ecba 100644 --- a/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/search/OseeArtifactView.java +++ b/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/search/OseeArtifactView.java @@ -144,4 +144,13 @@ public abstract class OseeArtifactView extends AbstractCommonView implements Art OseeExceptionDialogComponent dlg = new OseeExceptionDialogComponent(msgType, shortMsg, longMsg, getApplication().getMainWindow()); } + + @Override + public String getViewTitle() { + if (this.artifact != null) { + return artifact.getArtifactName(); + } else { + return ""; + } + } } diff --git a/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/search/OseeSearchResultsView.java b/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/search/OseeSearchResultsView.java index 75bb5d85044..2719659d3f0 100644 --- a/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/search/OseeSearchResultsView.java +++ b/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/search/OseeSearchResultsView.java @@ -13,6 +13,7 @@ package org.eclipse.osee.display.view.web.search; import org.eclipse.osee.display.view.web.AbstractCommonView; import org.eclipse.osee.display.view.web.components.OseeLeftMarginContainer; import org.eclipse.osee.display.view.web.components.OseeSearchResultsListComponent; +import org.eclipse.osee.vaadin.widgets.HasViewTitle; /** * @author Shawn F. Cook @@ -34,4 +35,13 @@ public abstract class OseeSearchResultsView extends AbstractCommonView { leftMargContainer.setExpandRatio(searchResultsListComponent, 1.0f); setExpandRatio(leftMargContainer, 1.0f); } + + @Override + public String getViewTitle() { + if (searchHeader != null && searchHeader instanceof HasViewTitle) { + return ((HasViewTitle) searchHeader).getViewTitle(); + } else { + return ""; + } + } } |