summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorshawn.f.cook2011-10-24 11:43:57 (EDT)
committerRoberto E. Escobar2011-10-24 11:43:57 (EDT)
commitfd9ba4647a073ddcdba424a98a83b0bc2a3f28da (patch)
treeedd115edb47b2540abc14f462904b4946a0a655b
parenta62c2ae8a0ab88ff532b34e08c45ea26b0639160 (diff)
downloadorg.eclipse.osee-fd9ba4647a073ddcdba424a98a83b0bc2a3f28da.zip
org.eclipse.osee-fd9ba4647a073ddcdba424a98a83b0bc2a3f28da.tar.gz
org.eclipse.osee-fd9ba4647a073ddcdba424a98a83b0bc2a3f28da.tar.bz2
feature[ats_E6W8N]: Update buildCombo and ArtView art name link
-rw-r--r--plugins/org.eclipse.osee.ats.presenter.mock/src/org/eclipse/osee/ats/presenter/mock/internal/MockAtsWebSearchPresenter.java12
-rw-r--r--plugins/org.eclipse.osee.ats.view.web/src/org/eclipse/osee/ats/view/web/components/AtsSearchHeaderImpl.java4
-rw-r--r--plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/components/OseeArtifactNameLinkComponent.java2
3 files changed, 10 insertions, 8 deletions
diff --git a/plugins/org.eclipse.osee.ats.presenter.mock/src/org/eclipse/osee/ats/presenter/mock/internal/MockAtsWebSearchPresenter.java b/plugins/org.eclipse.osee.ats.presenter.mock/src/org/eclipse/osee/ats/presenter/mock/internal/MockAtsWebSearchPresenter.java
index 43fc57c..c20912d 100644
--- a/plugins/org.eclipse.osee.ats.presenter.mock/src/org/eclipse/osee/ats/presenter/mock/internal/MockAtsWebSearchPresenter.java
+++ b/plugins/org.eclipse.osee.ats.presenter.mock/src/org/eclipse/osee/ats/presenter/mock/internal/MockAtsWebSearchPresenter.java
@@ -150,7 +150,7 @@ public class MockAtsWebSearchPresenter<T extends AtsSearchHeaderComponent, K ext
ViewId program, build;
program = getProgramWithGuid(params.get(UrlParamNameConstants.PARAMNAME_PROGRAM));
- build = getBuildWithGuid(UrlParamNameConstants.PARAMNAME_BUILD);
+ build = getBuildWithGuid(params.get(UrlParamNameConstants.PARAMNAME_BUILD));
String nameOnlyStr = params.get(UrlParamNameConstants.PARAMNAME_NAMEONLY);
String verboseStr = params.get(UrlParamNameConstants.PARAMNAME_SHOWVERBOSE);
Boolean nameOnly = false;
@@ -172,10 +172,12 @@ public class MockAtsWebSearchPresenter<T extends AtsSearchHeaderComponent, K ext
@Override
public void selectArtifact(String url, ViewArtifact artifact, SearchNavigator oseeNavigator) {
- Map<String, String> params = new HashMap<String, String>();
- params.put("artifact", artifact.getGuid());
- String newurl = parameterMapToRequestString(params, url);
- oseeNavigator.navigateArtifactPage(newurl);
+ if (url != null && artifact != null && oseeNavigator != null) {
+ Map<String, String> params = new HashMap<String, String>();
+ params.put("artifact", artifact.getGuid());
+ String newurl = parameterMapToRequestString(params, url);
+ oseeNavigator.navigateArtifactPage(newurl);
+ }
}
@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 ddc2ef1..7aa6441 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
@@ -214,9 +214,9 @@ public class AtsSearchHeaderImpl extends OseeSearchHeaderComponent implements At
public void setSearchCriteria(AtsSearchParameters params) {
if (params != null) {
if (programCombo != null) {
- lockProgramCombo = true;
+ // lockProgramCombo = true;
programCombo.setValue(params.getProgram());
- lockProgramCombo = false;
+ // lockProgramCombo = false;
}
if (buildCombo != null) {
buildCombo.setValue(params.getBuild());
diff --git a/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/components/OseeArtifactNameLinkComponent.java b/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/components/OseeArtifactNameLinkComponent.java
index 09f2580..e2be2d7 100644
--- a/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/components/OseeArtifactNameLinkComponent.java
+++ b/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/components/OseeArtifactNameLinkComponent.java
@@ -48,7 +48,7 @@ public class OseeArtifactNameLinkComponent extends HorizontalLayout {
if (app != null) {
url = app.getRequestedDataId();
}
- searchPresenter.selectArtifact(url, artifact, navigator);
+ searchPresenter.selectArtifact(url, OseeArtifactNameLinkComponent.this.artifact, navigator);
}
});
}