diff options
author | jmisinco | 2011-10-24 19:04:43 +0000 |
---|---|---|
committer | Roberto E. Escobar | 2011-10-24 19:04:43 +0000 |
commit | 173abc5c33fb43fe4fe1ef25eee58cd246918257 (patch) | |
tree | 46a51c1fba2d5c96d35f5d9680e6e272a6be0ae9 /plugins/org.eclipse.osee.ats.view.web | |
parent | fd9ba4647a073ddcdba424a98a83b0bc2a3f28da (diff) | |
download | org.eclipse.osee-173abc5c33fb43fe4fe1ef25eee58cd246918257.tar.gz org.eclipse.osee-173abc5c33fb43fe4fe1ef25eee58cd246918257.tar.xz org.eclipse.osee-173abc5c33fb43fe4fe1ef25eee58cd246918257.zip |
feature[ats_E6W8N]: Implement DisplayOptions interface
Diffstat (limited to 'plugins/org.eclipse.osee.ats.view.web')
4 files changed, 51 insertions, 24 deletions
diff --git a/plugins/org.eclipse.osee.ats.view.web/src/org/eclipse/osee/ats/view/web/AtsUiApplication.java b/plugins/org.eclipse.osee.ats.view.web/src/org/eclipse/osee/ats/view/web/AtsUiApplication.java index 5453996c670..7b5fff5a218 100644 --- a/plugins/org.eclipse.osee.ats.view.web/src/org/eclipse/osee/ats/view/web/AtsUiApplication.java +++ b/plugins/org.eclipse.osee.ats.view.web/src/org/eclipse/osee/ats/view/web/AtsUiApplication.java @@ -22,10 +22,13 @@ import com.vaadin.ui.Window; * @author Shawn F. Cook */ @SuppressWarnings("serial") -public class AtsUiApplication extends OseeUiApplication<AtsSearchHeaderComponent, AtsSearchParameters> { +public class AtsUiApplication<T extends AtsSearchHeaderComponent, K extends AtsSearchParameters> extends OseeUiApplication<T, K> { - public AtsUiApplication(AtsSearchPresenter<AtsSearchHeaderComponent, AtsSearchParameters> searchPresenter) { + AtsSearchPresenter<T, K> atsSearchPresenter; + + public AtsUiApplication(AtsSearchPresenter<T, K> searchPresenter) { super(searchPresenter); + atsSearchPresenter = searchPresenter; } @Override @@ -49,14 +52,15 @@ public class AtsUiApplication extends OseeUiApplication<AtsSearchHeaderComponent return nav; } - public AtsSearchPresenter<AtsSearchHeaderComponent, AtsSearchParameters> getAtsWebSearchPresenter() { - AtsSearchPresenter<AtsSearchHeaderComponent, AtsSearchParameters> pres = null; - if (searchPresenter instanceof AtsSearchPresenter<?, ?>) { - pres = (AtsSearchPresenter<AtsSearchHeaderComponent, AtsSearchParameters>) searchPresenter; - } else { - System.out.println("AtsUiApplication.getAtsWebSearchPresenter() - CRITICAL ERROR: cast threw an exception."); - } - return pres; + public AtsSearchPresenter<T, K> getAtsWebSearchPresenter() { + return atsSearchPresenter; + // AtsSearchPresenter<T, K> pres = null; + // if (searchPresenter instanceof AtsSearchPresenter<?, ?>) { + // pres = (AtsSearchPresenter<AtsSearchHeaderComponent, AtsSearchParameters>) searchPresenter; + // } else { + // System.out.println("AtsUiApplication.getAtsWebSearchPresenter() - CRITICAL ERROR: cast threw an exception."); + // } + // return pres; } @Override diff --git a/plugins/org.eclipse.osee.ats.view.web/src/org/eclipse/osee/ats/view/web/components/AtsSearchHeaderImpl.java b/plugins/org.eclipse.osee.ats.view.web/src/org/eclipse/osee/ats/view/web/components/AtsSearchHeaderImpl.java index 7aa64411d1b..8b003772fd4 100644 --- a/plugins/org.eclipse.osee.ats.view.web/src/org/eclipse/osee/ats/view/web/components/AtsSearchHeaderImpl.java +++ b/plugins/org.eclipse.osee.ats.view.web/src/org/eclipse/osee/ats/view/web/components/AtsSearchHeaderImpl.java @@ -51,6 +51,7 @@ public class AtsSearchHeaderImpl extends OseeSearchHeaderComponent implements At private final ComboBox buildCombo = new ComboBox("Build:"); private final CheckBox nameOnlyCheckBox = new CheckBox("Name Only", true); private final TextField searchTextField = new TextField(); + private final Button searchButton = new Button("Search"); private AtsSearchPresenter searchPresenter; private AtsNavigator navigator; private boolean lockProgramCombo = false; @@ -71,6 +72,16 @@ public class AtsSearchHeaderImpl extends OseeSearchHeaderComponent implements At isLayoutComplete = true; } + private void validateSearchAndEnableSearchButton() { + ViewId program = (ViewId) programCombo.getValue(); + ViewId build = (ViewId) buildCombo.getValue(); + if (program != null && build != null) { + searchButton.setEnabled(true); + } else { + searchButton.setEnabled(false); + } + } + private void selectProgram() { if (programCombo != null) { ViewId program = (ViewId) programCombo.getValue(); @@ -87,28 +98,40 @@ public class AtsSearchHeaderImpl extends OseeSearchHeaderComponent implements At if (!lockProgramCombo) { selectProgram(); } + validateSearchAndEnableSearchButton(); } }); programCombo.setImmediate(true); + + buildCombo.addListener(new Property.ValueChangeListener() { + @Override + public void valueChange(ValueChangeEvent event) { + validateSearchAndEnableSearchButton(); + } + }); + buildCombo.setImmediate(true); } if (buildCombo != null) { buildCombo.setNullSelectionAllowed(false); } searchTextField.setImmediate(true); + validateSearchAndEnableSearchButton(); } protected void selectSearch() { - if (searchPresenter != null && programCombo != null && buildCombo != null && nameOnlyCheckBox != null && searchTextField != null) { - ViewId program = (ViewId) programCombo.getValue(); - ViewId build = (ViewId) buildCombo.getValue(); - boolean nameOnly = nameOnlyCheckBox.toString().equalsIgnoreCase("true"); - String searchPhrase = (String) searchTextField.getValue(); - AtsSearchParameters params = new AtsSearchParameters(searchPhrase, nameOnly, null, build, program); - OseeUiApplication app = (OseeUiApplication) getApplication(); - searchPresenter.selectSearch(app.getRequestedDataId(), params, navigator); - } else { - System.out.println("AtsSearchHeaderComponent.selectSearch - WARNING: null value detected."); + if (searchButton.isEnabled()) { + if (searchPresenter != null && programCombo != null && buildCombo != null && nameOnlyCheckBox != null && searchTextField != null) { + ViewId program = (ViewId) programCombo.getValue(); + ViewId build = (ViewId) buildCombo.getValue(); + boolean nameOnly = nameOnlyCheckBox.toString().equalsIgnoreCase("true"); + String searchPhrase = (String) searchTextField.getValue(); + AtsSearchParameters params = new AtsSearchParameters(searchPhrase, nameOnly, build, program); + OseeUiApplication app = (OseeUiApplication) getApplication(); + searchPresenter.selectSearch(app.getRequestedDataId(), params, navigator); + } else { + System.out.println("AtsSearchHeaderComponent.selectSearch - WARNING: null value detected."); + } } } @@ -134,7 +157,7 @@ public class AtsSearchHeaderImpl extends OseeSearchHeaderComponent implements At Label hSpacer_SearchTextBtn = new Label(""); hSpacer_SearchTextBtn.setHeight(null); hSpacer_SearchTextBtn.setWidth(30, UNITS_PIXELS); - Button searchButton = new Button("Search", new Button.ClickListener() { + searchButton.addListener(new Button.ClickListener() { @Override public void buttonClick(Button.ClickEvent event) { selectSearch(); diff --git a/plugins/org.eclipse.osee.ats.view.web/src/org/eclipse/osee/ats/view/web/search/AtsArtifactView.java b/plugins/org.eclipse.osee.ats.view.web/src/org/eclipse/osee/ats/view/web/search/AtsArtifactView.java index 1eaf70c7b9a..c046f27a01c 100644 --- a/plugins/org.eclipse.osee.ats.view.web/src/org/eclipse/osee/ats/view/web/search/AtsArtifactView.java +++ b/plugins/org.eclipse.osee.ats.view.web/src/org/eclipse/osee/ats/view/web/search/AtsArtifactView.java @@ -32,7 +32,7 @@ public class AtsArtifactView extends OseeArtifactView { @Override protected void callInit(String url) { - searchPresenter.initArtifactPage(url, searchHeader, this, relationsComp, attributeComp); + searchPresenter.initArtifactPage(url, searchHeader, this, relationsComp, attributeComp, null); } } diff --git a/plugins/org.eclipse.osee.ats.view.web/src/org/eclipse/osee/ats/view/web/search/AtsSearchResultsView.java b/plugins/org.eclipse.osee.ats.view.web/src/org/eclipse/osee/ats/view/web/search/AtsSearchResultsView.java index ac0b19e83ca..c7c6b0af852 100644 --- a/plugins/org.eclipse.osee.ats.view.web/src/org/eclipse/osee/ats/view/web/search/AtsSearchResultsView.java +++ b/plugins/org.eclipse.osee.ats.view.web/src/org/eclipse/osee/ats/view/web/search/AtsSearchResultsView.java @@ -20,7 +20,7 @@ import org.eclipse.osee.display.view.web.search.OseeSearchResultsView; @SuppressWarnings("serial") public class AtsSearchResultsView extends OseeSearchResultsView { - private boolean isLayoutComplete = false; + private final boolean isLayoutComplete = false; @Override protected void initComponents() { @@ -35,6 +35,6 @@ public class AtsSearchResultsView extends OseeSearchResultsView { @Override protected void callInit(String url) { - searchPresenter.initSearchResults(url, searchHeader, searchResultsListComponent); + searchPresenter.initSearchResults(url, searchHeader, searchResultsListComponent, null); } } |