From 0d038ed5dfb1179f67146093194fcfc348ac64ed Mon Sep 17 00:00:00 2001 From: jmisinco Date: Fri, 14 Oct 2011 09:00:28 -0700 Subject: feature[ats_8KF8L]: Initial integration of presenter and view --- .../api/components/ArtifactHeaderComponent.java | 3 +- .../display/api/components/AttributeComponent.java | 3 +- .../api/components/DisplaysErrorComponent.java | 20 ++++++++++++++ .../display/api/components/RelationComponent.java | 5 ++-- .../api/components/SearchHeaderComponent.java | 4 +-- .../api/components/SearchResultComponent.java | 2 +- .../api/components/SearchResultsListComponent.java | 4 +-- .../osee/display/api/search/ArtifactProvider.java | 32 ++++++++++++++++++++++ .../osee/display/api/search/SearchPresenter.java | 2 +- 9 files changed, 60 insertions(+), 15 deletions(-) create mode 100644 plugins/org.eclipse.osee.display.api/src/org/eclipse/osee/display/api/components/DisplaysErrorComponent.java create mode 100644 plugins/org.eclipse.osee.display.api/src/org/eclipse/osee/display/api/search/ArtifactProvider.java (limited to 'plugins/org.eclipse.osee.display.api/src') diff --git a/plugins/org.eclipse.osee.display.api/src/org/eclipse/osee/display/api/components/ArtifactHeaderComponent.java b/plugins/org.eclipse.osee.display.api/src/org/eclipse/osee/display/api/components/ArtifactHeaderComponent.java index f8fd4426c5c..9cf2db928b5 100644 --- a/plugins/org.eclipse.osee.display.api/src/org/eclipse/osee/display/api/components/ArtifactHeaderComponent.java +++ b/plugins/org.eclipse.osee.display.api/src/org/eclipse/osee/display/api/components/ArtifactHeaderComponent.java @@ -15,11 +15,10 @@ import org.eclipse.osee.display.api.data.WebArtifact; /** * @author Shawn F. Cook */ -public interface ArtifactHeaderComponent { +public interface ArtifactHeaderComponent extends DisplaysErrorComponent { void clearAll(); void setArtifact(WebArtifact artifact); - void setErrorMessage(String message); } diff --git a/plugins/org.eclipse.osee.display.api/src/org/eclipse/osee/display/api/components/AttributeComponent.java b/plugins/org.eclipse.osee.display.api/src/org/eclipse/osee/display/api/components/AttributeComponent.java index 0870ba12337..d97556fbcff 100644 --- a/plugins/org.eclipse.osee.display.api/src/org/eclipse/osee/display/api/components/AttributeComponent.java +++ b/plugins/org.eclipse.osee.display.api/src/org/eclipse/osee/display/api/components/AttributeComponent.java @@ -13,11 +13,10 @@ package org.eclipse.osee.display.api.components; /** * @author Shawn F. Cook */ -public interface AttributeComponent { +public interface AttributeComponent extends DisplaysErrorComponent { void clearAll(); void addAttribute(String type, String value); - void setErrorMessage(String message); } diff --git a/plugins/org.eclipse.osee.display.api/src/org/eclipse/osee/display/api/components/DisplaysErrorComponent.java b/plugins/org.eclipse.osee.display.api/src/org/eclipse/osee/display/api/components/DisplaysErrorComponent.java new file mode 100644 index 00000000000..1935d3ea468 --- /dev/null +++ b/plugins/org.eclipse.osee.display.api/src/org/eclipse/osee/display/api/components/DisplaysErrorComponent.java @@ -0,0 +1,20 @@ +/******************************************************************************* + * Copyright (c) 2011 Boeing. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Boeing - initial API and implementation + *******************************************************************************/ +package org.eclipse.osee.display.api.components; + +/** + * @author John Misinco + */ +public interface DisplaysErrorComponent { + + void setErrorMessage(String message); + +} diff --git a/plugins/org.eclipse.osee.display.api/src/org/eclipse/osee/display/api/components/RelationComponent.java b/plugins/org.eclipse.osee.display.api/src/org/eclipse/osee/display/api/components/RelationComponent.java index 97d36e68406..01fa818fbba 100644 --- a/plugins/org.eclipse.osee.display.api/src/org/eclipse/osee/display/api/components/RelationComponent.java +++ b/plugins/org.eclipse.osee.display.api/src/org/eclipse/osee/display/api/components/RelationComponent.java @@ -16,7 +16,7 @@ import org.eclipse.osee.display.api.data.WebId; /** * @author Shawn F. Cook */ -public interface RelationComponent { +public interface RelationComponent extends DisplaysErrorComponent { void clearAll(); @@ -26,5 +26,4 @@ public interface RelationComponent { void addRelation(WebArtifact id); - void setErrorMessage(String message); -} +} \ No newline at end of file diff --git a/plugins/org.eclipse.osee.display.api/src/org/eclipse/osee/display/api/components/SearchHeaderComponent.java b/plugins/org.eclipse.osee.display.api/src/org/eclipse/osee/display/api/components/SearchHeaderComponent.java index 64fbc9dda74..1e7e5e16b41 100644 --- a/plugins/org.eclipse.osee.display.api/src/org/eclipse/osee/display/api/components/SearchHeaderComponent.java +++ b/plugins/org.eclipse.osee.display.api/src/org/eclipse/osee/display/api/components/SearchHeaderComponent.java @@ -13,10 +13,8 @@ package org.eclipse.osee.display.api.components; /** * @author Shawn F. Cook */ -public interface SearchHeaderComponent { +public interface SearchHeaderComponent extends DisplaysErrorComponent { void clearAll(); - void setErrorMessage(String message); - } diff --git a/plugins/org.eclipse.osee.display.api/src/org/eclipse/osee/display/api/components/SearchResultComponent.java b/plugins/org.eclipse.osee.display.api/src/org/eclipse/osee/display/api/components/SearchResultComponent.java index bf1b490f913..40c63bba0ce 100644 --- a/plugins/org.eclipse.osee.display.api/src/org/eclipse/osee/display/api/components/SearchResultComponent.java +++ b/plugins/org.eclipse.osee.display.api/src/org/eclipse/osee/display/api/components/SearchResultComponent.java @@ -16,7 +16,7 @@ import org.eclipse.osee.display.api.data.WebArtifact; /** * @author Shawn F. Cook */ -public interface SearchResultComponent { +public interface SearchResultComponent extends DisplaysErrorComponent { void setArtifact(WebArtifact artifact); diff --git a/plugins/org.eclipse.osee.display.api/src/org/eclipse/osee/display/api/components/SearchResultsListComponent.java b/plugins/org.eclipse.osee.display.api/src/org/eclipse/osee/display/api/components/SearchResultsListComponent.java index eacf0e97fc7..c48494ef3ee 100644 --- a/plugins/org.eclipse.osee.display.api/src/org/eclipse/osee/display/api/components/SearchResultsListComponent.java +++ b/plugins/org.eclipse.osee.display.api/src/org/eclipse/osee/display/api/components/SearchResultsListComponent.java @@ -13,12 +13,10 @@ package org.eclipse.osee.display.api.components; /** * @author Shawn F. Cook */ -public interface SearchResultsListComponent { +public interface SearchResultsListComponent extends DisplaysErrorComponent { void clearAll(); SearchResultComponent createSearchResult(); - void setErrorMessage(String message); - } diff --git a/plugins/org.eclipse.osee.display.api/src/org/eclipse/osee/display/api/search/ArtifactProvider.java b/plugins/org.eclipse.osee.display.api/src/org/eclipse/osee/display/api/search/ArtifactProvider.java new file mode 100644 index 00000000000..4a7aea021a7 --- /dev/null +++ b/plugins/org.eclipse.osee.display.api/src/org/eclipse/osee/display/api/search/ArtifactProvider.java @@ -0,0 +1,32 @@ +/******************************************************************************* + * Copyright (c) 2011 Boeing. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Boeing - initial API and implementation + *******************************************************************************/ +package org.eclipse.osee.display.api.search; + +import java.util.List; +import org.eclipse.osee.framework.core.data.IArtifactToken; +import org.eclipse.osee.framework.core.data.IOseeBranch; +import org.eclipse.osee.framework.core.exception.OseeCoreException; +import org.eclipse.osee.orcs.data.ReadableArtifact; +import org.eclipse.osee.orcs.data.ReadableAttribute; +import org.eclipse.osee.orcs.search.Match; + +/** + * @author John Misinco + */ +public interface ArtifactProvider { + + ReadableArtifact getArtifactByArtifactToken(IOseeBranch branch, IArtifactToken token) throws OseeCoreException; + + ReadableArtifact getArtifactByGuid(IOseeBranch branch, String guid) throws OseeCoreException; + + List>> getSearchResults(IOseeBranch branch, boolean nameOnly, String searchPhrase) throws OseeCoreException; + +} diff --git a/plugins/org.eclipse.osee.display.api/src/org/eclipse/osee/display/api/search/SearchPresenter.java b/plugins/org.eclipse.osee.display.api/src/org/eclipse/osee/display/api/search/SearchPresenter.java index 67bc352001d..f038c21d18e 100644 --- a/plugins/org.eclipse.osee.display.api/src/org/eclipse/osee/display/api/search/SearchPresenter.java +++ b/plugins/org.eclipse.osee.display.api/src/org/eclipse/osee/display/api/search/SearchPresenter.java @@ -31,6 +31,6 @@ public interface SearchPresenter { void initArtifactPage(String url, T searchHeaderComp, ArtifactHeaderComponent artHeaderComp, RelationComponent relComp, AttributeComponent attrComp); - void selectRelationType(WebId id, RelationComponent relationComponent); + void selectRelationType(WebArtifact artifact, WebId relation, RelationComponent relationComponent); } \ No newline at end of file -- cgit v1.2.3