summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorshawn.f.cook2011-10-17 18:45:07 (EDT)
committerRoberto E. Escobar2011-10-17 18:45:07 (EDT)
commitcc0ee91f7a08ceea392255ebfc2989e4903b439f (patch)
treed5ceb13490740535a137054f21cf427980c288c6
parent30060a15b5ab975da3242a16bf21043f3d6c5aae (diff)
downloadorg.eclipse.osee-cc0ee91f7a08ceea392255ebfc2989e4903b439f.zip
org.eclipse.osee-cc0ee91f7a08ceea392255ebfc2989e4903b439f.tar.gz
org.eclipse.osee-cc0ee91f7a08ceea392255ebfc2989e4903b439f.tar.bz2
feature[ats_Q9NLC]: Update selRelTyp( ) method
-rw-r--r--plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/OseeUiApplication.java9
-rw-r--r--plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/components/OseeRelationsComponent.java6
2 files changed, 9 insertions, 6 deletions
diff --git a/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/OseeUiApplication.java b/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/OseeUiApplication.java
index 3cd2ca1..c2769fe 100644
--- a/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/OseeUiApplication.java
+++ b/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/OseeUiApplication.java
@@ -21,13 +21,14 @@ import com.vaadin.Application;
/**
* @author Shawn F. Cook
*/
+@SuppressWarnings("serial")
public class OseeUiApplication extends Application {
protected final SearchNavigator navigator = createNavigator();
- protected SearchPresenter searchPresenter;
+ protected SearchPresenter<?> searchPresenter;
protected SearchHeaderComponent searchHeaderComponent = createSearchHeaderComponent();
- public OseeUiApplication(SearchPresenter searchPresenter) {
+ public OseeUiApplication(SearchPresenter<?> searchPresenter) {
this.searchPresenter = searchPresenter;
}
@@ -46,7 +47,7 @@ public class OseeUiApplication extends Application {
return new OseeNavigator();
}
- protected SearchPresenter createSearchPresenter() {
+ protected SearchPresenter<?> createSearchPresenter() {
return null;
}
@@ -54,7 +55,7 @@ public class OseeUiApplication extends Application {
return navigator;
}
- public SearchPresenter getSearchPresenter() {
+ public SearchPresenter<?> getSearchPresenter() {
return searchPresenter;
}
diff --git a/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/components/OseeRelationsComponent.java b/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/components/OseeRelationsComponent.java
index d6ad087..9dba1bb 100644
--- a/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/components/OseeRelationsComponent.java
+++ b/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/components/OseeRelationsComponent.java
@@ -36,10 +36,11 @@ public class OseeRelationsComponent extends VerticalLayout implements RelationCo
private boolean populated = false;
private final ListSelect relationTypesListSelect = new ListSelect();
private final ListSelect relationsListSelect = new ListSelect();
- private SearchPresenter searchPresenter = null;
+ private SearchPresenter<?> searchPresenter = null;
private SearchNavigator navigator = null;
private boolean lockRelTypesListener = false;
private boolean lockRelsListener = false;
+ private WebArtifact artifact = null;
@Override
public void attach() {
@@ -89,7 +90,7 @@ public class OseeRelationsComponent extends VerticalLayout implements RelationCo
try {
WebId relationType = (WebId) relationTypesListSelect.getValue();
if (relationType != null) {
- searchPresenter.selectRelationType(null, relationType, OseeRelationsComponent.this);
+ searchPresenter.selectRelationType(artifact, relationType, OseeRelationsComponent.this);
}
} catch (Exception e) {
System.out.println("OseeRelationsComponent.createLayout - CRITICAL ERROR: (WebArtifact) relationsListSelect.getValue() threw an exception.");
@@ -195,5 +196,6 @@ public class OseeRelationsComponent extends VerticalLayout implements RelationCo
@Override
public void setArtifact(WebArtifact artifact) {
+ this.artifact = artifact;
}
}