Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoberto E. Escobar2014-05-30 17:53:50 -0400
committerRoberto E. Escobar2014-06-04 22:07:25 -0400
commit6b6cd487b312d6a044593e1d3589e9141945c679 (patch)
tree48a36bc6bb23164ac6ea50a1a9a964047cbb4313
parentd162c25947756c30a0f2ed1c0bda2ef22ae1b18b (diff)
downloadorg.eclipse.osee-6b6cd487b312d6a044593e1d3589e9141945c679.tar.gz
org.eclipse.osee-6b6cd487b312d6a044593e1d3589e9141945c679.tar.xz
org.eclipse.osee-6b6cd487b312d6a044593e1d3589e9141945c679.zip
feature[ats_ATS59038]: Delete Vaadin-based Web Search UI
-rw-r--r--features/org.eclipse.osee.x.ats.feature/feature.xml42
-rw-r--r--features/org.eclipse.osee.x.core.feature/feature.xml11
-rw-r--r--plugins/org.eclipse.osee.ats.presenter.mock/.classpath7
-rw-r--r--plugins/org.eclipse.osee.ats.presenter.mock/.project33
-rw-r--r--plugins/org.eclipse.osee.ats.presenter.mock/META-INF/MANIFEST.MF20
-rw-r--r--plugins/org.eclipse.osee.ats.presenter.mock/OSGI-INF/component.xml7
-rw-r--r--plugins/org.eclipse.osee.ats.presenter.mock/build.properties5
-rw-r--r--plugins/org.eclipse.osee.ats.presenter.mock/pom.xml34
-rw-r--r--plugins/org.eclipse.osee.ats.presenter.mock/src/org/eclipse/osee/ats/presenter/mock/MockAtsPresenterFactory.java30
-rw-r--r--plugins/org.eclipse.osee.ats.presenter.mock/src/org/eclipse/osee/ats/presenter/mock/internal/MockAtsWebSearchPresenter.java456
-rw-r--r--plugins/org.eclipse.osee.ats.presenter.test/.classpath7
-rw-r--r--plugins/org.eclipse.osee.ats.presenter.test/.project28
-rw-r--r--plugins/org.eclipse.osee.ats.presenter.test/META-INF/MANIFEST.MF14
-rw-r--r--plugins/org.eclipse.osee.ats.presenter.test/build.properties4
-rw-r--r--plugins/org.eclipse.osee.ats.presenter.test/pom.xml30
-rw-r--r--plugins/org.eclipse.osee.ats.presenter.test/src/org/eclipse/osee/ats/presenter/AtsPresenterTestSuite.java26
-rw-r--r--plugins/org.eclipse.osee.ats.presenter.test/src/org/eclipse/osee/ats/presenter/internal/AtsSearchPresenterTest.java97
-rw-r--r--plugins/org.eclipse.osee.ats.presenter.test/src/org/eclipse/osee/ats/presenter/internal/MockAtsArtifactProvider.java73
-rw-r--r--plugins/org.eclipse.osee.ats.presenter.test/src/org/eclipse/osee/ats/presenter/internal/MockAtsSearchHeaderComponent.java86
-rw-r--r--plugins/org.eclipse.osee.ats.presenter/.classpath7
-rw-r--r--plugins/org.eclipse.osee.ats.presenter/.project33
-rw-r--r--plugins/org.eclipse.osee.ats.presenter/META-INF/MANIFEST.MF29
-rw-r--r--plugins/org.eclipse.osee.ats.presenter/OSGI-INF/ats.presenter.factory.xml10
-rw-r--r--plugins/org.eclipse.osee.ats.presenter/build.properties5
-rw-r--r--plugins/org.eclipse.osee.ats.presenter/pom.xml34
-rw-r--r--plugins/org.eclipse.osee.ats.presenter/src/org/eclipse/osee/ats/presenter/internal/AtsArtifactProviderImpl.java106
-rw-r--r--plugins/org.eclipse.osee.ats.presenter/src/org/eclipse/osee/ats/presenter/internal/AtsPresenterFactoryImpl.java56
-rw-r--r--plugins/org.eclipse.osee.ats.presenter/src/org/eclipse/osee/ats/presenter/internal/AtsSearchPresenterImpl.java214
-rw-r--r--plugins/org.eclipse.osee.ats.ui.api/.classpath7
-rw-r--r--plugins/org.eclipse.osee.ats.ui.api/.project28
-rw-r--r--plugins/org.eclipse.osee.ats.ui.api/META-INF/MANIFEST.MF20
-rw-r--r--plugins/org.eclipse.osee.ats.ui.api/build.properties4
-rw-r--r--plugins/org.eclipse.osee.ats.ui.api/pom.xml34
-rw-r--r--plugins/org.eclipse.osee.ats.ui.api/src/org/eclipse/osee/ats/ui/api/data/AtsSearchParameters.java42
-rw-r--r--plugins/org.eclipse.osee.ats.ui.api/src/org/eclipse/osee/ats/ui/api/search/AtsArtifactProvider.java28
-rw-r--r--plugins/org.eclipse.osee.ats.ui.api/src/org/eclipse/osee/ats/ui/api/search/AtsPresenterFactory.java24
-rw-r--r--plugins/org.eclipse.osee.ats.ui.api/src/org/eclipse/osee/ats/ui/api/search/AtsSearchPresenter.java25
-rw-r--r--plugins/org.eclipse.osee.ats.ui.api/src/org/eclipse/osee/ats/ui/api/view/AtsSearchHeaderComponent.java30
-rw-r--r--plugins/org.eclipse.osee.ats.view.web.test/.classpath7
-rw-r--r--plugins/org.eclipse.osee.ats.view.web.test/.project28
-rw-r--r--plugins/org.eclipse.osee.ats.view.web.test/META-INF/MANIFEST.MF8
-rw-r--r--plugins/org.eclipse.osee.ats.view.web.test/build.properties4
-rw-r--r--plugins/org.eclipse.osee.ats.view.web.test/src/org/eclipse/osee/ats/view/web/placeholder.txt0
-rw-r--r--plugins/org.eclipse.osee.ats.view.web/.classpath7
-rw-r--r--plugins/org.eclipse.osee.ats.view.web/.project33
-rw-r--r--plugins/org.eclipse.osee.ats.view.web/META-INF/MANIFEST.MF20
-rw-r--r--plugins/org.eclipse.osee.ats.view.web/OSGI-INF/ats.ui.app.factory.xml10
-rw-r--r--plugins/org.eclipse.osee.ats.view.web/build.properties5
-rw-r--r--plugins/org.eclipse.osee.ats.view.web/pom.xml34
-rw-r--r--plugins/org.eclipse.osee.ats.view.web/src/org/eclipse/osee/ats/view/web/AtsNavigator.java40
-rw-r--r--plugins/org.eclipse.osee.ats.view.web/src/org/eclipse/osee/ats/view/web/AtsUiApplication.java104
-rw-r--r--plugins/org.eclipse.osee.ats.view.web/src/org/eclipse/osee/ats/view/web/AtsUiApplicationFactory.java71
-rw-r--r--plugins/org.eclipse.osee.ats.view.web/src/org/eclipse/osee/ats/view/web/AtsUiViews.java33
-rw-r--r--plugins/org.eclipse.osee.ats.view.web/src/org/eclipse/osee/ats/view/web/AtsWindow.java110
-rw-r--r--plugins/org.eclipse.osee.ats.view.web/src/org/eclipse/osee/ats/view/web/components/AtsSearchHeaderImpl.java408
-rw-r--r--plugins/org.eclipse.osee.ats.view.web/src/org/eclipse/osee/ats/view/web/search/AtsArtifactView.java34
-rw-r--r--plugins/org.eclipse.osee.ats.view.web/src/org/eclipse/osee/ats/view/web/search/AtsSearchResultsView.java34
-rw-r--r--plugins/org.eclipse.osee.display.api/.classpath7
-rw-r--r--plugins/org.eclipse.osee.display.api/.project28
-rw-r--r--plugins/org.eclipse.osee.display.api/META-INF/MANIFEST.MF17
-rw-r--r--plugins/org.eclipse.osee.display.api/build.properties4
-rw-r--r--plugins/org.eclipse.osee.display.api/pom.xml34
-rw-r--r--plugins/org.eclipse.osee.display.api/src/org/eclipse/osee/display/api/EmailView.java65
-rw-r--r--plugins/org.eclipse.osee.display.api/src/org/eclipse/osee/display/api/components/ArtifactHeaderComponent.java24
-rw-r--r--plugins/org.eclipse.osee.display.api/src/org/eclipse/osee/display/api/components/AttributeComponent.java22
-rw-r--r--plugins/org.eclipse.osee.display.api/src/org/eclipse/osee/display/api/components/DisplayOptionsComponent.java23
-rw-r--r--plugins/org.eclipse.osee.display.api/src/org/eclipse/osee/display/api/components/DisplaysErrorComponent.java24
-rw-r--r--plugins/org.eclipse.osee.display.api/src/org/eclipse/osee/display/api/components/PagingComponent.java35
-rw-r--r--plugins/org.eclipse.osee.display.api/src/org/eclipse/osee/display/api/components/RelationComponent.java37
-rw-r--r--plugins/org.eclipse.osee.display.api/src/org/eclipse/osee/display/api/components/SearchHeaderComponent.java20
-rw-r--r--plugins/org.eclipse.osee.display.api/src/org/eclipse/osee/display/api/components/SearchResultComponent.java27
-rw-r--r--plugins/org.eclipse.osee.display.api/src/org/eclipse/osee/display/api/components/SearchResultsListComponent.java24
-rw-r--r--plugins/org.eclipse.osee.display.api/src/org/eclipse/osee/display/api/data/DisplayOptions.java28
-rw-r--r--plugins/org.eclipse.osee.display.api/src/org/eclipse/osee/display/api/data/SearchResultMatch.java42
-rw-r--r--plugins/org.eclipse.osee.display.api/src/org/eclipse/osee/display/api/data/StyledText.java40
-rw-r--r--plugins/org.eclipse.osee.display.api/src/org/eclipse/osee/display/api/data/ViewArtifact.java129
-rw-r--r--plugins/org.eclipse.osee.display.api/src/org/eclipse/osee/display/api/data/ViewId.java35
-rw-r--r--plugins/org.eclipse.osee.display.api/src/org/eclipse/osee/display/api/data/ViewRelationType.java28
-rw-r--r--plugins/org.eclipse.osee.display.api/src/org/eclipse/osee/display/api/data/ViewSearchParameters.java34
-rw-r--r--plugins/org.eclipse.osee.display.api/src/org/eclipse/osee/display/api/search/ArtifactProvider.java46
-rw-r--r--plugins/org.eclipse.osee.display.api/src/org/eclipse/osee/display/api/search/AsyncSearchListener.java28
-rw-r--r--plugins/org.eclipse.osee.display.api/src/org/eclipse/osee/display/api/search/SearchNavigator.java21
-rw-r--r--plugins/org.eclipse.osee.display.api/src/org/eclipse/osee/display/api/search/SearchPresenter.java43
-rw-r--r--plugins/org.eclipse.osee.display.api/src/org/eclipse/osee/display/api/search/SearchProgressListener.java25
-rw-r--r--plugins/org.eclipse.osee.display.api/src/org/eclipse/osee/display/api/search/SearchProgressProvider.java22
-rw-r--r--plugins/org.eclipse.osee.display.mvp.test/.classpath7
-rw-r--r--plugins/org.eclipse.osee.display.mvp.test/.project28
-rw-r--r--plugins/org.eclipse.osee.display.mvp.test/META-INF/MANIFEST.MF11
-rw-r--r--plugins/org.eclipse.osee.display.mvp.test/build.properties4
-rw-r--r--plugins/org.eclipse.osee.display.mvp.test/pom.xml37
-rw-r--r--plugins/org.eclipse.osee.display.mvp.test/src/org/eclipse/osee/display/mvp/MvpTestSuite.java24
-rw-r--r--plugins/org.eclipse.osee.display.mvp.test/src/org/eclipse/osee/display/mvp/internal/EventBusRegistryTest.java58
-rw-r--r--plugins/org.eclipse.osee.display.mvp.test/src/org/eclipse/osee/display/mvp/internal/MvpInternalTestSuite.java23
-rw-r--r--plugins/org.eclipse.osee.display.mvp.test/src/org/eclipse/osee/display/mvp/internal/PresenterServiceFactoryTest.java109
-rw-r--r--plugins/org.eclipse.osee.display.mvp.test/src/org/eclipse/osee/display/mvp/mocks/EventBus1.java30
-rw-r--r--plugins/org.eclipse.osee.display.mvp.test/src/org/eclipse/osee/display/mvp/mocks/EventMessage.java39
-rw-r--r--plugins/org.eclipse.osee.display.mvp.test/src/org/eclipse/osee/display/mvp/mocks/MockLog.java119
-rw-r--r--plugins/org.eclipse.osee.display.mvp.test/src/org/eclipse/osee/display/mvp/mocks/Presenter1.java44
-rw-r--r--plugins/org.eclipse.osee.display.mvp.test/src/org/eclipse/osee/display/mvp/mocks/Presenter2.java46
-rw-r--r--plugins/org.eclipse.osee.display.mvp.test/src/org/eclipse/osee/display/mvp/mocks/View1.java41
-rw-r--r--plugins/org.eclipse.osee.display.mvp.test/src/org/eclipse/osee/display/mvp/mocks/View2.java40
-rw-r--r--plugins/org.eclipse.osee.display.mvp/.classpath7
-rw-r--r--plugins/org.eclipse.osee.display.mvp/.project33
-rw-r--r--plugins/org.eclipse.osee.display.mvp/META-INF/MANIFEST.MF16
-rw-r--r--plugins/org.eclipse.osee.display.mvp/OSGI-INF/presenter.service.factory.impl.xml10
-rw-r--r--plugins/org.eclipse.osee.display.mvp/build.properties5
-rw-r--r--plugins/org.eclipse.osee.display.mvp/pom.xml34
-rw-r--r--plugins/org.eclipse.osee.display.mvp/src/org/eclipse/osee/display/mvp/BindException.java34
-rw-r--r--plugins/org.eclipse.osee.display.mvp/src/org/eclipse/osee/display/mvp/CustomMessageType.java75
-rw-r--r--plugins/org.eclipse.osee.display.mvp/src/org/eclipse/osee/display/mvp/MessageType.java22
-rw-r--r--plugins/org.eclipse.osee.display.mvp/src/org/eclipse/osee/display/mvp/MessageTypeEnum.java49
-rw-r--r--plugins/org.eclipse.osee.display.mvp/src/org/eclipse/osee/display/mvp/PresenterServiceFactory.java25
-rw-r--r--plugins/org.eclipse.osee.display.mvp/src/org/eclipse/osee/display/mvp/event/EventBus.java18
-rw-r--r--plugins/org.eclipse.osee.display.mvp/src/org/eclipse/osee/display/mvp/event/EventBusRegistry.java23
-rw-r--r--plugins/org.eclipse.osee.display.mvp/src/org/eclipse/osee/display/mvp/event/annotation/EndPoint.java25
-rw-r--r--plugins/org.eclipse.osee.display.mvp/src/org/eclipse/osee/display/mvp/event/annotation/RouteTo.java24
-rw-r--r--plugins/org.eclipse.osee.display.mvp/src/org/eclipse/osee/display/mvp/internal/BaseException.java43
-rw-r--r--plugins/org.eclipse.osee.display.mvp/src/org/eclipse/osee/display/mvp/internal/EventBusRegistryImpl.java67
-rw-r--r--plugins/org.eclipse.osee.display.mvp/src/org/eclipse/osee/display/mvp/internal/EventDispatcher.java115
-rw-r--r--plugins/org.eclipse.osee.display.mvp/src/org/eclipse/osee/display/mvp/internal/PresenterServiceFactoryImpl.java171
-rw-r--r--plugins/org.eclipse.osee.display.mvp/src/org/eclipse/osee/display/mvp/internal/Subscribers.java71
-rw-r--r--plugins/org.eclipse.osee.display.mvp/src/org/eclipse/osee/display/mvp/presenter/AbstractPresenter.java78
-rw-r--r--plugins/org.eclipse.osee.display.mvp/src/org/eclipse/osee/display/mvp/presenter/AbstractPresenterFactory.java40
-rw-r--r--plugins/org.eclipse.osee.display.mvp/src/org/eclipse/osee/display/mvp/presenter/CreatePresenterException.java34
-rw-r--r--plugins/org.eclipse.osee.display.mvp/src/org/eclipse/osee/display/mvp/presenter/Presenter.java41
-rw-r--r--plugins/org.eclipse.osee.display.mvp/src/org/eclipse/osee/display/mvp/presenter/PresenterAnnotationException.java34
-rw-r--r--plugins/org.eclipse.osee.display.mvp/src/org/eclipse/osee/display/mvp/presenter/PresenterFactory.java26
-rw-r--r--plugins/org.eclipse.osee.display.mvp/src/org/eclipse/osee/display/mvp/presenter/PresenterNotFoundException.java34
-rw-r--r--plugins/org.eclipse.osee.display.mvp/src/org/eclipse/osee/display/mvp/presenter/annotation/IsPresenterFor.java28
-rw-r--r--plugins/org.eclipse.osee.display.mvp/src/org/eclipse/osee/display/mvp/view/AbstractView.java58
-rw-r--r--plugins/org.eclipse.osee.display.mvp/src/org/eclipse/osee/display/mvp/view/AbstractViewFactory.java38
-rw-r--r--plugins/org.eclipse.osee.display.mvp/src/org/eclipse/osee/display/mvp/view/CreateViewException.java34
-rw-r--r--plugins/org.eclipse.osee.display.mvp/src/org/eclipse/osee/display/mvp/view/Display.java19
-rw-r--r--plugins/org.eclipse.osee.display.mvp/src/org/eclipse/osee/display/mvp/view/View.java34
-rw-r--r--plugins/org.eclipse.osee.display.mvp/src/org/eclipse/osee/display/mvp/view/ViewFactory.java25
-rw-r--r--plugins/org.eclipse.osee.display.mvp/src/org/eclipse/osee/display/mvp/view/ViewNotFoundException.java34
-rw-r--r--plugins/org.eclipse.osee.display.presenter.mocks/.classpath7
-rw-r--r--plugins/org.eclipse.osee.display.presenter.mocks/.project28
-rw-r--r--plugins/org.eclipse.osee.display.presenter.mocks/META-INF/MANIFEST.MF21
-rw-r--r--plugins/org.eclipse.osee.display.presenter.mocks/build.properties4
-rw-r--r--plugins/org.eclipse.osee.display.presenter.mocks/pom.xml34
-rw-r--r--plugins/org.eclipse.osee.display.presenter.mocks/src/org/eclipse/osee/display/presenter/mocks/MockArtifact.java307
-rw-r--r--plugins/org.eclipse.osee.display.presenter.mocks/src/org/eclipse/osee/display/presenter/mocks/MockArtifactHeaderComponent.java46
-rw-r--r--plugins/org.eclipse.osee.display.presenter.mocks/src/org/eclipse/osee/display/presenter/mocks/MockArtifactProvider.java122
-rw-r--r--plugins/org.eclipse.osee.display.presenter.mocks/src/org/eclipse/osee/display/presenter/mocks/MockAttribute.java69
-rw-r--r--plugins/org.eclipse.osee.display.presenter.mocks/src/org/eclipse/osee/display/presenter/mocks/MockAttributeComponent.java48
-rw-r--r--plugins/org.eclipse.osee.display.presenter.mocks/src/org/eclipse/osee/display/presenter/mocks/MockDisplayOptionsComponent.java31
-rw-r--r--plugins/org.eclipse.osee.display.presenter.mocks/src/org/eclipse/osee/display/presenter/mocks/MockLogger.java95
-rw-r--r--plugins/org.eclipse.osee.display.presenter.mocks/src/org/eclipse/osee/display/presenter/mocks/MockMatch.java63
-rw-r--r--plugins/org.eclipse.osee.display.presenter.mocks/src/org/eclipse/osee/display/presenter/mocks/MockRelationComponent.java110
-rw-r--r--plugins/org.eclipse.osee.display.presenter.mocks/src/org/eclipse/osee/display/presenter/mocks/MockSearchHeaderComponent.java41
-rw-r--r--plugins/org.eclipse.osee.display.presenter.mocks/src/org/eclipse/osee/display/presenter/mocks/MockSearchNavigator.java39
-rw-r--r--plugins/org.eclipse.osee.display.presenter.mocks/src/org/eclipse/osee/display/presenter/mocks/MockSearchPresenter.java28
-rw-r--r--plugins/org.eclipse.osee.display.presenter.mocks/src/org/eclipse/osee/display/presenter/mocks/MockSearchResultComponent.java55
-rw-r--r--plugins/org.eclipse.osee.display.presenter.mocks/src/org/eclipse/osee/display/presenter/mocks/MockSearchResultsListComponent.java61
-rw-r--r--plugins/org.eclipse.osee.display.presenter.test/.classpath7
-rw-r--r--plugins/org.eclipse.osee.display.presenter.test/.project28
-rw-r--r--plugins/org.eclipse.osee.display.presenter.test/META-INF/MANIFEST.MF17
-rw-r--r--plugins/org.eclipse.osee.display.presenter.test/build.properties4
-rw-r--r--plugins/org.eclipse.osee.display.presenter.test/pom.xml37
-rw-r--r--plugins/org.eclipse.osee.display.presenter.test/src/org/eclipse/osee/display/presenter/SearchPresenterTestSuite.java24
-rw-r--r--plugins/org.eclipse.osee.display.presenter.test/src/org/eclipse/osee/display/presenter/UtilityTest.java62
-rw-r--r--plugins/org.eclipse.osee.display.presenter.test/src/org/eclipse/osee/display/presenter/internal/SearchPresenterTest.java316
-rw-r--r--plugins/org.eclipse.osee.display.presenter/.classpath7
-rw-r--r--plugins/org.eclipse.osee.display.presenter/.project28
-rw-r--r--plugins/org.eclipse.osee.display.presenter/META-INF/MANIFEST.MF27
-rw-r--r--plugins/org.eclipse.osee.display.presenter/build.properties4
-rw-r--r--plugins/org.eclipse.osee.display.presenter/pom.xml34
-rw-r--r--plugins/org.eclipse.osee.display.presenter/src/org/eclipse/osee/display/presenter/ArtifactFilter.java72
-rw-r--r--plugins/org.eclipse.osee.display.presenter/src/org/eclipse/osee/display/presenter/ArtifactProviderImpl.java206
-rw-r--r--plugins/org.eclipse.osee.display.presenter/src/org/eclipse/osee/display/presenter/AttributeTypeUtil.java71
-rw-r--r--plugins/org.eclipse.osee.display.presenter/src/org/eclipse/osee/display/presenter/EmailPresenter.java190
-rw-r--r--plugins/org.eclipse.osee.display.presenter/src/org/eclipse/osee/display/presenter/SearchPresenterImpl.java473
-rw-r--r--plugins/org.eclipse.osee.display.presenter/src/org/eclipse/osee/display/presenter/SearchProgressListenerImpl.java51
-rw-r--r--plugins/org.eclipse.osee.display.presenter/src/org/eclipse/osee/display/presenter/Utility.java67
-rw-r--r--plugins/org.eclipse.osee.display.presenter/src/org/eclipse/osee/display/presenter/internal/ArtifactProviderCache.java98
-rw-r--r--plugins/org.eclipse.osee.display.presenter/src/org/eclipse/osee/display/presenter/internal/FilteredArtifactCallable.java69
-rw-r--r--plugins/org.eclipse.osee.display.presenter/src/org/eclipse/osee/display/presenter/internal/FilteredMatchCallable.java46
-rw-r--r--plugins/org.eclipse.osee.display.presenter/src/org/eclipse/osee/display/presenter/internal/FilteredResultSetCallable.java93
-rw-r--r--plugins/org.eclipse.osee.display.presenter/src/org/eclipse/osee/display/presenter/internal/SearchExecutionCallback.java50
-rw-r--r--plugins/org.eclipse.osee.display.presenter/src/org/eclipse/osee/display/presenter/internal/SearchParameters.java56
-rw-r--r--plugins/org.eclipse.osee.display.view.web/.classpath7
-rw-r--r--plugins/org.eclipse.osee.display.view.web/.project33
-rw-r--r--plugins/org.eclipse.osee.display.view.web/META-INF/MANIFEST.MF25
-rw-r--r--plugins/org.eclipse.osee.display.view.web/build.properties5
-rw-r--r--plugins/org.eclipse.osee.display.view.web/pom.xml34
-rw-r--r--plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/AbstractCommonView.java86
-rw-r--r--plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/CssConstants.java72
-rw-r--r--plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/HasLogger.java24
-rw-r--r--plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/HasNavigator.java22
-rw-r--r--plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/HasPresenter.java21
-rw-r--r--plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/HasUrl.java21
-rw-r--r--plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/OseeFooter.java47
-rw-r--r--plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/components/ComponentUtility.java120
-rw-r--r--plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/components/OseeArtifactNameLinkComponent.java103
-rw-r--r--plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/components/OseeAttributeComponent.java96
-rw-r--r--plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/components/OseeBreadcrumbComponent.java77
-rw-r--r--plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/components/OseeDisplayOptionsComponentImpl.java102
-rw-r--r--plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/components/OseeExceptionDialogComponent.java359
-rw-r--r--plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/components/OseeLeftMarginContainer.java34
-rw-r--r--plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/components/OseeLogoLink.java28
-rw-r--r--plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/components/OseePagingComponent.java343
-rw-r--r--plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/components/OseeRelationsComponent.java277
-rw-r--r--plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/components/OseeSearchHeaderComponent.java22
-rw-r--r--plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/components/OseeSearchResultComponent.java173
-rw-r--r--plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/components/OseeSearchResultsListComponent.java272
-rw-r--r--plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/search/OseeArtifactView.java159
-rw-r--r--plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/search/OseeSearchResultsView.java47
-rw-r--r--plugins/org.eclipse.osee.x.ats.parent/pom.xml12
-rw-r--r--plugins/org.eclipse.osee.x.core.parent/pom.xml3
210 files changed, 2 insertions, 11700 deletions
diff --git a/features/org.eclipse.osee.x.ats.feature/feature.xml b/features/org.eclipse.osee.x.ats.feature/feature.xml
index c46e054844..c207ddef29 100644
--- a/features/org.eclipse.osee.x.ats.feature/feature.xml
+++ b/features/org.eclipse.osee.x.ats.feature/feature.xml
@@ -22,41 +22,6 @@
</requires>
<plugin
- id="org.eclipse.osee.display.presenter"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.osee.display.view.web"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.osee.display.api"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.osee.ats.presenter"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.osee.ats.view.web"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
id="org.eclipse.osee.ats.api"
download-size="0"
install-size="0"
@@ -64,13 +29,6 @@
unpack="false"/>
<plugin
- id="org.eclipse.osee.ats.ui.api"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
id="org.eclipse.osee.ats.rest"
download-size="0"
install-size="0"
diff --git a/features/org.eclipse.osee.x.core.feature/feature.xml b/features/org.eclipse.osee.x.core.feature/feature.xml
index bb6fe5cfde..adb9b28299 100644
--- a/features/org.eclipse.osee.x.core.feature/feature.xml
+++ b/features/org.eclipse.osee.x.core.feature/feature.xml
@@ -124,13 +124,6 @@
unpack="false"/>
<plugin
- id="org.eclipse.osee.display.mvp"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
id="org.eclipse.osee.console.admin"
download-size="0"
install-size="0"
@@ -164,14 +157,14 @@
install-size="0"
version="0.0.0"
unpack="false"/>
-
+
<plugin
id="org.eclipse.osee.jaxrs.client"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
-
+
<plugin
id="org.eclipse.osee.account.admin"
download-size="0"
diff --git a/plugins/org.eclipse.osee.ats.presenter.mock/.classpath b/plugins/org.eclipse.osee.ats.presenter.mock/.classpath
deleted file mode 100644
index ad32c83a78..0000000000
--- a/plugins/org.eclipse.osee.ats.presenter.mock/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/org.eclipse.osee.ats.presenter.mock/.project b/plugins/org.eclipse.osee.ats.presenter.mock/.project
deleted file mode 100644
index 4d6cf5c472..0000000000
--- a/plugins/org.eclipse.osee.ats.presenter.mock/.project
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.osee.ats.presenter.mock</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ds.core.builder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/plugins/org.eclipse.osee.ats.presenter.mock/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.ats.presenter.mock/META-INF/MANIFEST.MF
deleted file mode 100644
index 8b4772142d..0000000000
--- a/plugins/org.eclipse.osee.ats.presenter.mock/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,20 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Ats Mock Presenter (Incubation)
-Bundle-SymbolicName: org.eclipse.osee.ats.presenter.mock
-Bundle-Version: 0.17.0.qualifier
-Bundle-Vendor: Eclipse Open System Engineering Environment
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Service-Component: OSGI-INF/*.xml
-Import-Package: org.eclipse.osee.ats.ui.api.data,
- org.eclipse.osee.ats.ui.api.search,
- org.eclipse.osee.ats.ui.api.view,
- org.eclipse.osee.display.api.components,
- org.eclipse.osee.display.api.data,
- org.eclipse.osee.display.api.search,
- org.eclipse.osee.display.presenter,
- org.eclipse.osee.display.presenter.mocks,
- org.eclipse.osee.framework.core.data,
- org.eclipse.osee.framework.core.enums,
- org.eclipse.osee.framework.jdk.core.type,
- org.eclipse.osee.orcs
diff --git a/plugins/org.eclipse.osee.ats.presenter.mock/OSGI-INF/component.xml b/plugins/org.eclipse.osee.ats.presenter.mock/OSGI-INF/component.xml
deleted file mode 100644
index b57b31a2de..0000000000
--- a/plugins/org.eclipse.osee.ats.presenter.mock/OSGI-INF/component.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.eclipse.osee.ats.presenter.mock.MockAtsPresenterFactory">
- <implementation class="org.eclipse.osee.ats.presenter.mock.MockAtsPresenterFactory"/>
- <service>
- <provide interface="org.eclipse.osee.ats.api.search.AtsPresenterFactory"/>
- </service>
-</scr:component>
diff --git a/plugins/org.eclipse.osee.ats.presenter.mock/build.properties b/plugins/org.eclipse.osee.ats.presenter.mock/build.properties
deleted file mode 100644
index c58ea2178c..0000000000
--- a/plugins/org.eclipse.osee.ats.presenter.mock/build.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
- .,\
- OSGI-INF/
diff --git a/plugins/org.eclipse.osee.ats.presenter.mock/pom.xml b/plugins/org.eclipse.osee.ats.presenter.mock/pom.xml
deleted file mode 100644
index a7e932c3f5..0000000000
--- a/plugins/org.eclipse.osee.ats.presenter.mock/pom.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.eclipse.osee</groupId>
- <artifactId>org.eclipse.osee.x.server.parent</artifactId>
- <version>0.17.0-SNAPSHOT</version>
- <relativePath>../../plugins/org.eclipse.osee.x.server.parent</relativePath>
- </parent>
-
- <artifactId>org.eclipse.osee.ats.presenter</artifactId>
- <packaging>eclipse-plugin</packaging>
- <name>OSEE Ats Mock Presenter - (Incubation)</name>
-
- <build>
- <!-- workaround for https://issues.sonatype.org/browse/TYCHO-168 -->
- <resources>
- <resource>
- <directory>src</directory>
- <excludes>
- <exclude>**/*.java</exclude>
- </excludes>
- </resource>
- </resources>
- <plugins>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-source-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
-</project> \ No newline at end of file
diff --git a/plugins/org.eclipse.osee.ats.presenter.mock/src/org/eclipse/osee/ats/presenter/mock/MockAtsPresenterFactory.java b/plugins/org.eclipse.osee.ats.presenter.mock/src/org/eclipse/osee/ats/presenter/mock/MockAtsPresenterFactory.java
deleted file mode 100644
index 8ab59d3e8f..0000000000
--- a/plugins/org.eclipse.osee.ats.presenter.mock/src/org/eclipse/osee/ats/presenter/mock/MockAtsPresenterFactory.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*******************************************************************************
- * 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.ats.presenter.mock;
-
-import org.eclipse.osee.ats.presenter.mock.internal.MockAtsWebSearchPresenter;
-import org.eclipse.osee.ats.ui.api.data.AtsSearchParameters;
-import org.eclipse.osee.ats.ui.api.search.AtsPresenterFactory;
-import org.eclipse.osee.ats.ui.api.search.AtsSearchPresenter;
-import org.eclipse.osee.ats.ui.api.view.AtsSearchHeaderComponent;
-import org.eclipse.osee.orcs.ApplicationContext;
-
-/**
- * @author John R. Misinco
- */
-public class MockAtsPresenterFactory implements AtsPresenterFactory<AtsSearchHeaderComponent, AtsSearchParameters> {
-
- @Override
- public AtsSearchPresenter<AtsSearchHeaderComponent, AtsSearchParameters> createInstance(ApplicationContext context) {
- return new MockAtsWebSearchPresenter<AtsSearchHeaderComponent, AtsSearchParameters>();
- }
-
-}
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
deleted file mode 100644
index a1554e8b43..0000000000
--- a/plugins/org.eclipse.osee.ats.presenter.mock/src/org/eclipse/osee/ats/presenter/mock/internal/MockAtsWebSearchPresenter.java
+++ /dev/null
@@ -1,456 +0,0 @@
-/*******************************************************************************
- * 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.ats.presenter.mock.internal;
-
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
-import org.eclipse.osee.ats.ui.api.data.AtsSearchParameters;
-import org.eclipse.osee.ats.ui.api.search.AtsSearchPresenter;
-import org.eclipse.osee.ats.ui.api.view.AtsSearchHeaderComponent;
-import org.eclipse.osee.display.api.components.ArtifactHeaderComponent;
-import org.eclipse.osee.display.api.components.AttributeComponent;
-import org.eclipse.osee.display.api.components.DisplayOptionsComponent;
-import org.eclipse.osee.display.api.components.DisplaysErrorComponent.MsgType;
-import org.eclipse.osee.display.api.components.RelationComponent;
-import org.eclipse.osee.display.api.components.SearchResultComponent;
-import org.eclipse.osee.display.api.components.SearchResultsListComponent;
-import org.eclipse.osee.display.api.data.DisplayOptions;
-import org.eclipse.osee.display.api.data.SearchResultMatch;
-import org.eclipse.osee.display.api.data.StyledText;
-import org.eclipse.osee.display.api.data.ViewArtifact;
-import org.eclipse.osee.display.api.data.ViewId;
-import org.eclipse.osee.display.api.search.SearchNavigator;
-import org.eclipse.osee.display.presenter.mocks.MockSearchPresenter;
-import org.eclipse.osee.framework.core.enums.CoreAttributeTypes;
-
-/**
- * @author Shawn F. Cook
- */
-public class MockAtsWebSearchPresenter<T extends AtsSearchHeaderComponent, K extends AtsSearchParameters> extends MockSearchPresenter<T, K> implements AtsSearchPresenter<T, K> {
-
- private static final AtsSearchPresenter<AtsSearchHeaderComponent, AtsSearchParameters> atsBackend =
- new MockAtsWebSearchPresenter<AtsSearchHeaderComponent, AtsSearchParameters>();
-
- // *** TEST DATA ***
- ViewId build0 = new ViewId("baseline_guid", "Baseline");
- ViewId build1 = new ViewId("bld_1_guid", "Bld_1");
- ViewId build2 = new ViewId("ftb0_guid", "FTP0");
- ViewId build3 = new ViewId("FTB1_guid", "FTB1");
- ViewId build4 = new ViewId("FTB2_guid", "FTB2");
- ViewId build5 = new ViewId("FTB3_guid", "FTB3");
- ViewId build6 = new ViewId("EB0_guid", "EB0");
- ViewId build7 = new ViewId("EB1_guid", "EB1");
-
- ViewId program0 = new ViewId("blk3_guid", "Blk 3");
- ViewId program1 = new ViewId("v131_guid", "V13.1");
- ViewId program2 = new ViewId("taiwan_guid", "Taiwan");
-
- ViewArtifact defaultroot = new ViewArtifact("defaultHierarchRoot_GUID", "Default Hierarchy Root", "Root Artifact");
- ViewArtifact swreqs = new ViewArtifact("SWReq_GUID", "Software Requirements", "Folder", Arrays.asList(defaultroot),
- new ViewId("branch_id1", "branch_id1"));
- ViewArtifact crewIntreqs = new ViewArtifact("CrewInt_GUID", "Crew Interface", "Folder", Arrays.asList(swreqs,
- defaultroot), new ViewId("branch_id2", "branch_id2"));
- ViewArtifact commSubSysCrewIntreqs = new ViewArtifact("commSubSysCrewInt_GUID",
- "Communication Subsystem Crew Interface", "Heading", Arrays.asList(crewIntreqs, swreqs, defaultroot), new ViewId(
- "branch_id3", "branch_id3"));
- ViewArtifact comm_page_Intreqs = new ViewArtifact("com_page_GUID", "{COM_PAGE}", "Software Requirement",
- Arrays.asList(commSubSysCrewIntreqs, crewIntreqs, swreqs, defaultroot), new ViewId("branch_id4", "branch_id4"));
-
- private final Map<ViewId, Collection<ViewId>> programsAndBuilds = new HashMap<ViewId, Collection<ViewId>>();
- private final Map<String, ViewArtifact> artifacts = new HashMap<String, ViewArtifact>();
-
- public MockAtsWebSearchPresenter() {
- super();
-
- // populate test data
- programsAndBuilds.put(program0, Arrays.asList(build0, build1, build2));
- programsAndBuilds.put(program1, Arrays.asList(build3, build4, build5));
- programsAndBuilds.put(program2, Arrays.asList(build6, build7));
-
- artifacts.put(defaultroot.getGuid(), defaultroot);
- artifacts.put(swreqs.getGuid(), swreqs);
- artifacts.put(crewIntreqs.getGuid(), crewIntreqs);
- artifacts.put(commSubSysCrewIntreqs.getGuid(), commSubSysCrewIntreqs);
- artifacts.put(comm_page_Intreqs.getGuid(), comm_page_Intreqs);
-
- Set<Entry<String, ViewArtifact>> artifactsSet = artifacts.entrySet();
- for (Entry<String, ViewArtifact> entry : artifactsSet) {
- ViewArtifact artifact = entry.getValue();
- artifact.setAttr_Category("B");
- artifact.setAttr_DevAssurLevel("E");
- artifact.setAttr_ImpoParaNum("3.2.1.1");
- artifact.setAttr_Partition("CND, DP, SP, WP");
- artifact.setAttr_QualMethod("Test");
- artifact.setAttr_Subsystm("Communications");
- artifact.setAttr_TechPerfParam("False");
- }
-
- //Generate large data set
- for (int i = 5; i < 150; i++) {
- ViewArtifact art =
- new ViewArtifact(String.format("bulkArt_GUID_%d", i), String.format("Bulk Artifact %d", i),
- "Software Requirement", Arrays.asList(swreqs, defaultroot), new ViewId(String.format("branch_id%d", i),
- String.format("branch_id%d", i)));
- artifacts.put(art.getGuid(), art);
- }
- }
-
- @Override
- public void selectDisplayOptions(final String url, final DisplayOptions options, final SearchNavigator navigator) {
- if (navigator != null && options != null) {
- Map<String, String> parameters = new HashMap<String, String>();
-
- if (options.getVerboseResults() != null) {
- parameters.put(UrlParamNameConstants.PARAMNAME_SHOWVERBOSE, options.getVerboseResults() ? "true" : "false");
- }
-
- if (parameters.size() > 0) {
- String newurl = parameterMapToRequestString(parameters, url);
- navigator.navigateSearchResults(newurl);
- }
- }
- }
-
- @Override
- public void selectCancel() {
- fireSearchCancelledEvent();
- }
-
- @Override
- public void selectSearch(final String url, final K params, final SearchNavigator navigator) {
-
- if (navigator != null && params != null) {
- Map<String, String> parameters = new HashMap<String, String>();
-
- if (params.getProgram() != null) {
- parameters.put(UrlParamNameConstants.PARAMNAME_PROGRAM, params.getProgram().getGuid());
- }
- if (params.getBuild() != null) {
- parameters.put(UrlParamNameConstants.PARAMNAME_BUILD, params.getBuild().getGuid());
- }
- if (params.isNameOnly() != null) {
- parameters.put(UrlParamNameConstants.PARAMNAME_NAMEONLY, params.isNameOnly() ? "true" : "false");
- }
- if (params.getSearchString() != null) {
- parameters.put(UrlParamNameConstants.PARAMNAME_SEARCHPHRASE, params.getSearchString());
- }
- if (parameters.size() > 0) {
- String newurl = parameterMapToRequestString(parameters, url);
- navigator.navigateSearchResults(newurl);
- }
- }
-
- }
-
- private void updateSearchDisplayOptions(String url, DisplayOptionsComponent optionsComp) {
- if (optionsComp != null) {
-
- Map<String, String> params = requestStringToParameterMap(url);
- if (params != null && params.size() > 0) {
- String verboseStr = params.get(UrlParamNameConstants.PARAMNAME_SHOWVERBOSE);
- Boolean verbose = false;
-
- if (verboseStr != null) {
- verbose = verboseStr.equalsIgnoreCase("true");
- }
-
- DisplayOptions options = new DisplayOptions(verbose);
- optionsComp.setDisplayOptions(options);
- }
- }
- }
-
- private void updateSearchHeader(String url, AtsSearchHeaderComponent searchHeaderComp) {
- if (searchHeaderComp != null) {
- searchHeaderComp.clearAll();
- Set<Entry<ViewId, Collection<ViewId>>> entrySet = programsAndBuilds.entrySet();
- if (entrySet != null) {
- for (Entry<ViewId, Collection<ViewId>> entry : entrySet) {
- searchHeaderComp.addProgram(entry.getKey());
- }
- }
-
- Map<String, String> params = requestStringToParameterMap(url);
- if (params != null && params.size() > 0) {
-
- ViewId program, build;
- program = getProgramWithGuid(params.get(UrlParamNameConstants.PARAMNAME_PROGRAM));
- build = getBuildWithGuid(params.get(UrlParamNameConstants.PARAMNAME_BUILD));
- String nameOnlyStr = params.get(UrlParamNameConstants.PARAMNAME_NAMEONLY);
- Boolean nameOnly = false;
- if (nameOnlyStr != null) {
- nameOnly = nameOnlyStr.equalsIgnoreCase("true");
- }
-
- AtsSearchParameters atsParams =
- new AtsSearchParameters(params.get(UrlParamNameConstants.PARAMNAME_SEARCHPHRASE), nameOnly, build,
- program);
- searchHeaderComp.setSearchCriteria(atsParams);
- }
- }
- }
-
- @Override
- public void selectArtifact(String url, ViewArtifact artifact, SearchNavigator oseeNavigator) {
- 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
- public void initArtifactPage(String url, T searchHeaderComp, ArtifactHeaderComponent artHeaderComp, RelationComponent relComp, AttributeComponent attrComp, DisplayOptionsComponent options) {
- updateSearchHeader(url, searchHeaderComp);
- updateSearchDisplayOptions(url, options);
- artHeaderComp.clearAll();
- Map<String, String> params = requestStringToParameterMap(url);
- if (params != null && params.size() > 0) {
- String artGuid = params.get(UrlParamNameConstants.PARAMNAME_ARTIFACT);
- if (artGuid != null && !artGuid.isEmpty()) {
- ViewArtifact artifact = artifacts.get(artGuid);
- if (artifact != null) {
- artHeaderComp.setArtifact(artifact);
-
- relComp.clearAll();
- ViewId hierRelationType = new ViewId("guid1", "Default Hierarchy");
- ViewId swReqRelationType = new ViewId("guid3", "Traceability");
- relComp.addRelationType(hierRelationType);
- relComp.addRelationType(swReqRelationType);
-
- attrComp.clearAll();
- attrComp.addAttribute(CoreAttributeTypes.Category.getName(), "B");
- attrComp.addAttribute(CoreAttributeTypes.DevelopmentAssuranceLevel.getName(), "E");
- attrComp.addAttribute(CoreAttributeTypes.ParagraphNumber.getName(), "3.2.1.1");
- attrComp.addAttribute(CoreAttributeTypes.Partition.getName(), "CND");
- attrComp.addAttribute(CoreAttributeTypes.QualificationMethod.getName(), "Test");
- attrComp.addAttribute(CoreAttributeTypes.Subsystem.getName(), "Communications");
- attrComp.addAttribute(CoreAttributeTypes.TechnicalPerformanceParameter.getName(), "False");
- attrComp.addAttribute(
- CoreAttributeTypes.WordTemplateContent.getName(),
- "Type: Graphic Format (Location): {MAP_overlay_UIG} {FLIGHT_UIG} {WEAPON_UIG} Local Data Definition: [{RF_HANDOVER_TARGET}.DELTA_NORTH_BETWEEN_AIRCRAFT]: (floating point number) meters Mode: North_Dist returned from {FIND_NORTH_EAST_DIST_BETWEEN_TWO_POINTS}( [RFHO_DATA.RFHO_R_LAT_(MSW,LSW)]LM -> Pt1.Lat, [RFHO_DATA.RFHO_R_LONG_(MSW,LSW)]LM -> Pt1.Long, [.AIRCRAFT_LATITUDE] -> Pt2.Lat, [.AIRCRAFT_LONGITUDE] -> Pt2.Long)");
- } else {
- artHeaderComp.setErrorMessage("No artifact found with ID:" + artGuid, "[no more information]",
- MsgType.MSGTYPE_WARNING);
- }
- }
- }
- }
-
- @Override
- public void selectRelationType(ViewArtifact artifact, ViewId relation, RelationComponent relationComponent) {
- if (relationComponent != null && relation != null) {
- relationComponent.clearRelations();
- String relGuid = relation.getGuid();
- if (relGuid.equals("guid1")) {
- //Default Hierarchy
- relationComponent.addLeftRelated(crewIntreqs);
- relationComponent.addRightRelated(commSubSysCrewIntreqs);
- relationComponent.setLeftName("Parent");
- relationComponent.setRightName("Child");
- }
-
- if (relGuid.equals("guid3")) {
- //Default Hierarchy
- relationComponent.addLeftRelated(null);
- relationComponent.setLeftName(null);
- relationComponent.setRightName("SW Requirement");
- Set<Entry<String, ViewArtifact>> entrySet = artifacts.entrySet();
- for (Entry<String, ViewArtifact> entry : entrySet) {
- ViewArtifact art = entry.getValue();
- relationComponent.addRightRelated(art);
- }
- }
- }
- }
-
- public static AtsSearchPresenter<?, ?> getInstance() {
- return atsBackend;
- }
-
- @Override
- public void selectProgram(ViewId program, T headerComponent) {
- if (program != null && headerComponent != null) {
- Collection<ViewId> builds = programsAndBuilds.get(program);
- headerComponent.clearBuilds();
- if (builds != null) {
- for (ViewId build : builds) {
- headerComponent.addBuild(build);
- }
- // headerComponent.setBuild(builds.iterator().next());
- }
- }
- }
-
- @Override
- public void initSearchResults(final String url, final T searchHeaderComp, final SearchResultsListComponent searchResultsComp, final DisplayOptionsComponent options) {
- fireSearchInProgressEvent();
-
- Thread thread = new Thread(new Runnable() {
- @Override
- public void run() {
-
- updateSearchHeader(url, searchHeaderComp);
- updateSearchDisplayOptions(url, options);
-
- if (searchResultsComp != null) {
- String searchPhrase = "";
- boolean nameOnly = false;
- boolean verbose = false;
- Map<String, String> params = requestStringToParameterMap(url);
- if (params != null && params.size() > 0) {
- searchPhrase = params.get(UrlParamNameConstants.PARAMNAME_SEARCHPHRASE);
- if (searchPhrase == null) {
- searchPhrase = "";
- }
-
- String nameOnly_str = params.get(UrlParamNameConstants.PARAMNAME_NAMEONLY);
- if (nameOnly_str != null && !nameOnly_str.isEmpty()) {
- nameOnly = nameOnly_str.equalsIgnoreCase("true");
- }
-
- String verbose_str = params.get(UrlParamNameConstants.PARAMNAME_SHOWVERBOSE);
- if (verbose_str != null && !verbose_str.isEmpty()) {
- verbose = verbose_str.equalsIgnoreCase("true");
- }
- }
- searchResultsComp.clearAll();
- if (!searchPhrase.isEmpty()) {
- Set<Entry<String, ViewArtifact>> entrySet = artifacts.entrySet();
- for (Entry<String, ViewArtifact> artifactEntry : entrySet) {
- ViewArtifact artifact = artifactEntry.getValue();
- if (artifact.getArtifactName().toLowerCase().contains(searchPhrase.toLowerCase())) {
- SearchResultComponent searchResultComp = searchResultsComp.createSearchResult();
- if (searchResultComp != null) {
- searchResultComp.setArtifact(artifact);
-
- DisplayOptions dispOptions = new DisplayOptions(verbose);
- searchResultComp.setDisplayOptions(dispOptions);
- if (!nameOnly && verbose) {
- StyledText matchHintText = new StyledText("...{COM_PAGE}...", true);
- searchResultComp.addSearchResultMatch(new SearchResultMatch("Word Template Content", 10,
- Arrays.asList(matchHintText)));
- }
- }
- }
- }
- }
- }
- fireSearchCompletedEvent();
- }
- }, "thread1");
-
- thread.start();
- }
-
- private static Map<String, String> requestStringToParameterMap(String requestedDataId) {
- Map<String, String> parameters = new HashMap<String, String>();
-
- // TODO: Need better error detection for malformed parameter strings
- // here.
-
- if (requestedDataId != null) {
- String[] tokens = requestedDataId.split("/");
- if (tokens.length > 1) {
- for (int i = 0; i < tokens.length; i++) {
- String paramName = tokens[i];
- if (paramName != null && !paramName.isEmpty()) {
- i++;
- String paramValue = tokens[i];
- parameters.put(paramName, paramValue);
- }
- }
- }
- }
-
- return parameters;
- }
-
- private static String parameterMapToRequestString(Map<String, String> parameters, String oldurl) {
- String requestedDataId = "/";
-
- Map<String, String> oldParameters = requestStringToParameterMap(oldurl);
-
- Set<Entry<String, String>> oldKeyValuePairs = oldParameters.entrySet();
- for (Iterator<Entry<String, String>> iter = oldKeyValuePairs.iterator(); iter.hasNext();) {
- Entry<String, String> pair = iter.next();
- if (pair.getKey() != null && !pair.getKey().isEmpty() && pair.getValue() != null && !pair.getValue().isEmpty()) {
- //Check for new state for this key
- String newValue = parameters.get(pair.getKey());
- if (newValue == null) {
- newValue = pair.getValue();
- }
- requestedDataId = String.format("%s%s/%s/", requestedDataId, pair.getKey(), newValue);
- }
- }
-
- Set<Entry<String, String>> keyValuePairs = parameters.entrySet();
- for (Iterator<Entry<String, String>> iter = keyValuePairs.iterator(); iter.hasNext();) {
- Entry<String, String> pair = iter.next();
- if (pair.getKey() != null && !pair.getKey().isEmpty() && pair.getValue() != null && !pair.getValue().isEmpty()) {
- //Check for new key value pair that does not yet exist in the old state
- if (oldParameters.get(pair.getKey()) == null) {
- requestedDataId = String.format("%s%s/%s/", requestedDataId, pair.getKey(), pair.getValue());
- }
- }
- }
-
- if (requestedDataId.endsWith("/")) {
- requestedDataId.substring(0, requestedDataId.length() - 1);
- }
-
- return requestedDataId;
- }
-
- private ViewId getProgramWithGuid(String programGuid) {
- if (programGuid != null && !programGuid.isEmpty()) {
- for (ViewId program : programsAndBuilds.keySet()) {
- if (program.getGuid().equals(programGuid)) {
- return program;
- }
- }
- }
-
- return null;
- }
-
- private ViewId getBuildWithGuid(String buildGuid) {
- if (buildGuid != null && !buildGuid.isEmpty()) {
- Set<Entry<ViewId, Collection<ViewId>>> entrySet = programsAndBuilds.entrySet();
- for (Entry<ViewId, Collection<ViewId>> programAndBuilds : entrySet) {
- Collection<ViewId> builds = programAndBuilds.getValue();
- for (ViewId build : builds) {
- if (build.getGuid().equals(buildGuid)) {
- return build;
- }
- }
- }
- }
-
- return null;
- }
-
- public class UrlParamNameConstants {
- public final static String PARAMNAME_ARTIFACT = "artifact";
- public final static String PARAMNAME_PROGRAM = "program";
- public final static String PARAMNAME_BUILD = "build";
- public final static String PARAMNAME_NAMEONLY = "nameonly";
- public final static String PARAMNAME_SEARCHPHRASE = "searchphrase";
- public final static String PARAMNAME_SHOWVERBOSE = "showverbose";
- }
-
-}
diff --git a/plugins/org.eclipse.osee.ats.presenter.test/.classpath b/plugins/org.eclipse.osee.ats.presenter.test/.classpath
deleted file mode 100644
index ad32c83a78..0000000000
--- a/plugins/org.eclipse.osee.ats.presenter.test/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/org.eclipse.osee.ats.presenter.test/.project b/plugins/org.eclipse.osee.ats.presenter.test/.project
deleted file mode 100644
index 05e5e406fb..0000000000
--- a/plugins/org.eclipse.osee.ats.presenter.test/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.osee.ats.presenter.test</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/plugins/org.eclipse.osee.ats.presenter.test/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.ats.presenter.test/META-INF/MANIFEST.MF
deleted file mode 100644
index 7f90501e80..0000000000
--- a/plugins/org.eclipse.osee.ats.presenter.test/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,14 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Ats Presenter Test (Incubation)
-Bundle-SymbolicName: org.eclipse.osee.ats.presenter.test
-Bundle-Version: 0.17.0.qualifier
-Fragment-Host: org.eclipse.osee.ats.presenter
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Require-Bundle: org.junit,
- org.eclipse.osee.display.presenter
-Import-Package: org.eclipse.osee.display.presenter.mocks,
- org.eclipse.osee.framework.core.data,
- org.eclipse.osee.framework.jdk.core.type,
- org.eclipse.osee.framework.jdk.core.util
-Bundle-Vendor: Eclipse Open System Engineering Environment
diff --git a/plugins/org.eclipse.osee.ats.presenter.test/build.properties b/plugins/org.eclipse.osee.ats.presenter.test/build.properties
deleted file mode 100644
index 34d2e4d2da..0000000000
--- a/plugins/org.eclipse.osee.ats.presenter.test/build.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
- .
diff --git a/plugins/org.eclipse.osee.ats.presenter.test/pom.xml b/plugins/org.eclipse.osee.ats.presenter.test/pom.xml
deleted file mode 100644
index 682b3f5f08..0000000000
--- a/plugins/org.eclipse.osee.ats.presenter.test/pom.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.eclipse.osee</groupId>
- <artifactId>org.eclipse.osee.x.ats.parent</artifactId>
- <version>0.17.0-SNAPSHOT</version>
- <relativePath>../../plugins/org.eclipse.osee.x.ats.parent</relativePath>
- </parent>
-
- <artifactId>org.eclipse.osee.ats.presenter.test</artifactId>
- <packaging>eclipse-test-plugin</packaging>
- <name>OSEE Ats Presenter Test - (Incubation)</name>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-surefire-plugin</artifactId>
- <version>${tycho-version}</version>
- <configuration>
- <testSuite>org.eclipse.osee.ats.presenter.test</testSuite>
- <testClass>org.eclipse.osee.ats.presenter.AtsPresenterTestSuite</testClass>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project> \ No newline at end of file
diff --git a/plugins/org.eclipse.osee.ats.presenter.test/src/org/eclipse/osee/ats/presenter/AtsPresenterTestSuite.java b/plugins/org.eclipse.osee.ats.presenter.test/src/org/eclipse/osee/ats/presenter/AtsPresenterTestSuite.java
deleted file mode 100644
index 199289b55a..0000000000
--- a/plugins/org.eclipse.osee.ats.presenter.test/src/org/eclipse/osee/ats/presenter/AtsPresenterTestSuite.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*******************************************************************************
- * 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.ats.presenter;
-
-import org.eclipse.osee.ats.presenter.internal.AtsSearchPresenterTest;
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
-
-@RunWith(Suite.class)
-@Suite.SuiteClasses({//
-AtsSearchPresenterTest.class,//
-})
-/**
- * @author John R. Misinco
- */
-public class AtsPresenterTestSuite {
-
-}
diff --git a/plugins/org.eclipse.osee.ats.presenter.test/src/org/eclipse/osee/ats/presenter/internal/AtsSearchPresenterTest.java b/plugins/org.eclipse.osee.ats.presenter.test/src/org/eclipse/osee/ats/presenter/internal/AtsSearchPresenterTest.java
deleted file mode 100644
index 3e47eb2608..0000000000
--- a/plugins/org.eclipse.osee.ats.presenter.test/src/org/eclipse/osee/ats/presenter/internal/AtsSearchPresenterTest.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*******************************************************************************
- * 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.ats.presenter.internal;
-
-import java.io.UnsupportedEncodingException;
-import java.util.ArrayList;
-import java.util.List;
-import org.eclipse.osee.ats.ui.api.data.AtsSearchParameters;
-import org.eclipse.osee.ats.ui.api.view.AtsSearchHeaderComponent;
-import org.eclipse.osee.display.api.data.ViewId;
-import org.eclipse.osee.display.presenter.mocks.MockArtifact;
-import org.eclipse.osee.display.presenter.mocks.MockAttribute;
-import org.eclipse.osee.display.presenter.mocks.MockDisplayOptionsComponent;
-import org.eclipse.osee.display.presenter.mocks.MockLogger;
-import org.eclipse.osee.display.presenter.mocks.MockMatch;
-import org.eclipse.osee.display.presenter.mocks.MockSearchNavigator;
-import org.eclipse.osee.display.presenter.mocks.MockSearchResultsListComponent;
-import org.eclipse.osee.framework.core.enums.CoreAttributeTypes;
-import org.eclipse.osee.framework.jdk.core.util.GUID;
-import org.eclipse.osee.framework.jdk.core.util.UrlQuery;
-import org.eclipse.osee.orcs.data.ArtifactReadable;
-import org.eclipse.osee.orcs.data.AttributeReadable;
-import org.eclipse.osee.orcs.search.Match;
-import org.junit.Assert;
-import org.junit.Test;
-
-/**
- * @author John R. Misinco
- */
-public class AtsSearchPresenterTest {
-
- @Test
- public void testSelectProgram() {
- MockAtsArtifactProvider provider = new MockAtsArtifactProvider();
- AtsSearchPresenterImpl<AtsSearchHeaderComponent, AtsSearchParameters> presenter =
- new AtsSearchPresenterImpl<AtsSearchHeaderComponent, AtsSearchParameters>(provider, new MockLogger());
- MockAtsSearchHeaderComponent comp = new MockAtsSearchHeaderComponent();
- ViewId program = new ViewId("prg1Guid_18H74Zqo3gA", "program1");
- presenter.selectProgram(program, comp);
- Assert.assertEquals(2, comp.getBuilds().size());
- }
-
- @Test
- public void testSelectSearch() {
- AtsSearchPresenterImpl<AtsSearchHeaderComponent, AtsSearchParameters> presenter =
- new AtsSearchPresenterImpl<AtsSearchHeaderComponent, AtsSearchParameters>(null, new MockLogger());
- MockSearchNavigator navigator = new MockSearchNavigator();
- String programGuid = "prg1Guid_18H74Zqo3gA";
- String buildGuid = "buildGuid1_d74Zqo3gA";
- ViewId program = new ViewId(programGuid, "prgName");
- ViewId build = new ViewId(buildGuid, "bldName");
- AtsSearchParameters params = new AtsSearchParameters("phrase", true, build, program);
- presenter.selectSearch("", params, navigator);
- String url = navigator.getResultsUrl();
-
- String expected =
- "/" + new UrlQuery().put("search", "phrase").put("program", programGuid).put("nameOnly", "true").put("build",
- buildGuid).toString();
-
- Assert.assertEquals(expected, url);
- }
-
- @Test
- public void testInitSearchResults() throws UnsupportedEncodingException {
- MockAtsArtifactProvider provider = new MockAtsArtifactProvider();
- MockDisplayOptionsComponent optionsComp = new MockDisplayOptionsComponent();
- List<Match<ArtifactReadable, AttributeReadable<?>>> resultList =
- new ArrayList<Match<ArtifactReadable, AttributeReadable<?>>>();
- MockArtifact art = new MockArtifact("guid1", "matchArt");
- MockAttribute attr = new MockAttribute(CoreAttributeTypes.Name, "matchArt");
- Match match = new MockMatch(art, attr);
- resultList.add(match);
- provider.setResultList(resultList);
- AtsSearchPresenterImpl<AtsSearchHeaderComponent, AtsSearchParameters> presenter =
- new AtsSearchPresenterImpl<AtsSearchHeaderComponent, AtsSearchParameters>(provider, new MockLogger());
- MockAtsSearchHeaderComponent headerComp = new MockAtsSearchHeaderComponent();
- MockSearchResultsListComponent resultsComponent = new MockSearchResultsListComponent();
- presenter.initSearchResults(null, headerComp, resultsComponent, optionsComp);
- Assert.assertEquals(3, headerComp.getPrograms().size());
-
- String programGuid = GUID.create();
- long buildUuid = 70559324;
- String url =
- "/" + new UrlQuery().put("program", programGuid).put("build", buildUuid).put("nameOnly", "true").put("search",
- "phrase").put("verbose", "false").toString();
- presenter.initSearchResults(url, headerComp, resultsComponent, optionsComp);
- Assert.assertEquals(1, resultsComponent.getSearchResults().size());
- }
-}
diff --git a/plugins/org.eclipse.osee.ats.presenter.test/src/org/eclipse/osee/ats/presenter/internal/MockAtsArtifactProvider.java b/plugins/org.eclipse.osee.ats.presenter.test/src/org/eclipse/osee/ats/presenter/internal/MockAtsArtifactProvider.java
deleted file mode 100644
index c59516b182..0000000000
--- a/plugins/org.eclipse.osee.ats.presenter.test/src/org/eclipse/osee/ats/presenter/internal/MockAtsArtifactProvider.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*******************************************************************************
- * 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.ats.presenter.internal;
-
-import java.util.Collection;
-import java.util.LinkedList;
-import java.util.List;
-import org.eclipse.osee.ats.ui.api.search.AtsArtifactProvider;
-import org.eclipse.osee.display.presenter.mocks.MockArtifact;
-import org.eclipse.osee.display.presenter.mocks.MockArtifactProvider;
-import org.eclipse.osee.framework.jdk.core.type.HashCollection;
-import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
-import org.eclipse.osee.orcs.data.ArtifactReadable;
-
-/**
- * @author John R. Misinco
- */
-public class MockAtsArtifactProvider extends MockArtifactProvider implements AtsArtifactProvider {
-
- private final HashCollection<MockArtifact, MockArtifact> programsAndBuilds =
- new HashCollection<MockArtifact, MockArtifact>();
-
- public MockAtsArtifactProvider() {
- createProgramsAndBuilds();
- }
-
- private void createProgramsAndBuilds() {
- MockArtifact program1 = new MockArtifact("prg1Guid_18H74Zqo3gA", "program1");
- MockArtifact program2 = new MockArtifact("prg2Guid_DC2cxIwhWwA", "program2");
- MockArtifact program3 = new MockArtifact("prg3Guid_ALnf3ohtbQA", "program3");
- MockArtifact build1 = new MockArtifact("bld1Guid_BwTPQWRIagA", "build1");
- MockArtifact build2 = new MockArtifact("bld2Guid_DkYoCyCF6gA", "build2");
- MockArtifact build3 = new MockArtifact("bld3Guid_31DjLanu7gA", "build3");
- MockArtifact build4 = new MockArtifact("bld4Guid_H2oLkW5W3QA", "build4");
- programsAndBuilds.put(program1, build1);
- programsAndBuilds.put(program1, build2);
- programsAndBuilds.put(program2, build3);
- programsAndBuilds.put(program3, build1);
- programsAndBuilds.put(program3, build3);
- programsAndBuilds.put(program3, build4);
- }
-
- @Override
- public Collection<ArtifactReadable> getPrograms() {
- return new LinkedList<ArtifactReadable>(programsAndBuilds.keySet());
- }
-
- @Override
- public Collection<ArtifactReadable> getBuilds(String programGuid) {
- List<ArtifactReadable> toReturn = null;
- for (MockArtifact program : programsAndBuilds.keySet()) {
- if (program.getGuid().equals(programGuid)) {
- toReturn = new LinkedList<ArtifactReadable>(programsAndBuilds.getValues(program));
- break;
- }
- }
- return toReturn;
- }
-
- @Override
- public long getBaselineBranchUuid(String buildArtGuid) throws OseeCoreException {
- return 12345;
- }
-
-}
diff --git a/plugins/org.eclipse.osee.ats.presenter.test/src/org/eclipse/osee/ats/presenter/internal/MockAtsSearchHeaderComponent.java b/plugins/org.eclipse.osee.ats.presenter.test/src/org/eclipse/osee/ats/presenter/internal/MockAtsSearchHeaderComponent.java
deleted file mode 100644
index 3894e77ebd..0000000000
--- a/plugins/org.eclipse.osee.ats.presenter.test/src/org/eclipse/osee/ats/presenter/internal/MockAtsSearchHeaderComponent.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*******************************************************************************
- * 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.ats.presenter.internal;
-
-import java.util.LinkedList;
-import java.util.List;
-import org.eclipse.osee.ats.ui.api.data.AtsSearchParameters;
-import org.eclipse.osee.ats.ui.api.view.AtsSearchHeaderComponent;
-import org.eclipse.osee.display.api.data.ViewId;
-
-/**
- * @author John R. Misinco
- */
-public class MockAtsSearchHeaderComponent implements AtsSearchHeaderComponent {
-
- List<ViewId> programs = new LinkedList<ViewId>();
- List<ViewId> builds = new LinkedList<ViewId>();
- ViewId selectedProgram, selectedBuild;
- String errorMessage = "";
- boolean clearAllCalled = false;
-
- public boolean isClearAllCalled() {
- return clearAllCalled;
- }
-
- public List<ViewId> getPrograms() {
- return programs;
- }
-
- public List<ViewId> getBuilds() {
- return builds;
- }
-
- public ViewId getSelectedProgram() {
- return selectedProgram;
- }
-
- public ViewId getSelectedBuild() {
- return selectedBuild;
- }
-
- public String getErrorMessage() {
- return errorMessage;
- }
-
- @Override
- public void clearAll() {
- clearAllCalled = true;
- programs.clear();
- builds.clear();
- }
-
- @Override
- public void setErrorMessage(String shortMsg, String longMsg, MsgType msgType) {
- // errorMessage = message;
- }
-
- @Override
- public void addProgram(ViewId program) {
- programs.add(program);
- }
-
- @Override
- public void clearBuilds() {
- builds.clear();
- }
-
- @Override
- public void addBuild(ViewId build) {
- builds.add(build);
- }
-
- @Override
- public void setSearchCriteria(AtsSearchParameters params) {
- //
- }
-
-} \ No newline at end of file
diff --git a/plugins/org.eclipse.osee.ats.presenter/.classpath b/plugins/org.eclipse.osee.ats.presenter/.classpath
deleted file mode 100644
index ad32c83a78..0000000000
--- a/plugins/org.eclipse.osee.ats.presenter/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/org.eclipse.osee.ats.presenter/.project b/plugins/org.eclipse.osee.ats.presenter/.project
deleted file mode 100644
index df3df51a3f..0000000000
--- a/plugins/org.eclipse.osee.ats.presenter/.project
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.osee.ats.presenter</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ds.core.builder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/plugins/org.eclipse.osee.ats.presenter/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.ats.presenter/META-INF/MANIFEST.MF
deleted file mode 100644
index 44d2f1d856..0000000000
--- a/plugins/org.eclipse.osee.ats.presenter/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,29 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Ats Presenter (Incubation)
-Bundle-SymbolicName: org.eclipse.osee.ats.presenter
-Bundle-Version: 0.17.0.qualifier
-Bundle-Vendor: Eclipse Open System Engineering Environment
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Service-Component: OSGI-INF/*.xml
-Import-Package: org.eclipse.osee.ats.api.data,
- org.eclipse.osee.ats.core.util,
- org.eclipse.osee.ats.ui.api.data,
- org.eclipse.osee.ats.ui.api.search,
- org.eclipse.osee.ats.ui.api.view,
- org.eclipse.osee.display.api.components,
- org.eclipse.osee.display.api.data,
- org.eclipse.osee.display.api.search,
- org.eclipse.osee.display.presenter,
- org.eclipse.osee.executor.admin,
- org.eclipse.osee.framework.core.data,
- org.eclipse.osee.framework.core.enums,
- org.eclipse.osee.framework.core.exception,
- org.eclipse.osee.framework.core.model.type,
- org.eclipse.osee.framework.jdk.core.type,
- org.eclipse.osee.framework.jdk.core.util,
- org.eclipse.osee.logger,
- org.eclipse.osee.orcs,
- org.eclipse.osee.orcs.data,
- org.eclipse.osee.orcs.search
-Require-Bundle: org.eclipse.core.runtime
diff --git a/plugins/org.eclipse.osee.ats.presenter/OSGI-INF/ats.presenter.factory.xml b/plugins/org.eclipse.osee.ats.presenter/OSGI-INF/ats.presenter.factory.xml
deleted file mode 100644
index cd0b769671..0000000000
--- a/plugins/org.eclipse.osee.ats.presenter/OSGI-INF/ats.presenter.factory.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.eclipse.osee.ats.presenter.internal.AtsPresenterFactoryImpl">
- <implementation class="org.eclipse.osee.ats.presenter.internal.AtsPresenterFactoryImpl"/>
- <service>
- <provide interface="org.eclipse.osee.ats.ui.api.search.AtsPresenterFactory"/>
- </service>
- <reference bind="setOrcsApi" cardinality="1..1" interface="org.eclipse.osee.orcs.OrcsApi" name="OrcsApi" policy="static"/>
- <reference bind="setLogger" cardinality="1..1" interface="org.eclipse.osee.logger.Log" name="Log" policy="static"/>
- <reference bind="setExecutorAdmin" cardinality="1..1" interface="org.eclipse.osee.executor.admin.ExecutorAdmin" name="ExecutorAdmin" policy="static"/>
-</scr:component>
diff --git a/plugins/org.eclipse.osee.ats.presenter/build.properties b/plugins/org.eclipse.osee.ats.presenter/build.properties
deleted file mode 100644
index c58ea2178c..0000000000
--- a/plugins/org.eclipse.osee.ats.presenter/build.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
- .,\
- OSGI-INF/
diff --git a/plugins/org.eclipse.osee.ats.presenter/pom.xml b/plugins/org.eclipse.osee.ats.presenter/pom.xml
deleted file mode 100644
index 8a067cede6..0000000000
--- a/plugins/org.eclipse.osee.ats.presenter/pom.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.eclipse.osee</groupId>
- <artifactId>org.eclipse.osee.x.ats.parent</artifactId>
- <version>0.17.0-SNAPSHOT</version>
- <relativePath>../../plugins/org.eclipse.osee.x.ats.parent</relativePath>
- </parent>
-
- <artifactId>org.eclipse.osee.ats.presenter</artifactId>
- <packaging>eclipse-plugin</packaging>
- <name>OSEE Ats Presenter - (Incubation)</name>
-
- <build>
- <!-- workaround for https://issues.sonatype.org/browse/TYCHO-168 -->
- <resources>
- <resource>
- <directory>src</directory>
- <excludes>
- <exclude>**/*.java</exclude>
- </excludes>
- </resource>
- </resources>
- <plugins>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-source-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
-</project> \ No newline at end of file
diff --git a/plugins/org.eclipse.osee.ats.presenter/src/org/eclipse/osee/ats/presenter/internal/AtsArtifactProviderImpl.java b/plugins/org.eclipse.osee.ats.presenter/src/org/eclipse/osee/ats/presenter/internal/AtsArtifactProviderImpl.java
deleted file mode 100644
index fa9ca93864..0000000000
--- a/plugins/org.eclipse.osee.ats.presenter/src/org/eclipse/osee/ats/presenter/internal/AtsArtifactProviderImpl.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*******************************************************************************
- * 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.ats.presenter.internal;
-
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-import org.eclipse.osee.ats.api.data.AtsArtifactToken;
-import org.eclipse.osee.ats.api.data.AtsAttributeTypes;
-import org.eclipse.osee.ats.api.data.AtsRelationTypes;
-import org.eclipse.osee.ats.core.util.AtsUtilCore;
-import org.eclipse.osee.ats.ui.api.search.AtsArtifactProvider;
-import org.eclipse.osee.display.presenter.ArtifactProviderImpl;
-import org.eclipse.osee.display.presenter.Utility;
-import org.eclipse.osee.executor.admin.ExecutorAdmin;
-import org.eclipse.osee.framework.core.enums.CoreAttributeTypes;
-import org.eclipse.osee.framework.core.enums.CoreRelationTypes;
-import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
-import org.eclipse.osee.framework.jdk.core.type.ResultSet;
-import org.eclipse.osee.framework.jdk.core.util.Strings;
-import org.eclipse.osee.logger.Log;
-import org.eclipse.osee.orcs.OrcsTypes;
-import org.eclipse.osee.orcs.data.ArtifactReadable;
-import org.eclipse.osee.orcs.search.QueryFactory;
-
-/**
- * @author John R. Misinco
- */
-public class AtsArtifactProviderImpl extends ArtifactProviderImpl implements AtsArtifactProvider {
-
- private static final String FILTER_KEYWORD = "Apply_Filter";
-
- public AtsArtifactProviderImpl(Log logger, ExecutorAdmin executorAdmin, QueryFactory queryFactory, OrcsTypes orcsTypes) {
- super(logger, executorAdmin, queryFactory, orcsTypes);
- }
-
- @Override
- public Iterable<ArtifactReadable> getPrograms() throws OseeCoreException {
- ResultSet<ArtifactReadable> programs = null;
- ArtifactReadable webProgramsArtifact =
- getArtifactByArtifactToken(AtsUtilCore.getAtsBranch(), AtsArtifactToken.WebPrograms);
-
- if (webProgramsArtifact != null) {
- programs = getRelatedArtifacts(webProgramsArtifact, CoreRelationTypes.Universal_Grouping__Members);
- }
-
- setFilterAllTypesAllowed(areProgramsFilterClean(webProgramsArtifact));
- return Utility.sort(programs);
- }
-
- private boolean areProgramsFilterClean(ArtifactReadable webProgram) throws OseeCoreException {
- List<String> filterData = webProgram.getAttributeValues(CoreAttributeTypes.Description);
- for (String att : filterData) {
- if (att.equals(FILTER_KEYWORD)) {
- return false;
- }
- }
- return true;
- }
-
- @Override
- public Iterable<ArtifactReadable> getBuilds(String programGuid) throws OseeCoreException {
- ArtifactReadable teamDef = null;
- ArtifactReadable programArtifact = getArtifactByGuid(AtsUtilCore.getAtsBranch(), programGuid);
- if (programArtifact != null) {
- teamDef = getRelatedArtifact(programArtifact, CoreRelationTypes.SupportingInfo_SupportingInfo);
- }
-
- Iterable<ArtifactReadable> toReturn;
- if (teamDef != null) {
- ResultSet<ArtifactReadable> relatedArtifacts =
- getRelatedArtifacts(teamDef, AtsRelationTypes.TeamDefinitionToVersion_Version);
- Iterator<ArtifactReadable> iterator = relatedArtifacts.iterator();
- while (iterator.hasNext()) {
- ArtifactReadable art = iterator.next();
- String baselineBranchUuid = art.getSoleAttributeValue(AtsAttributeTypes.BaselineBranchUuid, "");
- if (!Strings.isValid(baselineBranchUuid)) {
- iterator.remove();
- }
- }
- toReturn = Utility.sort(relatedArtifacts);
- } else {
- toReturn = Collections.emptyList();
- }
- return toReturn;
- }
-
- @Override
- public long getBaselineBranchUuid(String buildArtGuid) throws OseeCoreException {
- long uuid = 0;
- ArtifactReadable buildArtifact = getArtifactByGuid(AtsUtilCore.getAtsBranch(), buildArtGuid);
- if (buildArtifact != null) {
- uuid = buildArtifact.getSoleAttributeValue(AtsAttributeTypes.BaselineBranchUuid, 0L);
- }
- return uuid;
- }
-
-}
diff --git a/plugins/org.eclipse.osee.ats.presenter/src/org/eclipse/osee/ats/presenter/internal/AtsPresenterFactoryImpl.java b/plugins/org.eclipse.osee.ats.presenter/src/org/eclipse/osee/ats/presenter/internal/AtsPresenterFactoryImpl.java
deleted file mode 100644
index a5ccd203ae..0000000000
--- a/plugins/org.eclipse.osee.ats.presenter/src/org/eclipse/osee/ats/presenter/internal/AtsPresenterFactoryImpl.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*******************************************************************************
- * 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.ats.presenter.internal;
-
-import org.eclipse.osee.ats.ui.api.data.AtsSearchParameters;
-import org.eclipse.osee.ats.ui.api.search.AtsArtifactProvider;
-import org.eclipse.osee.ats.ui.api.search.AtsPresenterFactory;
-import org.eclipse.osee.ats.ui.api.search.AtsSearchPresenter;
-import org.eclipse.osee.ats.ui.api.view.AtsSearchHeaderComponent;
-import org.eclipse.osee.executor.admin.ExecutorAdmin;
-import org.eclipse.osee.logger.Log;
-import org.eclipse.osee.orcs.ApplicationContext;
-import org.eclipse.osee.orcs.OrcsApi;
-import org.eclipse.osee.orcs.OrcsTypes;
-import org.eclipse.osee.orcs.search.QueryFactory;
-
-/**
- * @author John R. Misinco
- */
-public class AtsPresenterFactoryImpl<T extends AtsSearchHeaderComponent, K extends AtsSearchParameters> implements AtsPresenterFactory<AtsSearchHeaderComponent, AtsSearchParameters> {
-
- private OrcsApi orcsApi;
- private Log logger;
- private ExecutorAdmin executorAdmin;
-
- public void setOrcsApi(OrcsApi orcsApi) {
- this.orcsApi = orcsApi;
- }
-
- public void setLogger(Log logger) {
- this.logger = logger;
- }
-
- public void setExecutorAdmin(ExecutorAdmin executorAdmin) {
- this.executorAdmin = executorAdmin;
- }
-
- @Override
- public AtsSearchPresenter<AtsSearchHeaderComponent, AtsSearchParameters> createInstance(ApplicationContext context) {
- QueryFactory queryFactory = orcsApi.getQueryFactory(context);
- OrcsTypes orcsTypes = orcsApi.getOrcsTypes(context);
- AtsArtifactProvider provider = new AtsArtifactProviderImpl(logger, executorAdmin, queryFactory, orcsTypes);
- AtsSearchPresenterImpl<AtsSearchHeaderComponent, AtsSearchParameters> instance =
- new AtsSearchPresenterImpl<AtsSearchHeaderComponent, AtsSearchParameters>(provider, logger);
- return instance;
- }
-
-}
diff --git a/plugins/org.eclipse.osee.ats.presenter/src/org/eclipse/osee/ats/presenter/internal/AtsSearchPresenterImpl.java b/plugins/org.eclipse.osee.ats.presenter/src/org/eclipse/osee/ats/presenter/internal/AtsSearchPresenterImpl.java
deleted file mode 100644
index e40b48e47d..0000000000
--- a/plugins/org.eclipse.osee.ats.presenter/src/org/eclipse/osee/ats/presenter/internal/AtsSearchPresenterImpl.java
+++ /dev/null
@@ -1,214 +0,0 @@
-/*******************************************************************************
- * 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.ats.presenter.internal;
-
-import java.io.UnsupportedEncodingException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.LinkedList;
-import org.eclipse.osee.ats.ui.api.data.AtsSearchParameters;
-import org.eclipse.osee.ats.ui.api.search.AtsArtifactProvider;
-import org.eclipse.osee.ats.ui.api.search.AtsSearchPresenter;
-import org.eclipse.osee.ats.ui.api.view.AtsSearchHeaderComponent;
-import org.eclipse.osee.display.api.components.ArtifactHeaderComponent;
-import org.eclipse.osee.display.api.components.AttributeComponent;
-import org.eclipse.osee.display.api.components.DisplayOptionsComponent;
-import org.eclipse.osee.display.api.components.RelationComponent;
-import org.eclipse.osee.display.api.components.SearchResultsListComponent;
-import org.eclipse.osee.display.api.data.ViewId;
-import org.eclipse.osee.display.api.search.SearchNavigator;
-import org.eclipse.osee.display.presenter.SearchPresenterImpl;
-import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
-import org.eclipse.osee.framework.jdk.core.util.Strings;
-import org.eclipse.osee.framework.jdk.core.util.UrlQuery;
-import org.eclipse.osee.logger.Log;
-import org.eclipse.osee.orcs.data.ArtifactReadable;
-
-/**
- * @author John R. Misinco
- */
-public class AtsSearchPresenterImpl<T extends AtsSearchHeaderComponent, K extends AtsSearchParameters> extends SearchPresenterImpl<T, K> implements AtsSearchPresenter<T, K> {
-
- private final AtsArtifactProvider atsArtifactProvider;
-
- public AtsSearchPresenterImpl(AtsArtifactProvider artifactProvider, Log logger) {
- super(artifactProvider, logger);
- atsArtifactProvider = artifactProvider;
- }
-
- @Override
- public void selectSearch(String url, K params, SearchNavigator atsNavigator) {
- String newUrl = encode("", params, null);
- atsNavigator.navigateSearchResults(newUrl);
- }
-
- private void addProgramsToSearchHeader(T headerComponent) {
- headerComponent.clearAll();
- Collection<ViewId> programs = null;
- try {
- programs = getPrograms();
- } catch (Exception ex) {
- setErrorMessage(headerComponent, "Error in addProgramsToSearchHeader", ex);
- return;
- }
- for (ViewId program : programs) {
- headerComponent.addProgram(program);
- }
- }
-
- @Override
- public void initSearchResults(String url, T searchHeaderComponent, SearchResultsListComponent resultsComponent, DisplayOptionsComponent optionsComponent) {
- setSearchHeaderFields(url, searchHeaderComponent);
- resultsComponent.clearAll();
-
- if (!Strings.isValid(url)) {
- sendSearchCompleted();
- return;
- }
-
- AtsSearchParameters params = decodeIt(url);
-
- if (params == null || !params.isValid()) {
- return;
- }
-
- Long branchUuid;
- try {
- branchUuid = atsArtifactProvider.getBaselineBranchUuid(params.getBuild().getGuid());
- } catch (Exception ex) {
- setErrorMessage(searchHeaderComponent, "Error in initSearchResults", ex);
- return;
- }
-
- if (branchUuid == null) {
- setErrorMessage(resultsComponent, "Could not find baseline branch uuid for selected build/program", null);
- } else {
- String newUrl = encode(url, params, String.valueOf(branchUuid));
- super.initSearchResults(newUrl, searchHeaderComponent, resultsComponent, optionsComponent);
- }
- }
-
- @Override
- public void selectProgram(ViewId program, T headerComponent) {
- headerComponent.clearBuilds();
- Collection<ViewId> builds = null;
- if (program != null) {
- try {
- builds = getBuilds(program);
- } catch (Exception ex) {
- setErrorMessage(headerComponent, "Error in selectProgram", ex);
- return;
- }
- for (ViewId build : builds) {
- headerComponent.addBuild(build);
- }
- }
- }
-
- protected Collection<ViewId> getPrograms() throws OseeCoreException {
- Collection<ViewId> toReturn = new LinkedList<ViewId>();
- Iterable<ArtifactReadable> programs = atsArtifactProvider.getPrograms();
- if (programs != null) {
- for (ArtifactReadable program : programs) {
- toReturn.add(new ViewId(program.getGuid(), program.getName()));
- }
- }
- return toReturn;
- }
-
- protected Collection<ViewId> getBuilds(ViewId program) throws OseeCoreException {
- Iterable<ArtifactReadable> relatedBuilds = atsArtifactProvider.getBuilds(program.getGuid());
- Collection<ViewId> builds = new ArrayList<ViewId>();
- if (relatedBuilds != null) {
- for (ArtifactReadable build : relatedBuilds) {
- builds.add(new ViewId(build.getGuid(), build.getName()));
- }
- }
- return builds;
- }
-
- protected String encode(String url, AtsSearchParameters searchParams, String branchUuid) {
- UrlQuery query = new UrlQuery();
- try {
- query.parse(url);
-
- if (Strings.isValid(branchUuid)) {
- query.putInPlace("branch", branchUuid);
- }
-
- query.putInPlace("program", searchParams.getProgram().getGuid());
- query.putInPlace("build", searchParams.getBuild().getGuid());
- query.putInPlace("nameOnly", String.valueOf(searchParams.isNameOnly()));
- query.putInPlace("search", searchParams.getSearchString());
-
- return "/" + query.toString();
- } catch (UnsupportedEncodingException ex) {
- logger.error(ex, "Error in encode");
- return "";
- }
- }
-
- protected AtsSearchParameters decodeIt(String url) {
- UrlQuery query = new UrlQuery();
- try {
- query.parse(url);
- } catch (UnsupportedEncodingException ex) {
- logger.error(ex, "Error in encode");
- return null;
- }
-
- ViewId program = null, build = null;
-
- if (query.containsKey("program")) {
- program = new ViewId(query.getParameter("program"), "");
- }
-
- if (query.containsKey("build")) {
- build = new ViewId(query.getParameter("build"), "");
- }
-
- String nValue = query.getParameter("nameOnly");
- boolean nameOnly = nValue == null ? false : nValue.equalsIgnoreCase("true");
- String searchPhrase = "";
- if (query.containsKey("search")) {
- searchPhrase = query.getParameter("search");
- }
-
- // String vValue = data.get("verbose");
- // boolean verbose = vValue == null ? false : vValue.equalsIgnoreCase("true");
- return new AtsSearchParameters(searchPhrase, nameOnly, build, program);
- }
-
- protected void setSearchHeaderFields(String url, T searchHeaderComp) {
- searchHeaderComp.clearAll();
- addProgramsToSearchHeader(searchHeaderComp);
-
- if (!Strings.isValid(url)) {
- return;
- }
-
- AtsSearchParameters params = decodeIt(url);
- if (!params.isValid()) {
- return;
- }
-
- selectProgram(params.getProgram(), searchHeaderComp);
- searchHeaderComp.setSearchCriteria(params);
-
- }
-
- @Override
- public void initArtifactPage(String url, T searchHeaderComp, ArtifactHeaderComponent artHeaderComp, RelationComponent relComp, AttributeComponent attrComp, DisplayOptionsComponent options) {
- setSearchHeaderFields(url, searchHeaderComp);
- super.initArtifactPage(url, searchHeaderComp, artHeaderComp, relComp, attrComp, options);
- }
-
-}
diff --git a/plugins/org.eclipse.osee.ats.ui.api/.classpath b/plugins/org.eclipse.osee.ats.ui.api/.classpath
deleted file mode 100644
index ad32c83a78..0000000000
--- a/plugins/org.eclipse.osee.ats.ui.api/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/org.eclipse.osee.ats.ui.api/.project b/plugins/org.eclipse.osee.ats.ui.api/.project
deleted file mode 100644
index 02d136ae7c..0000000000
--- a/plugins/org.eclipse.osee.ats.ui.api/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.osee.ats.ui.api</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/plugins/org.eclipse.osee.ats.ui.api/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.ats.ui.api/META-INF/MANIFEST.MF
deleted file mode 100644
index 435aee3db4..0000000000
--- a/plugins/org.eclipse.osee.ats.ui.api/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,20 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Osee Ats Ui Api (Incubation)
-Bundle-SymbolicName: org.eclipse.osee.ats.ui.api
-Bundle-Version: 0.17.0.qualifier
-Bundle-Vendor: Eclipse Open System Engineering Environment
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Export-Package: org.eclipse.osee.ats.ui.api.data,
- org.eclipse.osee.ats.ui.api.search,
- org.eclipse.osee.ats.ui.api.view
-Import-Package: org.eclipse.osee.display.api.components,
- org.eclipse.osee.display.api.data,
- org.eclipse.osee.display.api.search,
- org.eclipse.osee.framework.core.data,
- org.eclipse.osee.framework.core.enums,
- org.eclipse.osee.framework.core.exception,
- org.eclipse.osee.framework.jdk.core.type,
- org.eclipse.osee.framework.jdk.core.util,
- org.eclipse.osee.orcs,
- org.eclipse.osee.orcs.data
diff --git a/plugins/org.eclipse.osee.ats.ui.api/build.properties b/plugins/org.eclipse.osee.ats.ui.api/build.properties
deleted file mode 100644
index 34d2e4d2da..0000000000
--- a/plugins/org.eclipse.osee.ats.ui.api/build.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
- .
diff --git a/plugins/org.eclipse.osee.ats.ui.api/pom.xml b/plugins/org.eclipse.osee.ats.ui.api/pom.xml
deleted file mode 100644
index d40558bede..0000000000
--- a/plugins/org.eclipse.osee.ats.ui.api/pom.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.eclipse.osee</groupId>
- <artifactId>org.eclipse.osee.x.ats.parent</artifactId>
- <version>0.17.0-SNAPSHOT</version>
- <relativePath>../../plugins/org.eclipse.osee.x.ats.parent</relativePath>
- </parent>
-
- <artifactId>org.eclipse.osee.ats.ui.api</artifactId>
- <packaging>eclipse-plugin</packaging>
- <name>OSEE Ats Ui Api - (Incubation)</name>
-
- <build>
- <!-- workaround for https://issues.sonatype.org/browse/TYCHO-168 -->
- <resources>
- <resource>
- <directory>src</directory>
- <excludes>
- <exclude>**/*.java</exclude>
- </excludes>
- </resource>
- </resources>
- <plugins>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-source-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
-</project> \ No newline at end of file
diff --git a/plugins/org.eclipse.osee.ats.ui.api/src/org/eclipse/osee/ats/ui/api/data/AtsSearchParameters.java b/plugins/org.eclipse.osee.ats.ui.api/src/org/eclipse/osee/ats/ui/api/data/AtsSearchParameters.java
deleted file mode 100644
index c93ec3087c..0000000000
--- a/plugins/org.eclipse.osee.ats.ui.api/src/org/eclipse/osee/ats/ui/api/data/AtsSearchParameters.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*******************************************************************************
- * 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.ats.ui.api.data;
-
-import org.eclipse.osee.display.api.data.ViewId;
-import org.eclipse.osee.display.api.data.ViewSearchParameters;
-import org.eclipse.osee.framework.jdk.core.util.Strings;
-
-/**
- * @author John R. Misinco
- */
-public class AtsSearchParameters extends ViewSearchParameters {
-
- private final ViewId build, program;
-
- public AtsSearchParameters(String searchString, Boolean nameOnly, ViewId build, ViewId program) {
- super(searchString, nameOnly);
- this.build = build;
- this.program = program;
- }
-
- public ViewId getBuild() {
- return build;
- }
-
- public ViewId getProgram() {
- return program;
- }
-
- public boolean isValid() {
- return (build != null && program != null && Strings.isValid(getSearchString()));
- }
-
-}
diff --git a/plugins/org.eclipse.osee.ats.ui.api/src/org/eclipse/osee/ats/ui/api/search/AtsArtifactProvider.java b/plugins/org.eclipse.osee.ats.ui.api/src/org/eclipse/osee/ats/ui/api/search/AtsArtifactProvider.java
deleted file mode 100644
index abc1b52bf2..0000000000
--- a/plugins/org.eclipse.osee.ats.ui.api/src/org/eclipse/osee/ats/ui/api/search/AtsArtifactProvider.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*******************************************************************************
- * 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.ats.ui.api.search;
-
-import org.eclipse.osee.display.api.search.ArtifactProvider;
-import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
-import org.eclipse.osee.orcs.data.ArtifactReadable;
-
-/**
- * @author John R. Misinco
- */
-public interface AtsArtifactProvider extends ArtifactProvider {
-
- Iterable<ArtifactReadable> getPrograms() throws OseeCoreException;
-
- Iterable<ArtifactReadable> getBuilds(String programGuid) throws OseeCoreException;
-
- long getBaselineBranchUuid(String buildArtUuid) throws OseeCoreException;
-
-}
diff --git a/plugins/org.eclipse.osee.ats.ui.api/src/org/eclipse/osee/ats/ui/api/search/AtsPresenterFactory.java b/plugins/org.eclipse.osee.ats.ui.api/src/org/eclipse/osee/ats/ui/api/search/AtsPresenterFactory.java
deleted file mode 100644
index 9d10f2b1c8..0000000000
--- a/plugins/org.eclipse.osee.ats.ui.api/src/org/eclipse/osee/ats/ui/api/search/AtsPresenterFactory.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*******************************************************************************
- * 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.ats.ui.api.search;
-
-import org.eclipse.osee.ats.ui.api.data.AtsSearchParameters;
-import org.eclipse.osee.ats.ui.api.view.AtsSearchHeaderComponent;
-import org.eclipse.osee.orcs.ApplicationContext;
-
-/**
- * @author John R. Misinco
- */
-public interface AtsPresenterFactory<T extends AtsSearchHeaderComponent, K extends AtsSearchParameters> {
-
- AtsSearchPresenter<T, K> createInstance(ApplicationContext context);
-
-}
diff --git a/plugins/org.eclipse.osee.ats.ui.api/src/org/eclipse/osee/ats/ui/api/search/AtsSearchPresenter.java b/plugins/org.eclipse.osee.ats.ui.api/src/org/eclipse/osee/ats/ui/api/search/AtsSearchPresenter.java
deleted file mode 100644
index 2cb3743772..0000000000
--- a/plugins/org.eclipse.osee.ats.ui.api/src/org/eclipse/osee/ats/ui/api/search/AtsSearchPresenter.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*******************************************************************************
- * 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.ats.ui.api.search;
-
-import org.eclipse.osee.ats.ui.api.data.AtsSearchParameters;
-import org.eclipse.osee.ats.ui.api.view.AtsSearchHeaderComponent;
-import org.eclipse.osee.display.api.data.ViewId;
-import org.eclipse.osee.display.api.search.SearchPresenter;
-
-/**
- * @author John R. Misinco
- */
-public interface AtsSearchPresenter<T extends AtsSearchHeaderComponent, K extends AtsSearchParameters> extends SearchPresenter<T, K> {
-
- void selectProgram(ViewId program, T headerComponent);
-
-}
diff --git a/plugins/org.eclipse.osee.ats.ui.api/src/org/eclipse/osee/ats/ui/api/view/AtsSearchHeaderComponent.java b/plugins/org.eclipse.osee.ats.ui.api/src/org/eclipse/osee/ats/ui/api/view/AtsSearchHeaderComponent.java
deleted file mode 100644
index 4c41dd2010..0000000000
--- a/plugins/org.eclipse.osee.ats.ui.api/src/org/eclipse/osee/ats/ui/api/view/AtsSearchHeaderComponent.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*******************************************************************************
- * 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.ats.ui.api.view;
-
-import org.eclipse.osee.ats.ui.api.data.AtsSearchParameters;
-import org.eclipse.osee.display.api.components.SearchHeaderComponent;
-import org.eclipse.osee.display.api.data.ViewId;
-
-/**
- * @author John R. Misinco
- */
-public interface AtsSearchHeaderComponent extends SearchHeaderComponent {
-
- void addProgram(ViewId program);
-
- void clearBuilds();
-
- void addBuild(ViewId build);
-
- void setSearchCriteria(AtsSearchParameters params);
-
-}
diff --git a/plugins/org.eclipse.osee.ats.view.web.test/.classpath b/plugins/org.eclipse.osee.ats.view.web.test/.classpath
deleted file mode 100644
index ad32c83a78..0000000000
--- a/plugins/org.eclipse.osee.ats.view.web.test/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/org.eclipse.osee.ats.view.web.test/.project b/plugins/org.eclipse.osee.ats.view.web.test/.project
deleted file mode 100644
index f9262c77f6..0000000000
--- a/plugins/org.eclipse.osee.ats.view.web.test/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.osee.ats.view.web.test</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/plugins/org.eclipse.osee.ats.view.web.test/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.ats.view.web.test/META-INF/MANIFEST.MF
deleted file mode 100644
index f89c8abf83..0000000000
--- a/plugins/org.eclipse.osee.ats.view.web.test/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,8 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: ATS View Web Test (Incubation)
-Bundle-SymbolicName: org.eclipse.osee.ats.view.web.test
-Bundle-Version: 0.17.0.qualifier
-Bundle-Vendor: Eclipse Open System Engineering Environment
-Fragment-Host: org.eclipse.osee.ats.view.web
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/plugins/org.eclipse.osee.ats.view.web.test/build.properties b/plugins/org.eclipse.osee.ats.view.web.test/build.properties
deleted file mode 100644
index 34d2e4d2da..0000000000
--- a/plugins/org.eclipse.osee.ats.view.web.test/build.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
- .
diff --git a/plugins/org.eclipse.osee.ats.view.web.test/src/org/eclipse/osee/ats/view/web/placeholder.txt b/plugins/org.eclipse.osee.ats.view.web.test/src/org/eclipse/osee/ats/view/web/placeholder.txt
deleted file mode 100644
index e69de29bb2..0000000000
--- a/plugins/org.eclipse.osee.ats.view.web.test/src/org/eclipse/osee/ats/view/web/placeholder.txt
+++ /dev/null
diff --git a/plugins/org.eclipse.osee.ats.view.web/.classpath b/plugins/org.eclipse.osee.ats.view.web/.classpath
deleted file mode 100644
index ad32c83a78..0000000000
--- a/plugins/org.eclipse.osee.ats.view.web/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/org.eclipse.osee.ats.view.web/.project b/plugins/org.eclipse.osee.ats.view.web/.project
deleted file mode 100644
index 0243ecc39f..0000000000
--- a/plugins/org.eclipse.osee.ats.view.web/.project
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.osee.ats.view.web</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ds.core.builder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/plugins/org.eclipse.osee.ats.view.web/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.ats.view.web/META-INF/MANIFEST.MF
deleted file mode 100644
index 0840d79b7f..0000000000
--- a/plugins/org.eclipse.osee.ats.view.web/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,20 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Osee Ats Web View (Incubation)
-Bundle-SymbolicName: org.eclipse.osee.ats.view.web
-Bundle-Version: 0.17.0.qualifier
-Bundle-Vendor: Eclipse Open System Engineering Environment
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Service-Component: OSGI-INF/*.xml
-Require-Bundle: com.vaadin,
- org.eclipse.osee.vaadin.widgets,
- org.eclipse.osee.display.view.web,
- org.eclipse.osee.vaadin,
- org.eclipse.osee.display.api,
- org.eclipse.osee.logger
-Import-Package: org.eclipse.osee.ats.ui.api.data,
- org.eclipse.osee.ats.ui.api.search,
- org.eclipse.osee.ats.ui.api.view,
- org.eclipse.osee.framework.jdk.core.type,
- org.eclipse.osee.orcs,
- org.osgi.framework
diff --git a/plugins/org.eclipse.osee.ats.view.web/OSGI-INF/ats.ui.app.factory.xml b/plugins/org.eclipse.osee.ats.view.web/OSGI-INF/ats.ui.app.factory.xml
deleted file mode 100644
index 74c4a0ef49..0000000000
--- a/plugins/org.eclipse.osee.ats.view.web/OSGI-INF/ats.ui.app.factory.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.eclipse.osee.ats.view.web.AtsUiApplicationFactory">
- <implementation class="org.eclipse.osee.ats.view.web.AtsUiApplicationFactory"/>
- <property name="context.name" type="String" value="ui/ats"/>
- <service>
- <provide interface="org.eclipse.osee.vaadin.ApplicationFactory"/>
- </service>
- <reference bind="setLogger" cardinality="1..1" interface="org.eclipse.osee.logger.Log" name="Log" policy="static"/>
- <reference bind="setPresenterFactory" cardinality="1..1" interface="org.eclipse.osee.ats.ui.api.search.AtsPresenterFactory" name="AtsPresenterFactory" policy="static"/>
-</scr:component>
diff --git a/plugins/org.eclipse.osee.ats.view.web/build.properties b/plugins/org.eclipse.osee.ats.view.web/build.properties
deleted file mode 100644
index c58ea2178c..0000000000
--- a/plugins/org.eclipse.osee.ats.view.web/build.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
- .,\
- OSGI-INF/
diff --git a/plugins/org.eclipse.osee.ats.view.web/pom.xml b/plugins/org.eclipse.osee.ats.view.web/pom.xml
deleted file mode 100644
index 7cc224785d..0000000000
--- a/plugins/org.eclipse.osee.ats.view.web/pom.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.eclipse.osee</groupId>
- <artifactId>org.eclipse.osee.x.ats.parent</artifactId>
- <version>0.17.0-SNAPSHOT</version>
- <relativePath>../../plugins/org.eclipse.osee.x.ats.parent</relativePath>
- </parent>
-
- <artifactId>org.eclipse.osee.ats.view.web</artifactId>
- <packaging>eclipse-plugin</packaging>
- <name>OSEE Ats View Web - (Incubation)</name>
-
- <build>
- <!-- workaround for https://issues.sonatype.org/browse/TYCHO-168 -->
- <resources>
- <resource>
- <directory>src</directory>
- <excludes>
- <exclude>**/*.java</exclude>
- </excludes>
- </resource>
- </resources>
- <plugins>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-source-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
-</project> \ No newline at end of file
diff --git a/plugins/org.eclipse.osee.ats.view.web/src/org/eclipse/osee/ats/view/web/AtsNavigator.java b/plugins/org.eclipse.osee.ats.view.web/src/org/eclipse/osee/ats/view/web/AtsNavigator.java
deleted file mode 100644
index 9fdd71635d..0000000000
--- a/plugins/org.eclipse.osee.ats.view.web/src/org/eclipse/osee/ats/view/web/AtsNavigator.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*******************************************************************************
- * 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.ats.view.web;
-
-import org.eclipse.osee.ats.view.web.search.AtsArtifactView;
-import org.eclipse.osee.ats.view.web.search.AtsSearchResultsView;
-import org.eclipse.osee.display.api.search.SearchNavigator;
-import org.eclipse.osee.vaadin.widgets.Navigator;
-
-/**
- * @author Shawn F. Cook
- */
-@SuppressWarnings("serial")
-public class AtsNavigator extends Navigator implements SearchNavigator {
-
- @Override
- public void navigateSearchResults(String url) {
- synchronized (getApplication()) {
- String classUri = getUri(AtsSearchResultsView.class);
- this.navigateTo(String.format("%s%s", classUri, url));
- }
- }
-
- @Override
- public void navigateArtifactPage(String url) {
- synchronized (getApplication()) {
- String classUri = getUri(AtsArtifactView.class);
- this.navigateTo(String.format("%s%s", classUri, url));
- }
- }
-
-}
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
deleted file mode 100644
index 00da1a5ad9..0000000000
--- a/plugins/org.eclipse.osee.ats.view.web/src/org/eclipse/osee/ats/view/web/AtsUiApplication.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*******************************************************************************
- * 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.ats.view.web;
-
-import java.util.Locale;
-import org.eclipse.osee.ats.ui.api.data.AtsSearchParameters;
-import org.eclipse.osee.ats.ui.api.search.AtsSearchPresenter;
-import org.eclipse.osee.ats.ui.api.view.AtsSearchHeaderComponent;
-import org.eclipse.osee.display.view.web.HasLogger;
-import org.eclipse.osee.display.view.web.HasNavigator;
-import org.eclipse.osee.display.view.web.HasPresenter;
-import org.eclipse.osee.display.view.web.HasUrl;
-import org.eclipse.osee.logger.Log;
-import org.eclipse.osee.vaadin.AbstractApplication;
-import org.eclipse.osee.vaadin.widgets.HasViews;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.FrameworkUtil;
-import com.vaadin.ui.Window;
-
-/**
- * @author Shawn F. Cook
- */
-@SuppressWarnings("serial")
-public class AtsUiApplication<T extends AtsSearchHeaderComponent, K extends AtsSearchParameters> extends AbstractApplication implements HasUrl, HasNavigator, HasPresenter, HasLogger {
-
- private final AtsSearchPresenter<T, K> atsSearchPresenter;
- private String url = "";
- private final Log logger;
-
- public AtsUiApplication(AtsSearchPresenter<T, K> searchPresenter, Log logger) {
- super();
- this.atsSearchPresenter = searchPresenter;
- this.logger = logger;
- setTheme("osee");
- }
-
- @Override
- protected Window createApplicationWindow(Locale locale) {
- HasViews viewProvider = new AtsUiViews();
- AtsWindow window = new AtsWindow(viewProvider, new AtsNavigator());
- return window;
- }
-
- @Override
- protected String getApplicationWindowName() {
- return "AtsUiApplication";
- }
-
- @Override
- public AtsNavigator getNavigator() {
- AtsWindow atsWindow = (AtsWindow) getCurrentWindow();
- return atsWindow.getNavigator();
- }
-
- @Override
- public AtsSearchPresenter<T, K> getPresenter() {
- return atsSearchPresenter;
- }
-
- @Override
- public String getUrl() {
- return url;
- }
-
- @Override
- public void setUrl(String url) {
- this.url = url;
- }
-
- @Override
- public String getVersion() {
- Bundle bundle = FrameworkUtil.getBundle(this.getClass());
- return bundle.getVersion().toString();
- }
-
- @Override
- public void logError(String format, Object... args) {
- logger.error(format, args);
- }
-
- @Override
- public void logWarn(String format, Object... args) {
- logger.warn(format, args);
- }
-
- @Override
- public void logInfo(String format, Object... args) {
- logger.info(format, args);
- }
-
- @Override
- public void logDebug(String format, Object... args) {
- logger.debug(format, args);
- }
-
-}
diff --git a/plugins/org.eclipse.osee.ats.view.web/src/org/eclipse/osee/ats/view/web/AtsUiApplicationFactory.java b/plugins/org.eclipse.osee.ats.view.web/src/org/eclipse/osee/ats/view/web/AtsUiApplicationFactory.java
deleted file mode 100644
index 36e5b18c68..0000000000
--- a/plugins/org.eclipse.osee.ats.view.web/src/org/eclipse/osee/ats/view/web/AtsUiApplicationFactory.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 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.ats.view.web;
-
-import org.eclipse.osee.ats.ui.api.data.AtsSearchParameters;
-import org.eclipse.osee.ats.ui.api.search.AtsPresenterFactory;
-import org.eclipse.osee.ats.ui.api.search.AtsSearchPresenter;
-import org.eclipse.osee.ats.ui.api.view.AtsSearchHeaderComponent;
-import org.eclipse.osee.logger.Log;
-import org.eclipse.osee.orcs.ApplicationContext;
-import org.eclipse.osee.vaadin.AbstractApplication;
-import org.eclipse.osee.vaadin.ApplicationFactory;
-
-/**
- * @author Shawn F. Cook
- */
-public class AtsUiApplicationFactory implements ApplicationFactory {
-
- private AtsPresenterFactory<AtsSearchHeaderComponent, AtsSearchParameters> presenterFactory;
- private Log logger;
-
- public void setPresenterFactory(AtsPresenterFactory<AtsSearchHeaderComponent, AtsSearchParameters> presenterFactory) {
- this.presenterFactory = presenterFactory;
- }
-
- public void setLogger(Log logger) {
- this.logger = logger;
- }
-
- @Override
- public AbstractApplication createInstance() {
- AtsApplicationContext context = new AtsApplicationContext();
-
- AtsSearchPresenter<AtsSearchHeaderComponent, AtsSearchParameters> searchPresenter =
- presenterFactory.createInstance(context);
-
- AtsUiApplication<AtsSearchHeaderComponent, AtsSearchParameters> application =
- new AtsUiApplication<AtsSearchHeaderComponent, AtsSearchParameters>(searchPresenter, logger);
-
- // TODO attach context
- context.setUser(application.getUser());
- return application;
- }
-
- @Override
- public Class<? extends AbstractApplication> getApplicationClass() {
- return AtsUiApplication.class;
- }
-
- private final class AtsApplicationContext implements ApplicationContext {
- private Object user;
-
- @Override
- public String getSessionId() {
- return user != null ? user.toString() : "dummy";
- }
-
- public void setUser(Object user) {
- this.user = user;
- }
- }
-
-}
diff --git a/plugins/org.eclipse.osee.ats.view.web/src/org/eclipse/osee/ats/view/web/AtsUiViews.java b/plugins/org.eclipse.osee.ats.view.web/src/org/eclipse/osee/ats/view/web/AtsUiViews.java
deleted file mode 100644
index ed02a3cd18..0000000000
--- a/plugins/org.eclipse.osee.ats.view.web/src/org/eclipse/osee/ats/view/web/AtsUiViews.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 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.ats.view.web;
-
-import java.util.ArrayList;
-import java.util.List;
-import org.eclipse.osee.ats.view.web.search.AtsArtifactView;
-import org.eclipse.osee.ats.view.web.search.AtsSearchResultsView;
-import org.eclipse.osee.vaadin.widgets.HasViews;
-import org.eclipse.osee.vaadin.widgets.Navigator;
-
-/**
- * @author Roberto E. Escobar
- */
-public class AtsUiViews implements HasViews {
-
- @Override
- public List<Class<? extends Navigator.View>> getViews() {
- List<Class<? extends Navigator.View>> views = new ArrayList<Class<? extends Navigator.View>>();
- // views.add(AtsSearchHomeView.class);
- views.add(AtsSearchResultsView.class);
- views.add(AtsArtifactView.class);
- return views;
- }
-} \ No newline at end of file
diff --git a/plugins/org.eclipse.osee.ats.view.web/src/org/eclipse/osee/ats/view/web/AtsWindow.java b/plugins/org.eclipse.osee.ats.view.web/src/org/eclipse/osee/ats/view/web/AtsWindow.java
deleted file mode 100644
index c2bfd79928..0000000000
--- a/plugins/org.eclipse.osee.ats.view.web/src/org/eclipse/osee/ats/view/web/AtsWindow.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 20011 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.ats.view.web;
-
-import org.eclipse.osee.vaadin.HasMultiplePages;
-import org.eclipse.osee.vaadin.widgets.AccountMenuBar;
-import org.eclipse.osee.vaadin.widgets.HasViewTitle;
-import org.eclipse.osee.vaadin.widgets.HasViews;
-import org.eclipse.osee.vaadin.widgets.Navigator;
-import org.eclipse.osee.vaadin.widgets.Navigator.View;
-import org.eclipse.osee.vaadin.widgets.Navigator.ViewChangeListener;
-import com.vaadin.ui.Alignment;
-import com.vaadin.ui.Component;
-import com.vaadin.ui.HorizontalLayout;
-import com.vaadin.ui.MenuBar;
-import com.vaadin.ui.VerticalLayout;
-import com.vaadin.ui.Window;
-
-/**
- * @author Shawn F. Cook
- */
-public class AtsWindow extends Window implements HasMultiplePages {
-
- private static final long serialVersionUID = 307122520779262094L;
-
- private final HasViews provider;
- private final AtsNavigator navigator;
- private VerticalLayout layout;
- private View currentView;
-
- public AtsWindow(HasViews provider, AtsNavigator navigator) {
- super("OSEE");
- this.provider = provider;
- this.navigator = navigator;
- }
-
- public AtsNavigator getNavigator() {
- return navigator;
- }
-
- @Override
- public void attach() {
- super.attach();
- layout = new VerticalLayout();
- setContent(layout);
-
- for (final Class<?> viewClass : provider.getViews()) {
- navigator.addView(viewClass.getSimpleName(), viewClass);
- }
- addComponent(createNavigationBar(navigator, provider));
- addComponent(navigator);
-
- layout.setMargin(false);
- layout.setSpacing(true);
- layout.setSizeFull();
- layout.setExpandRatio(navigator, 1.0f);
-
- navigator.addListener(new ViewChangeListener() {
- @Override
- public void navigatorViewChange(View previous, View current) {
- currentView = current;
- Window mainWindow = getApplication().getMainWindow();
- String title = "OSEE";
- if (current instanceof HasViewTitle) {
- String currentTitle = ((HasViewTitle) current).getViewTitle();
- if (currentTitle != null && !currentTitle.isEmpty()) {
- title = String.format("%s - %s", title, currentTitle);
- }
- }
- mainWindow.setCaption(title);
- }
- });
- }
-
- private Component createNavigationBar(final Navigator navigator, HasViews provider) {
- HorizontalLayout layout = new HorizontalLayout();
-
- MenuBar menu = new MenuBar();
- layout.addComponent(menu);
-
- menu.setWidth("100%");
- layout.setWidth("100%");
-
- MenuBar menuBar = new AccountMenuBar();
- layout.addComponent(menuBar);
-
- layout.setComponentAlignment(menu, Alignment.BOTTOM_LEFT);
- layout.setComponentAlignment(menuBar, Alignment.BOTTOM_RIGHT);
- layout.setExpandRatio(menu, 1.0f);
- return layout;
- }
-
- @Override
- public void setToDefault() {
- navigator.navigateTo(provider.getViews().get(0));
- }
-
- @Override
- public Component getCurrentPage() {
- return currentView;
- }
-}
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
deleted file mode 100644
index e217183404..0000000000
--- a/plugins/org.eclipse.osee.ats.view.web/src/org/eclipse/osee/ats/view/web/components/AtsSearchHeaderImpl.java
+++ /dev/null
@@ -1,408 +0,0 @@
-/*******************************************************************************
- * 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.ats.view.web.components;
-
-import org.eclipse.osee.ats.ui.api.data.AtsSearchParameters;
-import org.eclipse.osee.ats.ui.api.search.AtsSearchPresenter;
-import org.eclipse.osee.ats.ui.api.view.AtsSearchHeaderComponent;
-import org.eclipse.osee.ats.view.web.AtsUiApplication;
-import org.eclipse.osee.ats.view.web.search.AtsSearchResultsView;
-import org.eclipse.osee.display.api.data.ViewId;
-import org.eclipse.osee.display.api.search.SearchProgressListener;
-import org.eclipse.osee.display.api.search.SearchProgressProvider;
-import org.eclipse.osee.display.view.web.CssConstants;
-import org.eclipse.osee.display.view.web.components.ComponentUtility;
-import org.eclipse.osee.display.view.web.components.OseeExceptionDialogComponent;
-import org.eclipse.osee.display.view.web.components.OseeLeftMarginContainer;
-import org.eclipse.osee.display.view.web.components.OseeLogoLink;
-import org.eclipse.osee.display.view.web.components.OseeSearchHeaderComponent;
-import org.eclipse.osee.vaadin.widgets.HasViewTitle;
-import com.vaadin.Application;
-import com.vaadin.data.Property;
-import com.vaadin.data.Property.ValueChangeEvent;
-import com.vaadin.event.Action;
-import com.vaadin.event.Action.Handler;
-import com.vaadin.event.ShortcutAction;
-import com.vaadin.ui.Alignment;
-import com.vaadin.ui.Button;
-import com.vaadin.ui.CheckBox;
-import com.vaadin.ui.ComboBox;
-import com.vaadin.ui.HorizontalLayout;
-import com.vaadin.ui.Label;
-import com.vaadin.ui.Panel;
-import com.vaadin.ui.ProgressIndicator;
-import com.vaadin.ui.TextField;
-import com.vaadin.ui.VerticalLayout;
-import com.vaadin.ui.Window.Notification;
-
-/**
- * @author Shawn F. Cook
- */
-@SuppressWarnings("serial")
-public class AtsSearchHeaderImpl extends OseeSearchHeaderComponent implements AtsSearchHeaderComponent, Handler, HasViewTitle, SearchProgressListener {
-
- private final String SEARCHBUTTON_SEARCH = "Search";
- private final String SEARCHBUTTON_CANCEL = "Cancel";
- private boolean isLayoutComplete = false;
- private final ComboBox programCombo = new ComboBox("Program:");
- 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(SEARCHBUTTON_SEARCH);
- private boolean lockProgramCombo = false;
- private final Panel searchTextPanel = new Panel();
- private final ProgressIndicator progressIndicator = new ProgressIndicator();
- private final Label workingLabel = new Label("Working");
- private boolean isSearchInProgress = false;
-
- @Override
- public void attach() {
- if (!isLayoutComplete) {
- AtsSearchPresenter searchPresenter = getPresenter();
- if (searchPresenter != null && searchPresenter instanceof SearchProgressProvider) {
- ((SearchProgressProvider) searchPresenter).addListener(this);
- } else {
- ComponentUtility.logWarn("AtsSearchHeaderImpl.attach() Invalid searchPresenter", this);
- }
- createLayout();
- }
- 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 (ComponentUtility.isAccessible(programCombo)) {
- ViewId program = (ViewId) programCombo.getValue();
- getPresenter().selectProgram(program, this);
- }
- }
-
- public AtsSearchHeaderImpl() {
- if (ComponentUtility.isAccessible(programCombo)) {
- programCombo.setNullSelectionAllowed(false);
- programCombo.addListener(new Property.ValueChangeListener() {
- @Override
- public void valueChange(ValueChangeEvent event) {
- if (!lockProgramCombo) {
- selectProgram();
- }
- validateSearchAndEnableSearchButton();
- }
- });
- programCombo.setImmediate(true);
-
- buildCombo.addListener(new Property.ValueChangeListener() {
- @Override
- public void valueChange(ValueChangeEvent event) {
- validateSearchAndEnableSearchButton();
- }
- });
- buildCombo.setImmediate(true);
- }
- if (ComponentUtility.isAccessible(buildCombo)) {
- buildCombo.setNullSelectionAllowed(false);
- }
-
- searchTextField.setImmediate(true);
- validateSearchAndEnableSearchButton();
- }
-
- protected void selectSearch() {
- if (searchButton.isEnabled()) {
- if (searchButton.getCaption().equals(SEARCHBUTTON_SEARCH)) {
- if (ComponentUtility.isAccessible(programCombo, buildCombo, nameOnlyCheckBox, searchTextField)) {
- 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);
- getPresenter().selectSearch(getRequestedDataId(), params, ComponentUtility.getNavigator(this));
- } else {
- ComponentUtility.logWarn("AtsSearchHeaderComponent.selectSearch - WARNING: null value detected.", this);
- }
- } else if (searchButton.getCaption().equals(SEARCHBUTTON_CANCEL)) {
- getPresenter().selectCancel();
- }
- }
- }
-
- private void startPolling() {
- progressIndicator.setVisible(true);
- }
-
- private void stopPolling() {
- progressIndicator.setVisible(false);
- }
-
- public void createLayout() {
- setWidth(100, UNITS_PERCENTAGE);
- setStyleName(CssConstants.OSEE_SEARCH_HEADER_COMPONENT_SMALL);
-
- HorizontalLayout hLayout_ProgBuildName = new HorizontalLayout();
- HorizontalLayout hLayout_SearchTextBtn = new HorizontalLayout();
- hLayout_ProgBuildName.setSizeUndefined();
- hLayout_SearchTextBtn.setSizeUndefined();
-
- Label hSpacer_ProgBuild = new Label("");
- hSpacer_ProgBuild.setHeight(null);
- hSpacer_ProgBuild.setWidth(30, UNITS_PIXELS);
- Label hSpacer_BuildName = new Label("");
- hSpacer_BuildName.setHeight(null);
- hSpacer_BuildName.setWidth(30, UNITS_PIXELS);
-
- searchTextField.setStyleName(CssConstants.OSEE_SEARCH_TEXTFIELD);
-
- Label hSpacer_SearchTextBtn = new Label("");
- hSpacer_SearchTextBtn.setHeight(null);
- hSpacer_SearchTextBtn.setWidth(30, UNITS_PIXELS);
- searchButton.addListener(new Button.ClickListener() {
- @Override
- public void buttonClick(Button.ClickEvent event) {
- selectSearch();
- }
- });
-
- OseeLogoLink oseeLogoImg = new OseeLogoLink(CssConstants.OSEE_TITLE_MEDIUM_TEXT, AtsSearchResultsView.class);
- Label hSpacer_LogoRight = new Label("");
- oseeLogoImg.setSizeUndefined();
-
- hSpacer_LogoRight.setWidth(15, UNITS_PIXELS);
-
- VerticalLayout vLayout_SearchCrit = new VerticalLayout();
- vLayout_SearchCrit.setSizeUndefined();
-
- OseeLeftMarginContainer leftMarginContainer = new OseeLeftMarginContainer();
-
- HorizontalLayout hLayout_SearchText = new HorizontalLayout();
- searchTextPanel.setScrollable(false);
- searchTextPanel.addActionHandler(this);
- searchTextPanel.setContent(hLayout_SearchText);
- progressIndicator.setPollingInterval(500);
- progressIndicator.setStyleName("invisible");
- workingLabel.setVisible(false);
- stopPolling();
-
- hLayout_SearchText.addComponent(searchTextField);
-
- hLayout_ProgBuildName.addComponent(programCombo);
- hLayout_ProgBuildName.addComponent(hSpacer_ProgBuild);
- hLayout_ProgBuildName.addComponent(buildCombo);
- hLayout_ProgBuildName.addComponent(hSpacer_BuildName);
- hLayout_ProgBuildName.addComponent(nameOnlyCheckBox);
- hLayout_ProgBuildName.addComponent(workingLabel);
-
- hLayout_SearchTextBtn.addComponent(searchTextPanel);
- hLayout_SearchTextBtn.addComponent(hSpacer_SearchTextBtn);
- hLayout_SearchTextBtn.addComponent(searchButton);
- hLayout_SearchTextBtn.addComponent(progressIndicator);
-
- vLayout_SearchCrit.addComponent(hLayout_ProgBuildName);
- vLayout_SearchCrit.addComponent(hLayout_SearchTextBtn);
-
- leftMarginContainer.addComponent(oseeLogoImg);
- leftMarginContainer.addComponent(hSpacer_LogoRight);
- leftMarginContainer.addComponent(vLayout_SearchCrit);
-
- setCompositionRoot(leftMarginContainer);
-
- hLayout_ProgBuildName.setComponentAlignment(programCombo, Alignment.MIDDLE_LEFT);
- hLayout_ProgBuildName.setComponentAlignment(buildCombo, Alignment.MIDDLE_CENTER);
- hLayout_ProgBuildName.setComponentAlignment(nameOnlyCheckBox, Alignment.BOTTOM_RIGHT);
-
- hLayout_SearchTextBtn.setComponentAlignment(searchButton, Alignment.MIDDLE_RIGHT);
- }
-
- @Override
- public void addProgram(ViewId program) {
- if (ComponentUtility.isAccessible(programCombo)) {
- lockProgramCombo = true;
- programCombo.addItem(program);
- lockProgramCombo = false;
- }
- }
-
- @Override
- public void clearBuilds() {
- if (ComponentUtility.isAccessible(buildCombo) && !lockProgramCombo) {
- buildCombo.removeAllItems();
- }
- }
-
- @Override
- public void addBuild(ViewId build) {
- if (ComponentUtility.isAccessible(buildCombo)) {
- buildCombo.addItem(build);
- }
- }
-
- @Override
- public void setSearchCriteria(AtsSearchParameters params) {
- if (params != null) {
- if (ComponentUtility.isAccessible(programCombo)) {
- // lockProgramCombo = true;
- programCombo.setValue(params.getProgram());
- // lockProgramCombo = false;
- }
- if (ComponentUtility.isAccessible(buildCombo)) {
- buildCombo.setValue(params.getBuild());
- }
- if (ComponentUtility.isAccessible(nameOnlyCheckBox)) {
- nameOnlyCheckBox.setValue(params.isNameOnly());
- }
- if (ComponentUtility.isAccessible(searchTextField)) {
- searchTextField.setValue(params.getSearchString());
- }
- } else {
- ComponentUtility.logWarn("AtsSearchHeaderComponent.setSearchCriteria - WARNING: null value detected.", this);
- }
- }
-
- @Override
- public void clearAll() {
- if (ComponentUtility.isAccessible(programCombo)) {
- // programCombo.removeAllItems();
- programCombo.setValue(null);
- }
- if (ComponentUtility.isAccessible(buildCombo)) {
- // buildCombo.removeAllItems();
- buildCombo.setValue(null);
- }
- if (ComponentUtility.isAccessible(nameOnlyCheckBox)) {
- nameOnlyCheckBox.setValue(true);
- }
- if (ComponentUtility.isAccessible(searchTextField)) {
- searchTextField.setValue("");
- }
- }
-
- @Override
- public void setErrorMessage(String shortMsg, String longMsg, MsgType msgType) {
- OseeExceptionDialogComponent dlg =
- new OseeExceptionDialogComponent(msgType, shortMsg, longMsg, getApplication().getMainWindow());
- }
-
- //TODO: None of this works because Vaadin only supports key actions for Windows and Panel Objects. (this is
- // a Component)
- private final Action action_enter = new ShortcutAction("Enter key", ShortcutAction.KeyCode.ENTER, null);
- private final Action[] actions = new Action[] {action_enter};
-
- @Override
- public Action[] getActions(Object target, Object sender) {
- return actions;
- }
-
- @Override
- public void handleAction(Action action, Object sender, Object target) {
- if (sender == searchTextPanel && action == action_enter) {
- selectSearch();
- }
- }
-
- @SuppressWarnings("unchecked")
- @Override
- public AtsUiApplication<AtsSearchHeaderComponent, AtsSearchParameters> getApplication() {
- return (AtsUiApplication<AtsSearchHeaderComponent, AtsSearchParameters>) super.getApplication();
- }
-
- private AtsSearchPresenter<AtsSearchHeaderComponent, AtsSearchParameters> getPresenter() {
- return getApplication().getPresenter();
- }
-
- private String getRequestedDataId() {
- return getApplication().getUrl();
- }
-
- @Override
- public String getViewTitle() {
- return (String) this.searchTextField.getValue();
- }
-
- @Override
- public void searchInProgress() {
- programCombo.setEnabled(false);
- buildCombo.setEnabled(false);
- nameOnlyCheckBox.setEnabled(false);
- searchTextField.setEnabled(false);
- searchButton.setCaption(SEARCHBUTTON_CANCEL);
- isSearchInProgress = true;
- startPolling();
-
- Thread thread = new Thread(new Runnable() {
- private int i = 0;
-
- @Override
- public void run() {
- workingLabel.setVisible(true);
- while (isSearchInProgress) {
- if (i == 0) {
- workingLabel.setStyleName(CssConstants.OSEE_WORKING_LABEL_1);
- workingLabel.setValue("Working.");
- i++;
- } else if (i == 1) {
- workingLabel.setStyleName(CssConstants.OSEE_WORKING_LABEL_2);
- workingLabel.setValue("Working..");
- i++;
- } else {
- workingLabel.setStyleName(CssConstants.OSEE_WORKING_LABEL_3);
- workingLabel.setValue("Working...");
- i = 0;
- }
- try {
- Thread.sleep(500);
- } catch (InterruptedException ex) {
- ComponentUtility.logWarn(
- "AtsSearchHeaderComponent.searchInProgress.Runnable.run - WARNING: InterruptedException.",
- AtsSearchHeaderImpl.this);
- break;
- }
- }
- workingLabel.setVisible(false);
- stopPolling();
- }
- }, "thread_working_label");
- thread.start();
- }
-
- @Override
- public void searchCancelled() {
- programCombo.setEnabled(true);
- buildCombo.setEnabled(true);
- nameOnlyCheckBox.setEnabled(true);
- searchTextField.setEnabled(true);
- validateSearchAndEnableSearchButton();
- searchButton.setCaption(SEARCHBUTTON_SEARCH);
- Application application = getApplication();
- if (application != null) {
- application.getMainWindow().showNotification("Search Cancelled", Notification.TYPE_TRAY_NOTIFICATION);
- }
- isSearchInProgress = false;
- }
-
- @Override
- public void searchCompleted() {
- programCombo.setEnabled(true);
- buildCombo.setEnabled(true);
- nameOnlyCheckBox.setEnabled(true);
- searchTextField.setEnabled(true);
- validateSearchAndEnableSearchButton();
- searchButton.setCaption(SEARCHBUTTON_SEARCH);
- isSearchInProgress = false;
- }
-}
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
deleted file mode 100644
index 387c023e61..0000000000
--- a/plugins/org.eclipse.osee.ats.view.web/src/org/eclipse/osee/ats/view/web/search/AtsArtifactView.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * 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.ats.view.web.search;
-
-import org.eclipse.osee.ats.view.web.AtsUiApplication;
-import org.eclipse.osee.ats.view.web.components.AtsSearchHeaderImpl;
-import org.eclipse.osee.display.view.web.search.OseeArtifactView;
-
-/**
- * @author Shawn F. Cook
- */
-@SuppressWarnings("serial")
-public class AtsArtifactView extends OseeArtifactView {
-
- @Override
- protected void initComponents() {
- setSearchHeader(new AtsSearchHeaderImpl());
- }
-
- @Override
- protected void callInit(String url) {
- AtsUiApplication atsApp = (AtsUiApplication) this.getApplication();
- atsApp.getPresenter().initArtifactPage(url, getSearchHeader(), 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
deleted file mode 100644
index f038c57246..0000000000
--- a/plugins/org.eclipse.osee.ats.view.web/src/org/eclipse/osee/ats/view/web/search/AtsSearchResultsView.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * 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.ats.view.web.search;
-
-import org.eclipse.osee.ats.view.web.AtsUiApplication;
-import org.eclipse.osee.ats.view.web.components.AtsSearchHeaderImpl;
-import org.eclipse.osee.display.view.web.search.OseeSearchResultsView;
-
-/**
- * @author Shawn F. Cook
- */
-@SuppressWarnings("serial")
-public class AtsSearchResultsView extends OseeSearchResultsView {
-
- @Override
- protected void initComponents() {
- setSearchHeader(new AtsSearchHeaderImpl());
- }
-
- @Override
- protected void callInit(String url) {
- AtsUiApplication atsApp = (AtsUiApplication) this.getApplication();
- atsApp.getPresenter().initSearchResults(url, getSearchHeader(), searchResultsListComponent,
- searchResultsListComponent.getDisplayOptionsComponent());
- }
-}
diff --git a/plugins/org.eclipse.osee.display.api/.classpath b/plugins/org.eclipse.osee.display.api/.classpath
deleted file mode 100644
index ad32c83a78..0000000000
--- a/plugins/org.eclipse.osee.display.api/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/org.eclipse.osee.display.api/.project b/plugins/org.eclipse.osee.display.api/.project
deleted file mode 100644
index 51115d6d24..0000000000
--- a/plugins/org.eclipse.osee.display.api/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.osee.display.api</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/plugins/org.eclipse.osee.display.api/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.display.api/META-INF/MANIFEST.MF
deleted file mode 100644
index f82a242a28..0000000000
--- a/plugins/org.eclipse.osee.display.api/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,17 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Osee Display
-Bundle-SymbolicName: org.eclipse.osee.display.api
-Bundle-Version: 0.17.0.qualifier
-Bundle-Vendor: Eclipse Open System Engineering Environment
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: org.eclipse.osee.display.api.data,
- org.eclipse.osee.framework.core.data,
- org.eclipse.osee.framework.core.exception,
- org.eclipse.osee.framework.jdk.core.type,
- org.eclipse.osee.orcs.data,
- org.eclipse.osee.orcs.search
-Export-Package: org.eclipse.osee.display.api,
- org.eclipse.osee.display.api.components,
- org.eclipse.osee.display.api.data,
- org.eclipse.osee.display.api.search
diff --git a/plugins/org.eclipse.osee.display.api/build.properties b/plugins/org.eclipse.osee.display.api/build.properties
deleted file mode 100644
index 34d2e4d2da..0000000000
--- a/plugins/org.eclipse.osee.display.api/build.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
- .
diff --git a/plugins/org.eclipse.osee.display.api/pom.xml b/plugins/org.eclipse.osee.display.api/pom.xml
deleted file mode 100644
index 964f56eea6..0000000000
--- a/plugins/org.eclipse.osee.display.api/pom.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.eclipse.osee</groupId>
- <artifactId>org.eclipse.osee.x.ats.parent</artifactId>
- <version>0.17.0-SNAPSHOT</version>
- <relativePath>../../plugins/org.eclipse.osee.x.ats.parent</relativePath>
- </parent>
-
- <artifactId>org.eclipse.osee.display.api</artifactId>
- <packaging>eclipse-plugin</packaging>
- <name>OSEE Display - (Incubation)</name>
-
- <build>
- <!-- workaround for https://issues.sonatype.org/browse/TYCHO-168 -->
- <resources>
- <resource>
- <directory>src</directory>
- <excludes>
- <exclude>**/*.java</exclude>
- </excludes>
- </resource>
- </resources>
- <plugins>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-source-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
-</project> \ No newline at end of file
diff --git a/plugins/org.eclipse.osee.display.api/src/org/eclipse/osee/display/api/EmailView.java b/plugins/org.eclipse.osee.display.api/src/org/eclipse/osee/display/api/EmailView.java
deleted file mode 100644
index 2992112c04..0000000000
--- a/plugins/org.eclipse.osee.display.api/src/org/eclipse/osee/display/api/EmailView.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*******************************************************************************
- * 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;
-
-import java.util.Collection;
-
-/**
- * @author Roberto E. Escobar
- */
-public interface EmailView {
-
- public static interface SendListener {
- void onSend();
- }
-
- public static interface Validator {
- boolean accept(String toValidate);
- }
-
- public enum EmailSendStatus {
- SEND_IN_PROGRESS,
- SUCCESS,
- CANCELLED,
- FAILED,
- NONE;
- }
-
- void setFrom(String email);
-
- String getFrom();
-
- void setReplyTo(Collection<String> emails);
-
- Collection<String> getReplyTos();
-
- void setRecipients(Collection<String> emails);
-
- Collection<String> getRecipients();
-
- void setSubject(String subject);
-
- String getSubject();
-
- void setBody(String body);
-
- String getBody();
-
- void setEmailStatus(EmailSendStatus status);
-
- void addOnSendListener(SendListener listener);
-
- void addEmailValidator(Validator validator);
-
- void displayMessage(String caption);
-
- void displayMessage(String caption, String description);
-}
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
deleted file mode 100644
index c51169e840..0000000000
--- a/plugins/org.eclipse.osee.display.api/src/org/eclipse/osee/display/api/components/ArtifactHeaderComponent.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*******************************************************************************
- * 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;
-
-import org.eclipse.osee.display.api.data.ViewArtifact;
-
-/**
- * @author Shawn F. Cook
- */
-public interface ArtifactHeaderComponent extends DisplaysErrorComponent {
-
- void clearAll();
-
- void setArtifact(ViewArtifact artifact);
-
-}
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
deleted file mode 100644
index d97556fbcf..0000000000
--- a/plugins/org.eclipse.osee.display.api/src/org/eclipse/osee/display/api/components/AttributeComponent.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*******************************************************************************
- * 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 Shawn F. Cook
- */
-public interface AttributeComponent extends DisplaysErrorComponent {
-
- void clearAll();
-
- void addAttribute(String type, String value);
-
-}
diff --git a/plugins/org.eclipse.osee.display.api/src/org/eclipse/osee/display/api/components/DisplayOptionsComponent.java b/plugins/org.eclipse.osee.display.api/src/org/eclipse/osee/display/api/components/DisplayOptionsComponent.java
deleted file mode 100644
index b5c0117b73..0000000000
--- a/plugins/org.eclipse.osee.display.api/src/org/eclipse/osee/display/api/components/DisplayOptionsComponent.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*******************************************************************************
- * 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;
-
-import org.eclipse.osee.display.api.data.DisplayOptions;
-
-/**
- * @author John R. Misinco
- */
-public interface DisplayOptionsComponent {
-
- void clearAll();
-
- void setDisplayOptions(DisplayOptions options);
-}
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
deleted file mode 100644
index c523b7f773..0000000000
--- a/plugins/org.eclipse.osee.display.api/src/org/eclipse/osee/display/api/components/DisplaysErrorComponent.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*******************************************************************************
- * 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 R. Misinco
- */
-public interface DisplaysErrorComponent {
- public enum MsgType {
- MSGTYPE_ERROR,
- MSGTYPE_WARNING;
- }
-
- void setErrorMessage(String shortMsg, String longMsg, MsgType msgType);
-
-}
diff --git a/plugins/org.eclipse.osee.display.api/src/org/eclipse/osee/display/api/components/PagingComponent.java b/plugins/org.eclipse.osee.display.api/src/org/eclipse/osee/display/api/components/PagingComponent.java
deleted file mode 100644
index 56cf530101..0000000000
--- a/plugins/org.eclipse.osee.display.api/src/org/eclipse/osee/display/api/components/PagingComponent.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2013 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;
-
-import java.util.Collection;
-
-public interface PagingComponent {
- //How many items are in your collection? i.e. Collection<T>.size()
- public void setManyItemsTotal(int manyItemsTotal);
-
- public void gotoFirstPage();
-
- public void gotoPrevPage();
-
- public void gotoNextPage();
-
- public void gotoLastPage();
-
- public Collection<Integer> getCurrentVisibleItemIndices();
-
- public void setManyItemsPerPage(int manyItemsPerPage);
-
- public void setAllItemsPerPage();
-
- public int getManyItemsPerPage();
-
-}
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
deleted file mode 100644
index 87859835d1..0000000000
--- a/plugins/org.eclipse.osee.display.api/src/org/eclipse/osee/display/api/components/RelationComponent.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*******************************************************************************
- * 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;
-
-import org.eclipse.osee.display.api.data.ViewArtifact;
-import org.eclipse.osee.display.api.data.ViewId;
-
-/**
- * @author Shawn F. Cook
- */
-public interface RelationComponent extends DisplaysErrorComponent {
-
- void setArtifact(ViewArtifact artifact);
-
- void clearAll();
-
- void addRelationType(ViewId id);
-
- void clearRelations();
-
- void setLeftName(String name);
-
- void setRightName(String name);
-
- void addLeftRelated(ViewArtifact id);
-
- void addRightRelated(ViewArtifact id);
-
-} \ 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
deleted file mode 100644
index 1e7e5e16b4..0000000000
--- a/plugins/org.eclipse.osee.display.api/src/org/eclipse/osee/display/api/components/SearchHeaderComponent.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*******************************************************************************
- * 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 Shawn F. Cook
- */
-public interface SearchHeaderComponent extends DisplaysErrorComponent {
-
- void clearAll();
-
-}
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
deleted file mode 100644
index 3f614696ab..0000000000
--- a/plugins/org.eclipse.osee.display.api/src/org/eclipse/osee/display/api/components/SearchResultComponent.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*******************************************************************************
- * 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;
-
-import org.eclipse.osee.display.api.data.DisplayOptions;
-import org.eclipse.osee.display.api.data.SearchResultMatch;
-import org.eclipse.osee.display.api.data.ViewArtifact;
-
-/**
- * @author Shawn F. Cook
- */
-public interface SearchResultComponent extends DisplaysErrorComponent {
-
- void setArtifact(ViewArtifact artifact);
-
- void addSearchResultMatch(SearchResultMatch match);
-
- void setDisplayOptions(DisplayOptions options);
-}
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
deleted file mode 100644
index 9062d78934..0000000000
--- a/plugins/org.eclipse.osee.display.api/src/org/eclipse/osee/display/api/components/SearchResultsListComponent.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*******************************************************************************
- * 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 Shawn F. Cook
- */
-public interface SearchResultsListComponent extends DisplaysErrorComponent {
-
- void clearAll();
-
- SearchResultComponent createSearchResult();
-
- void noSearchResultsFound();
-
-}
diff --git a/plugins/org.eclipse.osee.display.api/src/org/eclipse/osee/display/api/data/DisplayOptions.java b/plugins/org.eclipse.osee.display.api/src/org/eclipse/osee/display/api/data/DisplayOptions.java
deleted file mode 100644
index 6d28613c7a..0000000000
--- a/plugins/org.eclipse.osee.display.api/src/org/eclipse/osee/display/api/data/DisplayOptions.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*******************************************************************************
- * 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.data;
-
-/**
- * @author John R. Misinco
- */
-public class DisplayOptions {
-
- private final Boolean verboseResults;
-
- public DisplayOptions(Boolean verboseResults) {
- this.verboseResults = verboseResults;
- }
-
- public Boolean getVerboseResults() {
- return verboseResults;
- }
-
-}
diff --git a/plugins/org.eclipse.osee.display.api/src/org/eclipse/osee/display/api/data/SearchResultMatch.java b/plugins/org.eclipse.osee.display.api/src/org/eclipse/osee/display/api/data/SearchResultMatch.java
deleted file mode 100644
index bdb3d7c67b..0000000000
--- a/plugins/org.eclipse.osee.display.api/src/org/eclipse/osee/display/api/data/SearchResultMatch.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*******************************************************************************
- * 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.data;
-
-import java.util.List;
-
-/**
- * @author Shawn F. Cook
- */
-public class SearchResultMatch {
-
- private final String attributeType;
- private final int numberOfMatches;
- private final List<StyledText> data;
-
- public SearchResultMatch(String attributeType, int numberOfMatches, List<StyledText> data) {
- this.attributeType = attributeType;
- this.numberOfMatches = numberOfMatches;
- this.data = data;
- }
-
- public String getAttributeType() {
- return attributeType;
- }
-
- public int getManyMatches() {
- return numberOfMatches;
- }
-
- public List<StyledText> getData() {
- return data;
- }
-
-} \ No newline at end of file
diff --git a/plugins/org.eclipse.osee.display.api/src/org/eclipse/osee/display/api/data/StyledText.java b/plugins/org.eclipse.osee.display.api/src/org/eclipse/osee/display/api/data/StyledText.java
deleted file mode 100644
index 8c1b42e25e..0000000000
--- a/plugins/org.eclipse.osee.display.api/src/org/eclipse/osee/display/api/data/StyledText.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*******************************************************************************
- * 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.data;
-
-/**
- * @author Roberto E. Escobar
- */
-public class StyledText {
-
- private final String data;
- private final boolean isHighLighted;
-
- public StyledText(String data, boolean isHighLighted) {
- super();
- this.data = data;
- this.isHighLighted = isHighLighted;
- }
-
- public String getData() {
- return data;
- }
-
- public boolean isHighLighted() {
- return isHighLighted;
- }
-
- @Override
- public String toString() {
- return "StyledText [data=" + data + ", isHighLighted=" + isHighLighted + "]";
- }
-
-}
diff --git a/plugins/org.eclipse.osee.display.api/src/org/eclipse/osee/display/api/data/ViewArtifact.java b/plugins/org.eclipse.osee.display.api/src/org/eclipse/osee/display/api/data/ViewArtifact.java
deleted file mode 100644
index 89d4e3b0f2..0000000000
--- a/plugins/org.eclipse.osee.display.api/src/org/eclipse/osee/display/api/data/ViewArtifact.java
+++ /dev/null
@@ -1,129 +0,0 @@
-/*******************************************************************************
- * 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.data;
-
-import java.util.ArrayList;
-import java.util.Collection;
-
-/**
- * @author Shawn F. Cook
- */
-public class ViewArtifact {
- private final String guid;
- private final String artifactName;
- private final String artifactType;
- private String attr_Category;
- private String attr_DevAssurLevel;
- private String attr_ImpoParaNum;
- private String attr_Partition;
- private String attr_QualMethod;
- private String attr_Subsystm;
- private String attr_TechPerfParam;
- private final ViewId branch;
-
- //ancestry should include all parental Artifacts starting with parent(index 0), grandparent(index 1), great-grandparent(index 2), etc.
- private final Collection<ViewArtifact> ancestry = new ArrayList<ViewArtifact>();
-
- public ViewArtifact(String guid, String artifactName, String artifactType, Collection<ViewArtifact> ancestry, ViewId branch) {
- this.guid = guid;
- this.artifactName = artifactName;
- this.artifactType = artifactType;
- if (ancestry != null) {
- this.ancestry.addAll(ancestry);
- }
- this.branch = branch;
- }
-
- public ViewArtifact(String guid, String artifactName, String artifactType) {
- this(guid, artifactName, artifactType, (Collection<ViewArtifact>) null, null);
- }
-
- public String getArtifactName() {
- return artifactName;
- }
-
- public String getArtifactType() {
- return artifactType;
- }
-
- public String getGuid() {
- return guid;
- }
-
- public ViewId getBranch() {
- return branch;
- }
-
- public Collection<ViewArtifact> getAncestry() {
- return ancestry;
- }
-
- @Override
- public String toString() {
- return artifactName;
- }
-
- public String getAttr_Category() {
- return attr_Category;
- }
-
- public void setAttr_Category(String attr_Category) {
- this.attr_Category = attr_Category;
- }
-
- public String getAttr_DevAssurLevel() {
- return attr_DevAssurLevel;
- }
-
- public void setAttr_DevAssurLevel(String attr_DevAssurLevel) {
- this.attr_DevAssurLevel = attr_DevAssurLevel;
- }
-
- public String getAttr_ImpoParaNum() {
- return attr_ImpoParaNum;
- }
-
- public void setAttr_ImpoParaNum(String attr_ImpoParaNum) {
- this.attr_ImpoParaNum = attr_ImpoParaNum;
- }
-
- public String getAttr_Partition() {
- return attr_Partition;
- }
-
- public void setAttr_Partition(String attr_Partition) {
- this.attr_Partition = attr_Partition;
- }
-
- public String getAttr_QualMethod() {
- return attr_QualMethod;
- }
-
- public void setAttr_QualMethod(String attr_QualMethod) {
- this.attr_QualMethod = attr_QualMethod;
- }
-
- public String getAttr_Subsystm() {
- return attr_Subsystm;
- }
-
- public void setAttr_Subsystm(String attr_Subsystm) {
- this.attr_Subsystm = attr_Subsystm;
- }
-
- public String getAttr_TechPerfParam() {
- return attr_TechPerfParam;
- }
-
- public void setAttr_TechPerfParam(String attr_TechPerfParam) {
- this.attr_TechPerfParam = attr_TechPerfParam;
- }
-}
diff --git a/plugins/org.eclipse.osee.display.api/src/org/eclipse/osee/display/api/data/ViewId.java b/plugins/org.eclipse.osee.display.api/src/org/eclipse/osee/display/api/data/ViewId.java
deleted file mode 100644
index a3282b8d87..0000000000
--- a/plugins/org.eclipse.osee.display.api/src/org/eclipse/osee/display/api/data/ViewId.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * 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.data;
-
-import java.util.HashMap;
-import java.util.Map;
-import org.eclipse.osee.framework.jdk.core.type.NamedIdentity;
-
-/**
- * @author John R. Misinco
- */
-public class ViewId extends NamedIdentity<String> {
-
- Map<String, String> attributes = new HashMap<String, String>();
-
- public ViewId(String uuid, String name) {
- super(uuid, name);
- }
-
- public void setAttribute(String key, String value) {
- attributes.put(key, value);
- }
-
- public String getAttribute(String key) {
- return attributes.containsKey(key) ? attributes.get(key) : null;
- }
-}
diff --git a/plugins/org.eclipse.osee.display.api/src/org/eclipse/osee/display/api/data/ViewRelationType.java b/plugins/org.eclipse.osee.display.api/src/org/eclipse/osee/display/api/data/ViewRelationType.java
deleted file mode 100644
index ebefe5aed5..0000000000
--- a/plugins/org.eclipse.osee.display.api/src/org/eclipse/osee/display/api/data/ViewRelationType.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*******************************************************************************
- * 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.data;
-
-/*
- * @author Shawn F. Cook
- */
-public enum ViewRelationType {
- PARENT("Default Hierarchical - parent");
-
- private final String stringValue;
-
- private ViewRelationType(String stringValue) {
- this.stringValue = stringValue;
- }
-
- public String getStringValue() {
- return stringValue;
- }
-}
diff --git a/plugins/org.eclipse.osee.display.api/src/org/eclipse/osee/display/api/data/ViewSearchParameters.java b/plugins/org.eclipse.osee.display.api/src/org/eclipse/osee/display/api/data/ViewSearchParameters.java
deleted file mode 100644
index 5e60a8fcc9..0000000000
--- a/plugins/org.eclipse.osee.display.api/src/org/eclipse/osee/display/api/data/ViewSearchParameters.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * 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.data;
-
-/**
- * @author John R. Misinco
- */
-public class ViewSearchParameters {
-
- private final String searchString;
- private final Boolean nameOnly;
-
- public ViewSearchParameters(String searchString, Boolean nameOnly) {
- this.searchString = searchString;
- this.nameOnly = nameOnly;
- }
-
- public String getSearchString() {
- return searchString;
- }
-
- public Boolean isNameOnly() {
- return nameOnly;
- }
-
-}
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
deleted file mode 100644
index d210e9650c..0000000000
--- a/plugins/org.eclipse.osee.display.api/src/org/eclipse/osee/display/api/search/ArtifactProvider.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*******************************************************************************
- * 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.Collection;
-import org.eclipse.osee.framework.core.data.IArtifactToken;
-import org.eclipse.osee.framework.core.data.IOseeBranch;
-import org.eclipse.osee.framework.core.data.IRelationType;
-import org.eclipse.osee.framework.core.data.IRelationTypeSide;
-import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
-import org.eclipse.osee.framework.jdk.core.type.ResultSet;
-import org.eclipse.osee.orcs.data.ArtifactReadable;
-
-/**
- * @author John R. Misinco
- */
-public interface ArtifactProvider {
-
- ArtifactReadable getArtifactByArtifactToken(IOseeBranch branch, IArtifactToken token) throws OseeCoreException;
-
- ArtifactReadable getArtifactByGuid(IOseeBranch branch, String guid) throws OseeCoreException;
-
- ResultSet<ArtifactReadable> getRelatedArtifacts(ArtifactReadable art, IRelationTypeSide relationTypeSide) throws OseeCoreException;
-
- ArtifactReadable getRelatedArtifact(ArtifactReadable art, IRelationTypeSide relationTypeSide) throws OseeCoreException;
-
- ArtifactReadable getParent(ArtifactReadable art) throws OseeCoreException;
-
- Collection<? extends IRelationType> getValidRelationTypes(ArtifactReadable art) throws OseeCoreException;
-
- String getSideAName(IRelationType type) throws OseeCoreException;
-
- String getSideBName(IRelationType type) throws OseeCoreException;
-
- void getSearchResults(IOseeBranch branch, boolean nameOnly, String searchPhrase, final AsyncSearchListener callback) throws OseeCoreException;
-
- void cancelSearch();
-}
diff --git a/plugins/org.eclipse.osee.display.api/src/org/eclipse/osee/display/api/search/AsyncSearchListener.java b/plugins/org.eclipse.osee.display.api/src/org/eclipse/osee/display/api/search/AsyncSearchListener.java
deleted file mode 100644
index 6515e123ed..0000000000
--- a/plugins/org.eclipse.osee.display.api/src/org/eclipse/osee/display/api/search/AsyncSearchListener.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*******************************************************************************
- * 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 org.eclipse.osee.orcs.data.ArtifactReadable;
-import org.eclipse.osee.orcs.data.AttributeReadable;
-import org.eclipse.osee.orcs.search.Match;
-
-/**
- * @author John R. Misinco
- */
-public interface AsyncSearchListener {
-
- public void onSearchComplete(Iterable<Match<ArtifactReadable, AttributeReadable<?>>> results);
-
- public void onSearchCancelled();
-
- public void onSearchFailed(Throwable throwable);
-
-} \ No newline at end of file
diff --git a/plugins/org.eclipse.osee.display.api/src/org/eclipse/osee/display/api/search/SearchNavigator.java b/plugins/org.eclipse.osee.display.api/src/org/eclipse/osee/display/api/search/SearchNavigator.java
deleted file mode 100644
index bee058e18a..0000000000
--- a/plugins/org.eclipse.osee.display.api/src/org/eclipse/osee/display/api/search/SearchNavigator.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*******************************************************************************
- * 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;
-
-/**
- * @author Shawn F. Cook
- */
-public interface SearchNavigator {
-
- void navigateSearchResults(String url);
-
- void navigateArtifactPage(String url);
-}
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
deleted file mode 100644
index 211c2d1cb9..0000000000
--- a/plugins/org.eclipse.osee.display.api/src/org/eclipse/osee/display/api/search/SearchPresenter.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*******************************************************************************
- * 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 org.eclipse.osee.display.api.components.ArtifactHeaderComponent;
-import org.eclipse.osee.display.api.components.AttributeComponent;
-import org.eclipse.osee.display.api.components.DisplayOptionsComponent;
-import org.eclipse.osee.display.api.components.RelationComponent;
-import org.eclipse.osee.display.api.components.SearchHeaderComponent;
-import org.eclipse.osee.display.api.components.SearchResultsListComponent;
-import org.eclipse.osee.display.api.data.DisplayOptions;
-import org.eclipse.osee.display.api.data.ViewArtifact;
-import org.eclipse.osee.display.api.data.ViewId;
-import org.eclipse.osee.display.api.data.ViewSearchParameters;
-
-/**
- * @author John R. Misinco
- */
-public interface SearchPresenter<T extends SearchHeaderComponent, K extends ViewSearchParameters> {
-
- void initSearchResults(String url, T searchHeaderComp, SearchResultsListComponent searchResultsComp, DisplayOptionsComponent options);
-
- void selectArtifact(String url, ViewArtifact artifact, SearchNavigator oseeNavigator);
-
- void initArtifactPage(String url, T searchHeaderComp, ArtifactHeaderComponent artHeaderComp, RelationComponent relComp, AttributeComponent attrComp, DisplayOptionsComponent options);
-
- void selectRelationType(ViewArtifact artifact, ViewId relation, RelationComponent relationComponent);
-
- void selectSearch(String url, K params, SearchNavigator navigator);
-
- void selectDisplayOptions(String url, DisplayOptions options, SearchNavigator navigator);
-
- void selectCancel();
-
-} \ No newline at end of file
diff --git a/plugins/org.eclipse.osee.display.api/src/org/eclipse/osee/display/api/search/SearchProgressListener.java b/plugins/org.eclipse.osee.display.api/src/org/eclipse/osee/display/api/search/SearchProgressListener.java
deleted file mode 100644
index 9671e8ceb9..0000000000
--- a/plugins/org.eclipse.osee.display.api/src/org/eclipse/osee/display/api/search/SearchProgressListener.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*******************************************************************************
- * 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.io.Serializable;
-
-/**
- * @author Shawn F. Cook
- */
-public interface SearchProgressListener extends Serializable {
-
- public void searchInProgress();
-
- public void searchCancelled();
-
- public void searchCompleted();
-}
diff --git a/plugins/org.eclipse.osee.display.api/src/org/eclipse/osee/display/api/search/SearchProgressProvider.java b/plugins/org.eclipse.osee.display.api/src/org/eclipse/osee/display/api/search/SearchProgressProvider.java
deleted file mode 100644
index 97b504ea69..0000000000
--- a/plugins/org.eclipse.osee.display.api/src/org/eclipse/osee/display/api/search/SearchProgressProvider.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*******************************************************************************
- * 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;
-
-/**
- * @author Shawn F. Cook
- */
-public interface SearchProgressProvider {
-
- public void addListener(SearchProgressListener listener);
-
- public void removeListener(SearchProgressListener listener);
-
-}
diff --git a/plugins/org.eclipse.osee.display.mvp.test/.classpath b/plugins/org.eclipse.osee.display.mvp.test/.classpath
deleted file mode 100644
index ad32c83a78..0000000000
--- a/plugins/org.eclipse.osee.display.mvp.test/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/org.eclipse.osee.display.mvp.test/.project b/plugins/org.eclipse.osee.display.mvp.test/.project
deleted file mode 100644
index 43d82f8347..0000000000
--- a/plugins/org.eclipse.osee.display.mvp.test/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.osee.display.mvp.test</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/plugins/org.eclipse.osee.display.mvp.test/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.display.mvp.test/META-INF/MANIFEST.MF
deleted file mode 100644
index 02e7d04f00..0000000000
--- a/plugins/org.eclipse.osee.display.mvp.test/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,11 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Osee Display MVP Test (Incubation)
-Bundle-SymbolicName: org.eclipse.osee.display.mvp.test
-Bundle-Version: 0.17.0.qualifier
-Bundle-Vendor: Eclipse Open System Engineering Environment
-Fragment-Host: org.eclipse.osee.display.mvp
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: org.junit;version="4.8.2",
- org.junit.runner;version="4.8.2",
- org.junit.runners;version="4.8.2"
diff --git a/plugins/org.eclipse.osee.display.mvp.test/build.properties b/plugins/org.eclipse.osee.display.mvp.test/build.properties
deleted file mode 100644
index 34d2e4d2da..0000000000
--- a/plugins/org.eclipse.osee.display.mvp.test/build.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
- .
diff --git a/plugins/org.eclipse.osee.display.mvp.test/pom.xml b/plugins/org.eclipse.osee.display.mvp.test/pom.xml
deleted file mode 100644
index a020e6cf64..0000000000
--- a/plugins/org.eclipse.osee.display.mvp.test/pom.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.eclipse.osee</groupId>
- <artifactId>org.eclipse.osee.x.core.parent</artifactId>
- <version>0.17.0-SNAPSHOT</version>
- <relativePath>../../plugins/org.eclipse.osee.x.core.parent</relativePath>
- </parent>
-
- <artifactId>org.eclipse.osee.display.mvp.test</artifactId>
- <packaging>eclipse-test-plugin</packaging>
- <name>OSEE Display MVP Test - (Incubation)</name>
-
- <build>
- <!-- workaround for https://issues.sonatype.org/browse/TYCHO-168 -->
- <!-- <resources> <resource> <directory>src</directory> <excludes> <exclude>**/*.java</exclude>
- </excludes> </resource> </resources> -->
- <plugins>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-source-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-surefire-plugin</artifactId>
- <version>${tycho-version}</version>
- <configuration>
- <testSuite>org.eclipse.osee.display.mvp.test</testSuite>
- <testClass>org.eclipse.osee.display.mvp.MvpTestSuite</testClass>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project> \ No newline at end of file
diff --git a/plugins/org.eclipse.osee.display.mvp.test/src/org/eclipse/osee/display/mvp/MvpTestSuite.java b/plugins/org.eclipse.osee.display.mvp.test/src/org/eclipse/osee/display/mvp/MvpTestSuite.java
deleted file mode 100644
index c08948acdf..0000000000
--- a/plugins/org.eclipse.osee.display.mvp.test/src/org/eclipse/osee/display/mvp/MvpTestSuite.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*******************************************************************************
- * 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.mvp;
-
-import org.eclipse.osee.display.mvp.internal.MvpInternalTestSuite;
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
-
-@RunWith(Suite.class)
-@Suite.SuiteClasses({MvpInternalTestSuite.class})
-/**
- * @author Roberto E. Escobar
- */
-public class MvpTestSuite {
- //Test Suite class
-}
diff --git a/plugins/org.eclipse.osee.display.mvp.test/src/org/eclipse/osee/display/mvp/internal/EventBusRegistryTest.java b/plugins/org.eclipse.osee.display.mvp.test/src/org/eclipse/osee/display/mvp/internal/EventBusRegistryTest.java
deleted file mode 100644
index 8da7e672b7..0000000000
--- a/plugins/org.eclipse.osee.display.mvp.test/src/org/eclipse/osee/display/mvp/internal/EventBusRegistryTest.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*******************************************************************************
- * 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.mvp.internal;
-
-import org.eclipse.osee.display.mvp.mocks.EventBus1;
-import org.eclipse.osee.display.mvp.mocks.EventMessage;
-import org.eclipse.osee.display.mvp.mocks.MockLog;
-import org.eclipse.osee.display.mvp.mocks.Presenter1;
-import org.eclipse.osee.display.mvp.mocks.Presenter2;
-import org.eclipse.osee.logger.Log;
-import org.junit.Assert;
-import org.junit.Test;
-
-/**
- * Test Case for {@link EventBusRegistryImpl}
- *
- * @author Roberto E. Escobar
- */
-public class EventBusRegistryTest {
-
- @Test
- public void testEvent() {
- Log logger = new MockLog();
- EventBusRegistryImpl eventBus = new EventBusRegistryImpl(logger);
-
- Presenter1 presenter1 = new Presenter1();
- presenter1.setLogger(logger);
-
- Presenter2 presenter2 = new Presenter2();
- presenter2.setLogger(logger);
-
- eventBus.addSubscriber(presenter1);
- eventBus.addSubscriber(presenter2);
-
- EventBus1 busInstance = eventBus.getEventBus(EventBus1.class);
-
- String broadcastMessage = "broadcast message";
- busInstance.sendBroadcastMessage(broadcastMessage);
- Assert.assertEquals(broadcastMessage, presenter1.getBroadcastMessage());
- Assert.assertEquals(broadcastMessage, presenter2.getBroadcastMessage());
-
- String p1Message = "p1 message";
- busInstance.sendP1Message(p1Message);
- Assert.assertEquals(p1Message, presenter1.getP1Message());
-
- EventMessage eventMessage = new EventMessage(23L, "hello");
- busInstance.sendEventMessage(eventMessage);
- Assert.assertEquals(eventMessage, presenter2.getEventMessage());
- }
-}
diff --git a/plugins/org.eclipse.osee.display.mvp.test/src/org/eclipse/osee/display/mvp/internal/MvpInternalTestSuite.java b/plugins/org.eclipse.osee.display.mvp.test/src/org/eclipse/osee/display/mvp/internal/MvpInternalTestSuite.java
deleted file mode 100644
index a8ac6bd75f..0000000000
--- a/plugins/org.eclipse.osee.display.mvp.test/src/org/eclipse/osee/display/mvp/internal/MvpInternalTestSuite.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*******************************************************************************
- * 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.mvp.internal;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
-
-@RunWith(Suite.class)
-@Suite.SuiteClasses({EventBusRegistryTest.class, PresenterServiceFactoryTest.class})
-/**
- * @author Roberto E. Escobar
- */
-public class MvpInternalTestSuite {
- //Test Suite class
-}
diff --git a/plugins/org.eclipse.osee.display.mvp.test/src/org/eclipse/osee/display/mvp/internal/PresenterServiceFactoryTest.java b/plugins/org.eclipse.osee.display.mvp.test/src/org/eclipse/osee/display/mvp/internal/PresenterServiceFactoryTest.java
deleted file mode 100644
index 6acef84726..0000000000
--- a/plugins/org.eclipse.osee.display.mvp.test/src/org/eclipse/osee/display/mvp/internal/PresenterServiceFactoryTest.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*******************************************************************************
- * 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.mvp.internal;
-
-import java.util.Locale;
-import org.eclipse.osee.display.mvp.event.EventBus;
-import org.eclipse.osee.display.mvp.mocks.MockLog;
-import org.eclipse.osee.display.mvp.mocks.Presenter1;
-import org.eclipse.osee.display.mvp.mocks.Presenter2;
-import org.eclipse.osee.display.mvp.mocks.View2;
-import org.eclipse.osee.display.mvp.presenter.AbstractPresenterFactory;
-import org.eclipse.osee.display.mvp.presenter.Presenter;
-import org.eclipse.osee.display.mvp.presenter.PresenterAnnotationException;
-import org.eclipse.osee.display.mvp.presenter.PresenterNotFoundException;
-import org.eclipse.osee.display.mvp.view.AbstractViewFactory;
-import org.eclipse.osee.display.mvp.view.View;
-import org.eclipse.osee.display.mvp.view.ViewNotFoundException;
-import org.eclipse.osee.logger.Log;
-import org.junit.Assert;
-import org.junit.Test;
-
-/**
- * Test Case for {@link PresenterServiceFactoryImpl}
- *
- * @author Roberto E. Escobar
- */
-public class PresenterServiceFactoryTest {
-
- @Test(expected = IllegalStateException.class)
- public void testStart() throws Exception {
- PresenterServiceFactoryImpl factory = new PresenterServiceFactoryImpl();
- factory.setLogger(new MockLog());
-
- factory.createPresenter(Locale.getDefault(), Presenter1.class);
- }
-
- @Test(expected = PresenterNotFoundException.class)
- public void testPresenterNotFound() throws Exception {
- PresenterServiceFactoryImpl factory = new PresenterServiceFactoryImpl();
- factory.setLogger(new MockLog());
- factory.start();
-
- factory.createPresenter(Locale.getDefault(), Presenter1.class);
- }
-
- @Test(expected = PresenterAnnotationException.class)
- public void testPresenterAnnotation() throws Exception {
- PresenterServiceFactoryImpl factory = new PresenterServiceFactoryImpl();
- factory.setLogger(new MockLog());
- factory.addPresenterFactory(new MockPresenterFactory());
- factory.start();
-
- factory.createPresenter(Locale.getDefault(), Presenter1.class);
- }
-
- @Test(expected = ViewNotFoundException.class)
- public void testViewNotFound() throws Exception {
- PresenterServiceFactoryImpl factory = new PresenterServiceFactoryImpl();
- factory.setLogger(new MockLog());
- factory.addPresenterFactory(new MockPresenterFactory());
- factory.start();
-
- factory.createPresenter(Locale.getDefault(), Presenter2.class);
- }
-
- @Test
- public void testBinding() throws Exception {
- Log logger = new MockLog();
- PresenterServiceFactoryImpl factory = new PresenterServiceFactoryImpl();
- factory.setLogger(logger);
- factory.addPresenterFactory(new MockPresenterFactory());
- factory.addViewFactory(new MockViewFactory());
- factory.start();
-
- Presenter<? extends View, ? extends EventBus> presenter =
- factory.createPresenter(Locale.getDefault(), Presenter2.class);
- Assert.assertEquals(Presenter2.class, presenter.getClass());
- Assert.assertEquals(View2.class, presenter.getView().getClass());
- Assert.assertNotNull(presenter.getEventBus());
- Assert.assertEquals(logger, presenter.getLogger());
- }
-
- private final class MockPresenterFactory extends AbstractPresenterFactory {
-
- @SuppressWarnings({"unchecked"})
- @Override
- public <T extends Presenter<? extends View, ? extends EventBus>> T createPresenter(Class<? extends Presenter<? extends View, ? extends EventBus>> presenterType, Locale locale) {
- return (T) new Presenter2();
- }
- }
-
- private final class MockViewFactory extends AbstractViewFactory {
-
- @SuppressWarnings({"unchecked"})
- @Override
- public <T extends View> T createView(Presenter<?, ?> presenter, Class<T> viewType, Locale locale) {
- return (T) new View2();
- }
-
- }
-}
diff --git a/plugins/org.eclipse.osee.display.mvp.test/src/org/eclipse/osee/display/mvp/mocks/EventBus1.java b/plugins/org.eclipse.osee.display.mvp.test/src/org/eclipse/osee/display/mvp/mocks/EventBus1.java
deleted file mode 100644
index 97340159e7..0000000000
--- a/plugins/org.eclipse.osee.display.mvp.test/src/org/eclipse/osee/display/mvp/mocks/EventBus1.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*******************************************************************************
- * 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.mvp.mocks;
-
-import org.eclipse.osee.display.mvp.event.EventBus;
-import org.eclipse.osee.display.mvp.event.annotation.RouteTo;
-
-/**
- * @author Roberto E. Escobar
- */
-public interface EventBus1 extends EventBus {
-
- @RouteTo({Presenter2.class})
- public void sendEventMessage(EventMessage dto);
-
- @RouteTo({Presenter2.class, Presenter1.class})
- public void sendBroadcastMessage(String message);
-
- @RouteTo({Presenter1.class})
- public void sendP1Message(String message);
-
-}
diff --git a/plugins/org.eclipse.osee.display.mvp.test/src/org/eclipse/osee/display/mvp/mocks/EventMessage.java b/plugins/org.eclipse.osee.display.mvp.test/src/org/eclipse/osee/display/mvp/mocks/EventMessage.java
deleted file mode 100644
index f2e1ea1079..0000000000
--- a/plugins/org.eclipse.osee.display.mvp.test/src/org/eclipse/osee/display/mvp/mocks/EventMessage.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*******************************************************************************
- * 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.mvp.mocks;
-
-/**
- * @author Roberto E. Escobar
- */
-public class EventMessage {
-
- private final Long id;
- private final String name;
-
- public EventMessage(Long id, String name) {
- this.id = id;
- this.name = name;
- }
-
- public Long getId() {
- return id;
- }
-
- public String getName() {
- return name;
- }
-
- @Override
- public String toString() {
- return "EventMessage [id=" + id + ", name=" + name + "]";
- }
-
-}
diff --git a/plugins/org.eclipse.osee.display.mvp.test/src/org/eclipse/osee/display/mvp/mocks/MockLog.java b/plugins/org.eclipse.osee.display.mvp.test/src/org/eclipse/osee/display/mvp/mocks/MockLog.java
deleted file mode 100644
index 894fd83120..0000000000
--- a/plugins/org.eclipse.osee.display.mvp.test/src/org/eclipse/osee/display/mvp/mocks/MockLog.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/*******************************************************************************
- * 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.mvp.mocks;
-
-import org.eclipse.osee.logger.Log;
-
-/**
- * @author Roberto E. Escobar
- */
-public class MockLog implements Log {
-
- private final boolean logAllowed;
-
- public MockLog() {
- this(false);
- }
-
- public MockLog(boolean logAllowed) {
- this.logAllowed = logAllowed;
- }
-
- @Override
- public boolean isTraceEnabled() {
- return true;
- }
-
- @Override
- public void trace(String format, Object... args) {
- commonOut(format, args);
- }
-
- @Override
- public void trace(Throwable th, String format, Object... args) {
- commonOut(format, args);
- }
-
- @Override
- public boolean isDebugEnabled() {
- return true;
- }
-
- @Override
- public void debug(String format, Object... args) {
- commonOut(format, args);
- }
-
- @Override
- public void debug(Throwable th, String format, Object... args) {
- commonOut(th, format, args);
- }
-
- @Override
- public boolean isInfoEnabled() {
- return true;
- }
-
- @Override
- public void info(String format, Object... args) {
- commonOut(format, args);
- }
-
- @Override
- public void info(Throwable th, String format, Object... args) {
- commonOut(th, format, args);
- }
-
- @Override
- public boolean isWarnEnabled() {
- return true;
- }
-
- @Override
- public void warn(String format, Object... args) {
- commonOut(format, args);
- }
-
- @Override
- public void warn(Throwable th, String format, Object... args) {
- commonOut(th, format, args);
- }
-
- @Override
- public boolean isErrorEnabled() {
- return true;
- }
-
- @Override
- public void error(String format, Object... args) {
- commonOut(format, args);
- }
-
- @Override
- public void error(Throwable th, String format, Object... args) {
- commonOut(th, format, args);
- }
-
- private void commonOut(String format, Object... args) {
- if (logAllowed) {
- System.out.printf(format, args);
- System.out.println();
- }
- }
-
- private void commonOut(Throwable th, String format, Object... args) {
- commonOut(format, args);
- if (logAllowed) {
- th.printStackTrace();
- }
- }
-
-} \ No newline at end of file
diff --git a/plugins/org.eclipse.osee.display.mvp.test/src/org/eclipse/osee/display/mvp/mocks/Presenter1.java b/plugins/org.eclipse.osee.display.mvp.test/src/org/eclipse/osee/display/mvp/mocks/Presenter1.java
deleted file mode 100644
index 269bfa1207..0000000000
--- a/plugins/org.eclipse.osee.display.mvp.test/src/org/eclipse/osee/display/mvp/mocks/Presenter1.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*******************************************************************************
- * 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.mvp.mocks;
-
-import org.eclipse.osee.display.mvp.event.annotation.EndPoint;
-import org.eclipse.osee.display.mvp.presenter.AbstractPresenter;
-
-/**
- * @author Roberto E. Escobar
- */
-public class Presenter1 extends AbstractPresenter<View1, EventBus1> {
-
- private String broadcastMessage;
- private String p1Message;
-
- @EndPoint
- public void onBroadcastMessage(String message) {
- getLogger().info("Broadcast Message: [%s]", message);
- broadcastMessage = message;
- }
-
- @EndPoint
- public void onP1Message(String message) {
- getLogger().info("P1 Message: [%s]", message);
- p1Message = message;
- }
-
- public String getBroadcastMessage() {
- return broadcastMessage;
- }
-
- public String getP1Message() {
- return p1Message;
- }
-
-}
diff --git a/plugins/org.eclipse.osee.display.mvp.test/src/org/eclipse/osee/display/mvp/mocks/Presenter2.java b/plugins/org.eclipse.osee.display.mvp.test/src/org/eclipse/osee/display/mvp/mocks/Presenter2.java
deleted file mode 100644
index 21707c93cd..0000000000
--- a/plugins/org.eclipse.osee.display.mvp.test/src/org/eclipse/osee/display/mvp/mocks/Presenter2.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*******************************************************************************
- * 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.mvp.mocks;
-
-import org.eclipse.osee.display.mvp.event.annotation.EndPoint;
-import org.eclipse.osee.display.mvp.presenter.AbstractPresenter;
-import org.eclipse.osee.display.mvp.presenter.annotation.IsPresenterFor;
-
-/**
- * @author Roberto E. Escobar
- */
-@IsPresenterFor(View2.class)
-public class Presenter2 extends AbstractPresenter<View2, EventBus1> {
-
- private String broadcastMessage;
- private EventMessage eventMessage;
-
- @EndPoint
- public void onEventMessage(EventMessage message) {
- getLogger().info("Send Message: [%s]", message);
- eventMessage = message;
- }
-
- @EndPoint
- public void onBroadcastMessage(String message) {
- getLogger().info("Broadcast Message: [%s]", message);
- broadcastMessage = message;
- }
-
- public String getBroadcastMessage() {
- return broadcastMessage;
- }
-
- public EventMessage getEventMessage() {
- return eventMessage;
- }
-
-}
diff --git a/plugins/org.eclipse.osee.display.mvp.test/src/org/eclipse/osee/display/mvp/mocks/View1.java b/plugins/org.eclipse.osee.display.mvp.test/src/org/eclipse/osee/display/mvp/mocks/View1.java
deleted file mode 100644
index 77b801037d..0000000000
--- a/plugins/org.eclipse.osee.display.mvp.test/src/org/eclipse/osee/display/mvp/mocks/View1.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*******************************************************************************
- * 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.mvp.mocks;
-
-import org.eclipse.osee.display.mvp.MessageType;
-import org.eclipse.osee.display.mvp.view.AbstractView;
-
-/**
- * @author Roberto E. Escobar
- */
-public class View1 extends AbstractView {
-
- @Override
- public void displayMessage(String caption) {
- //
- }
-
- @Override
- public void displayMessage(String caption, String description, MessageType type) {
- //
- }
-
- @Override
- protected void onDispose() {
- //
- }
-
- @Override
- public Object getContent() {
- return null;
- }
-
-}
diff --git a/plugins/org.eclipse.osee.display.mvp.test/src/org/eclipse/osee/display/mvp/mocks/View2.java b/plugins/org.eclipse.osee.display.mvp.test/src/org/eclipse/osee/display/mvp/mocks/View2.java
deleted file mode 100644
index b8706a4d11..0000000000
--- a/plugins/org.eclipse.osee.display.mvp.test/src/org/eclipse/osee/display/mvp/mocks/View2.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*******************************************************************************
- * 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.mvp.mocks;
-
-import org.eclipse.osee.display.mvp.MessageType;
-import org.eclipse.osee.display.mvp.view.AbstractView;
-
-/**
- * @author Roberto E. Escobar
- */
-public class View2 extends AbstractView {
-
- @Override
- public void displayMessage(String caption) {
- //
- }
-
- @Override
- public void displayMessage(String caption, String description, MessageType type) {
- //
- }
-
- @Override
- protected void onDispose() {
- //
- }
-
- @Override
- public Object getContent() {
- return null;
- }
-}
diff --git a/plugins/org.eclipse.osee.display.mvp/.classpath b/plugins/org.eclipse.osee.display.mvp/.classpath
deleted file mode 100644
index ad32c83a78..0000000000
--- a/plugins/org.eclipse.osee.display.mvp/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/org.eclipse.osee.display.mvp/.project b/plugins/org.eclipse.osee.display.mvp/.project
deleted file mode 100644
index 91da80f292..0000000000
--- a/plugins/org.eclipse.osee.display.mvp/.project
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.osee.display.mvp</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ds.core.builder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/plugins/org.eclipse.osee.display.mvp/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.display.mvp/META-INF/MANIFEST.MF
deleted file mode 100644
index f22e425e4b..0000000000
--- a/plugins/org.eclipse.osee.display.mvp/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,16 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Osee Display MVP - (Incubation)
-Bundle-SymbolicName: org.eclipse.osee.display.mvp
-Bundle-Version: 0.17.0.qualifier
-Bundle-Vendor: Eclipse Open System Engineering Environment
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: org.eclipse.osee.framework.jdk.core.util,
- org.eclipse.osee.logger
-Service-Component: OSGI-INF/*.xml
-Export-Package: org.eclipse.osee.display.mvp,
- org.eclipse.osee.display.mvp.event,
- org.eclipse.osee.display.mvp.event.annotation,
- org.eclipse.osee.display.mvp.presenter,
- org.eclipse.osee.display.mvp.presenter.annotation,
- org.eclipse.osee.display.mvp.view
diff --git a/plugins/org.eclipse.osee.display.mvp/OSGI-INF/presenter.service.factory.impl.xml b/plugins/org.eclipse.osee.display.mvp/OSGI-INF/presenter.service.factory.impl.xml
deleted file mode 100644
index cc2ece699e..0000000000
--- a/plugins/org.eclipse.osee.display.mvp/OSGI-INF/presenter.service.factory.impl.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" activate="start" name="org.eclipse.osee.display.mvp.internal.PresenterServiceFactoryImpl">
- <implementation class="org.eclipse.osee.display.mvp.internal.PresenterServiceFactoryImpl"/>
- <reference bind="setLogger" cardinality="1..1" interface="org.eclipse.osee.logger.Log" name="Log" policy="static"/>
- <service>
- <provide interface="org.eclipse.osee.display.mvp.PresenterServiceFactory"/>
- </service>
- <reference bind="addPresenterFactory" cardinality="1..n" interface="org.eclipse.osee.display.mvp.presenter.PresenterFactory" name="PresenterFactory" policy="dynamic" unbind="removePresenterFactory"/>
- <reference bind="addViewFactory" cardinality="1..n" interface="org.eclipse.osee.display.mvp.view.ViewFactory" name="ViewFactory" policy="dynamic" unbind="removeViewFactory"/>
-</scr:component>
diff --git a/plugins/org.eclipse.osee.display.mvp/build.properties b/plugins/org.eclipse.osee.display.mvp/build.properties
deleted file mode 100644
index 6210e849b5..0000000000
--- a/plugins/org.eclipse.osee.display.mvp/build.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-output.. = bin/
-bin.includes = META-INF/,\
- .,\
- OSGI-INF/
-source.. = src/
diff --git a/plugins/org.eclipse.osee.display.mvp/pom.xml b/plugins/org.eclipse.osee.display.mvp/pom.xml
deleted file mode 100644
index e4ec92986b..0000000000
--- a/plugins/org.eclipse.osee.display.mvp/pom.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.eclipse.osee</groupId>
- <artifactId>org.eclipse.osee.x.core.parent</artifactId>
- <version>0.17.0-SNAPSHOT</version>
- <relativePath>../../plugins/org.eclipse.osee.x.core.parent</relativePath>
- </parent>
-
- <artifactId>org.eclipse.osee.display.mvp</artifactId>
- <packaging>eclipse-plugin</packaging>
- <name>OSEE Display MVP - (Incubation)</name>
-
- <build>
- <!-- workaround for https://issues.sonatype.org/browse/TYCHO-168 -->
- <resources>
- <resource>
- <directory>src</directory>
- <excludes>
- <exclude>**/*.java</exclude>
- </excludes>
- </resource>
- </resources>
- <plugins>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-source-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
-</project> \ No newline at end of file
diff --git a/plugins/org.eclipse.osee.display.mvp/src/org/eclipse/osee/display/mvp/BindException.java b/plugins/org.eclipse.osee.display.mvp/src/org/eclipse/osee/display/mvp/BindException.java
deleted file mode 100644
index ac5e861dc7..0000000000
--- a/plugins/org.eclipse.osee.display.mvp/src/org/eclipse/osee/display/mvp/BindException.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * 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.mvp;
-
-import org.eclipse.osee.display.mvp.internal.BaseException;
-
-/**
- * @author Roberto E. Escobar
- */
-public class BindException extends BaseException {
-
- private static final long serialVersionUID = -7428217337191035166L;
-
- public BindException(String message, Object... args) {
- super(message, args);
- }
-
- public BindException(Throwable cause, String message, Object... args) {
- super(cause, message, args);
- }
-
- public BindException(Throwable cause) {
- super(cause);
- }
-
-}
diff --git a/plugins/org.eclipse.osee.display.mvp/src/org/eclipse/osee/display/mvp/CustomMessageType.java b/plugins/org.eclipse.osee.display.mvp/src/org/eclipse/osee/display/mvp/CustomMessageType.java
deleted file mode 100644
index 41b3f7566b..0000000000
--- a/plugins/org.eclipse.osee.display.mvp/src/org/eclipse/osee/display/mvp/CustomMessageType.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*******************************************************************************
- * 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.mvp;
-
-/**
- * @author Roberto E. Escobar
- */
-public class CustomMessageType implements MessageType {
-
- public String name;
- public int level;
-
- public CustomMessageType(String name, int level) {
- this.name = name;
- this.level = level;
- }
-
- @Override
- public String getName() {
- return name;
- }
-
- @Override
- public int getLevel() {
- return level;
- }
-
- @Override
- public int hashCode() {
- final int prime = 31;
- int result = 1;
- result = prime * result + level;
- result = prime * result + ((name == null) ? 0 : name.hashCode());
- return result;
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj) {
- return true;
- }
- if (obj == null) {
- return false;
- }
- if (getClass() != obj.getClass()) {
- return false;
- }
- CustomMessageType other = (CustomMessageType) obj;
- if (level != other.level) {
- return false;
- }
- if (name == null) {
- if (other.name != null) {
- return false;
- }
- } else if (!name.equals(other.name)) {
- return false;
- }
- return true;
- }
-
- @Override
- public String toString() {
- return "MessageType [name=" + name + ", level=" + level + "]";
- }
-
-}
diff --git a/plugins/org.eclipse.osee.display.mvp/src/org/eclipse/osee/display/mvp/MessageType.java b/plugins/org.eclipse.osee.display.mvp/src/org/eclipse/osee/display/mvp/MessageType.java
deleted file mode 100644
index a2372cec89..0000000000
--- a/plugins/org.eclipse.osee.display.mvp/src/org/eclipse/osee/display/mvp/MessageType.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*******************************************************************************
- * 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.mvp;
-
-/**
- * @author Roberto E. Escobar
- */
-public interface MessageType {
-
- String getName();
-
- int getLevel();
-
-}
diff --git a/plugins/org.eclipse.osee.display.mvp/src/org/eclipse/osee/display/mvp/MessageTypeEnum.java b/plugins/org.eclipse.osee.display.mvp/src/org/eclipse/osee/display/mvp/MessageTypeEnum.java
deleted file mode 100644
index 7d7d79880c..0000000000
--- a/plugins/org.eclipse.osee.display.mvp/src/org/eclipse/osee/display/mvp/MessageTypeEnum.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*******************************************************************************
- * 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.mvp;
-
-/**
- * @author Roberto E. Escobar
- */
-public enum MessageTypeEnum implements MessageType {
- STANDARD,
- INFORMATION,
- WARNING,
- ERROR,
- CUSTOM;
-
- public final CustomMessageType messageType;
-
- private MessageTypeEnum() {
- messageType = new CustomMessageType(name(), ordinal());
- }
-
- @Override
- public String getName() {
- return messageType.getName();
- }
-
- @Override
- public int getLevel() {
- return messageType.getLevel();
- }
-
- public static MessageTypeEnum fromMessageType(MessageType messageType) {
- MessageTypeEnum messageTypeEnum = MessageTypeEnum.CUSTOM;
- for (MessageTypeEnum enumType : values()) {
- if (enumType.equals(messageType)) {
- messageTypeEnum = enumType;
- break;
- }
- }
- return messageTypeEnum;
- }
-}
diff --git a/plugins/org.eclipse.osee.display.mvp/src/org/eclipse/osee/display/mvp/PresenterServiceFactory.java b/plugins/org.eclipse.osee.display.mvp/src/org/eclipse/osee/display/mvp/PresenterServiceFactory.java
deleted file mode 100644
index ba42c7b0a0..0000000000
--- a/plugins/org.eclipse.osee.display.mvp/src/org/eclipse/osee/display/mvp/PresenterServiceFactory.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*******************************************************************************
- * 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.mvp;
-
-import java.util.Locale;
-import org.eclipse.osee.display.mvp.event.EventBus;
-import org.eclipse.osee.display.mvp.presenter.Presenter;
-import org.eclipse.osee.display.mvp.view.View;
-
-/**
- * @author Roberto E. Escobar
- */
-public interface PresenterServiceFactory {
-
- <T extends Presenter<? extends View, ? extends EventBus>> T createPresenter(Locale locale, Class<T> presenterType) throws Exception;
-
-}
diff --git a/plugins/org.eclipse.osee.display.mvp/src/org/eclipse/osee/display/mvp/event/EventBus.java b/plugins/org.eclipse.osee.display.mvp/src/org/eclipse/osee/display/mvp/event/EventBus.java
deleted file mode 100644
index 9ba359ae2b..0000000000
--- a/plugins/org.eclipse.osee.display.mvp/src/org/eclipse/osee/display/mvp/event/EventBus.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*******************************************************************************
- * 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.mvp.event;
-
-/**
- * @author Roberto E. Escobar
- */
-public interface EventBus {
- //
-}
diff --git a/plugins/org.eclipse.osee.display.mvp/src/org/eclipse/osee/display/mvp/event/EventBusRegistry.java b/plugins/org.eclipse.osee.display.mvp/src/org/eclipse/osee/display/mvp/event/EventBusRegistry.java
deleted file mode 100644
index 0bc930340f..0000000000
--- a/plugins/org.eclipse.osee.display.mvp/src/org/eclipse/osee/display/mvp/event/EventBusRegistry.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*******************************************************************************
- * 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.mvp.event;
-
-/**
- * @author Roberto E. Escobar
- */
-public interface EventBusRegistry {
-
- void addSubscriber(Object subscriber);
-
- <T extends EventBus> T register(Class<T> type, Object subscriber);
-
- <T extends EventBus> T getEventBus(Class<T> type);
-}
diff --git a/plugins/org.eclipse.osee.display.mvp/src/org/eclipse/osee/display/mvp/event/annotation/EndPoint.java b/plugins/org.eclipse.osee.display.mvp/src/org/eclipse/osee/display/mvp/event/annotation/EndPoint.java
deleted file mode 100644
index 6e1089410a..0000000000
--- a/plugins/org.eclipse.osee.display.mvp/src/org/eclipse/osee/display/mvp/event/annotation/EndPoint.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*******************************************************************************
- * 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.mvp.event.annotation;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * @author Roberto E. Escobar
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.METHOD)
-public @interface EndPoint {
- // Marker Annotation
-}
diff --git a/plugins/org.eclipse.osee.display.mvp/src/org/eclipse/osee/display/mvp/event/annotation/RouteTo.java b/plugins/org.eclipse.osee.display.mvp/src/org/eclipse/osee/display/mvp/event/annotation/RouteTo.java
deleted file mode 100644
index a72444d189..0000000000
--- a/plugins/org.eclipse.osee.display.mvp/src/org/eclipse/osee/display/mvp/event/annotation/RouteTo.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*******************************************************************************
- * 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.mvp.event.annotation;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-
-/**
- * @author Roberto E. Escobar
- */
-@Retention(RetentionPolicy.RUNTIME)
-public @interface RouteTo {
-
- Class<?>[] value() default {};
-
-}
diff --git a/plugins/org.eclipse.osee.display.mvp/src/org/eclipse/osee/display/mvp/internal/BaseException.java b/plugins/org.eclipse.osee.display.mvp/src/org/eclipse/osee/display/mvp/internal/BaseException.java
deleted file mode 100644
index 4da907e480..0000000000
--- a/plugins/org.eclipse.osee.display.mvp/src/org/eclipse/osee/display/mvp/internal/BaseException.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 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.mvp.internal;
-
-import org.eclipse.osee.framework.jdk.core.util.Collections;
-
-/**
- * @author Roberto E. Escobar
- */
-public class BaseException extends Exception {
-
- private static final long serialVersionUID = -7326541420696736796L;
-
- protected BaseException(String message, Object... args) {
- super(formatMessage(message, args));
- }
-
- protected BaseException(Throwable cause, String message, Object... args) {
- super(formatMessage(message, args), cause);
- }
-
- protected BaseException(Throwable cause) {
- super(cause);
- }
-
- private static String formatMessage(String message, Object... args) {
- try {
- return String.format(message, args);
- } catch (RuntimeException ex) {
- return String.format(
- "Exception message could not be formatted: [%s] with the following arguments [%s]. Cause [%s]", message,
- Collections.toString(",", args), ex.toString());
- }
- }
-}
diff --git a/plugins/org.eclipse.osee.display.mvp/src/org/eclipse/osee/display/mvp/internal/EventBusRegistryImpl.java b/plugins/org.eclipse.osee.display.mvp/src/org/eclipse/osee/display/mvp/internal/EventBusRegistryImpl.java
deleted file mode 100644
index 15918cbe71..0000000000
--- a/plugins/org.eclipse.osee.display.mvp/src/org/eclipse/osee/display/mvp/internal/EventBusRegistryImpl.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*******************************************************************************
- * 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.mvp.internal;
-
-import java.lang.reflect.Proxy;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-import org.eclipse.osee.display.mvp.event.EventBus;
-import org.eclipse.osee.display.mvp.event.EventBusRegistry;
-import org.eclipse.osee.logger.Log;
-
-/**
- * @author Roberto E. Escobar
- */
-public class EventBusRegistryImpl implements EventBusRegistry {
-
- private final Map<Class<? extends EventBus>, EventBus> buses =
- new ConcurrentHashMap<Class<? extends EventBus>, EventBus>();
-
- private final Log logger;
- private final Subscribers subscribers;
-
- public EventBusRegistryImpl(Log logger) {
- this.logger = logger;
- this.subscribers = new Subscribers(logger);
- }
-
- @Override
- @SuppressWarnings("unchecked")
- public <T extends EventBus> T register(Class<T> type, Object subscriber) {
- if (!buses.containsKey(type)) {
- buses.put(type, create(type));
- }
- addSubscriber(subscriber);
- EventBus eventBus = buses.get(type);
- return (T) eventBus;
- }
-
- @Override
- public void addSubscriber(Object subscriber) {
- this.subscribers.addSubscriber(subscriber);
- }
-
- @Override
- @SuppressWarnings("unchecked")
- public <T extends EventBus> T getEventBus(Class<T> type) {
- if (!buses.containsKey(type)) {
- buses.put(type, create(type));
- }
- return (T) buses.get(type);
- }
-
- @SuppressWarnings("unchecked")
- protected <T extends EventBus> T create(Class<T> type) {
- EventDispatcher handler = new EventDispatcher(logger, type.getName(), subscribers);
- T bus = (T) Proxy.newProxyInstance(type.getClassLoader(), new Class[] {type}, handler);
- return bus;
- }
-}
diff --git a/plugins/org.eclipse.osee.display.mvp/src/org/eclipse/osee/display/mvp/internal/EventDispatcher.java b/plugins/org.eclipse.osee.display.mvp/src/org/eclipse/osee/display/mvp/internal/EventDispatcher.java
deleted file mode 100644
index 57de87547d..0000000000
--- a/plugins/org.eclipse.osee.display.mvp/src/org/eclipse/osee/display/mvp/internal/EventDispatcher.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/*******************************************************************************
- * 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.mvp.internal;
-
-import java.lang.reflect.InvocationHandler;
-import java.lang.reflect.Method;
-import org.eclipse.osee.display.mvp.event.annotation.EndPoint;
-import org.eclipse.osee.display.mvp.event.annotation.RouteTo;
-import org.eclipse.osee.logger.Log;
-
-/**
- * @author Roberto E. Escobar
- */
-public class EventDispatcher implements InvocationHandler {
-
- private static final String TO_STRING_METHOD_NAME = "toString";
- private static final String SEND_METHOD_EVENT_PREFIX = "send";
- private static final String HANDLER_METHOD_EVENT_PREFIX = "on";
-
- private final Log logger;
- private final String name;
- private final Subscribers subscribers;
-
- public EventDispatcher(Log logger, String name, Subscribers subscribers) {
- this.logger = logger;
- this.name = name;
- this.subscribers = subscribers;
- }
-
- @Override
- public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
- Object toReturn = null;
- String methodName = method.getName();
- if (!TO_STRING_METHOD_NAME.equals(methodName)) {
- RouteTo routeToPath = method.getAnnotation(RouteTo.class);
- logger.trace("Event - name[%s] routeTo[%s]", methodName, routeToPath);
-
- Class<?>[] subscriberTypes = routeToPath.value();
- for (Class<?> subscriberType : subscriberTypes) {
- Object handler = subscribers.findSubscriber(subscriberType);
- dispatch(subscriberType, handler, method, args);
- }
- } else {
- toReturn = toString();
- }
- return toReturn;
- }
-
- private void dispatch(Class<?> handlerType, Object handler, Method method, Object[] args) {
- if (handler != null) {
- String eventName = method.getName();
- Method handlerMethod = null;
- String eventHandlerMethodName = null;
- try {
- eventHandlerMethodName = getEventMethodName(eventName);
- handlerMethod = getEventHandlerMethod(handler, eventHandlerMethodName);
- } catch (Throwable t) {
- logger.warn("Method [%s] with arguments [%s] was not found for handler [%s] for event [%s]",
- eventHandlerMethodName, args, handler.getClass().getName(), eventName);
- }
-
- try {
- if (handlerMethod != null) {
- handlerMethod.invoke(handler, args);
- }
- } catch (Throwable throwable) {
- logger.error(throwable, "Invocation Error - event [%s] to handler [%s]", eventName, handlerType.getName());
- }
- } else {
- logger.warn("Handler [%s] not registered", handlerType.getName());
- }
- }
-
- private String getEventMethodName(String eventName) {
- String toReturn = eventName;
- if (toReturn.startsWith(SEND_METHOD_EVENT_PREFIX)) {
- toReturn = toReturn.substring(SEND_METHOD_EVENT_PREFIX.length());
- }
- return toReturn;
- }
-
- private Method getEventHandlerMethod(Object handler, String toFind) {
- Method toReturn = null;
- Class<?> handlerClass = handler.getClass();
- Method[] methods = handlerClass.getMethods();
- for (Method method : methods) {
- EndPoint marker = method.getAnnotation(EndPoint.class);
- if (marker != null) {
- String methodName = method.getName();
- if (methodName.startsWith(HANDLER_METHOD_EVENT_PREFIX)) {
- methodName = methodName.substring(HANDLER_METHOD_EVENT_PREFIX.length());
- }
- if (toFind.equalsIgnoreCase(methodName)) {
- toReturn = method;
- break;
- }
- }
- }
- return toReturn;
- }
-
- @Override
- public String toString() {
- return "EventDispatcher [name=" + name + "]";
- }
-
-}
diff --git a/plugins/org.eclipse.osee.display.mvp/src/org/eclipse/osee/display/mvp/internal/PresenterServiceFactoryImpl.java b/plugins/org.eclipse.osee.display.mvp/src/org/eclipse/osee/display/mvp/internal/PresenterServiceFactoryImpl.java
deleted file mode 100644
index 818bf12ff2..0000000000
--- a/plugins/org.eclipse.osee.display.mvp/src/org/eclipse/osee/display/mvp/internal/PresenterServiceFactoryImpl.java
+++ /dev/null
@@ -1,171 +0,0 @@
-/*******************************************************************************
- * 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.mvp.internal;
-
-import java.lang.reflect.ParameterizedType;
-import java.lang.reflect.Type;
-import java.util.List;
-import java.util.Locale;
-import java.util.concurrent.CopyOnWriteArrayList;
-import org.eclipse.osee.display.mvp.PresenterServiceFactory;
-import org.eclipse.osee.display.mvp.event.EventBus;
-import org.eclipse.osee.display.mvp.presenter.Presenter;
-import org.eclipse.osee.display.mvp.presenter.PresenterAnnotationException;
-import org.eclipse.osee.display.mvp.presenter.PresenterFactory;
-import org.eclipse.osee.display.mvp.presenter.PresenterNotFoundException;
-import org.eclipse.osee.display.mvp.presenter.annotation.IsPresenterFor;
-import org.eclipse.osee.display.mvp.view.View;
-import org.eclipse.osee.display.mvp.view.ViewFactory;
-import org.eclipse.osee.display.mvp.view.ViewNotFoundException;
-import org.eclipse.osee.logger.Log;
-
-/**
- * @author Roberto E. Escobar
- */
-public class PresenterServiceFactoryImpl implements PresenterServiceFactory {
-
- private final List<ViewFactory> viewFactories = new CopyOnWriteArrayList<ViewFactory>();
- private final List<PresenterFactory> presenterFactories = new CopyOnWriteArrayList<PresenterFactory>();
-
- private Log logger;
- private EventBusRegistryImpl eventBusAdmin;
- private volatile boolean wasStarted = false;
-
- public void setLogger(Log logger) {
- this.logger = logger;
- }
-
- public Log getLogger() {
- return logger;
- }
-
- public EventBusRegistryImpl getEventBusAdmin() {
- return eventBusAdmin;
- }
-
- public void start() {
- eventBusAdmin = new EventBusRegistryImpl(getLogger());
- wasStarted = true;
- }
-
- public void stop() {
- wasStarted = false;
- eventBusAdmin = null;
- }
-
- private void checkInitialized() {
- if (!wasStarted) {
- throw new IllegalStateException("start() was not called");
- }
- }
-
- public void addViewFactory(ViewFactory factory) {
- viewFactories.add(factory);
- }
-
- public void removeViewFactory(ViewFactory factory) {
- viewFactories.remove(factory);
- }
-
- public void addPresenterFactory(PresenterFactory factory) {
- presenterFactories.add(factory);
- }
-
- public void removePresenterFactory(PresenterFactory factory) {
- presenterFactories.remove(factory);
- }
-
- protected PresenterFactory getPresenterFactory(Class<? extends Presenter<? extends View, ? extends EventBus>> presenterType) throws PresenterNotFoundException {
- PresenterFactory toReturn = null;
- for (PresenterFactory factory : presenterFactories) {
- if (factory.canCreate(presenterType)) {
- toReturn = factory;
- break;
- }
- }
- if (toReturn == null) {
- throw new PresenterNotFoundException("Unable to find presenter factory for [%s]", presenterType);
- }
- return toReturn;
- }
-
- protected ViewFactory getViewFactory(Class<? extends View> viewType) throws ViewNotFoundException {
- ViewFactory toReturn = null;
- for (ViewFactory factory : viewFactories) {
- if (factory.canCreate(viewType)) {
- toReturn = factory;
- break;
- }
- }
- if (toReturn == null) {
- throw new ViewNotFoundException("Unable to find view factory for [%s]", viewType);
- }
- return toReturn;
- }
-
- @SuppressWarnings("unchecked")
- @Override
- public <T extends Presenter<? extends View, ? extends EventBus>> T createPresenter(Locale locale, Class<T> presenterType) throws Exception {
- checkInitialized();
- Presenter<View, EventBus> presenter = null;
- try {
-
- PresenterFactory factory = getPresenterFactory(presenterType);
- presenter = factory.createPresenter(presenterType, locale);
-
- Class<? extends View> viewClazz = getViewClassFor(presenterType);
- ViewFactory viewFactory = getViewFactory(viewClazz);
-
- View view = viewFactory.createView(presenter, viewClazz, locale);
- presenter.setView(view);
-
- EventBus bus = createBus(presenter);
- presenter.setEventBus(bus);
-
- if (presenter.getLogger() == null) {
- presenter.setLogger(getLogger());
- }
-
- presenter.bind();
- } catch (Exception ex) {
- getLogger().error(ex, "Error creating presenter");
- throw ex;
- }
- return (T) presenter;
- }
-
- @SuppressWarnings("unchecked")
- protected EventBus createBus(Presenter<? extends View, ? extends EventBus> presenter) {
- Type type = getType(presenter.getClass());
- EventBus toReturn = null;
- if (EventBus.class.isAssignableFrom((Class<?>) type)) {
- Class<? extends EventBus> clazz = (Class<? extends EventBus>) type;
- getLogger().debug("Class: [%s]", clazz.getName());
- toReturn = getEventBusAdmin().register(clazz, presenter);
- }
- return toReturn;
- }
-
- protected Type getType(Class<?> presenterClass) {
- Type superClass = presenterClass.getGenericSuperclass();
- ParameterizedType pt = (ParameterizedType) superClass;
- Type[] typeArgs = pt.getActualTypeArguments();
- return typeArgs[1];
- }
-
- protected Class<? extends View> getViewClassFor(Class<? extends Presenter<? extends View, ? extends EventBus>> presenterClazz) throws PresenterAnnotationException {
- IsPresenterFor presenterBinding = presenterClazz.getAnnotation(IsPresenterFor.class);
- if (presenterBinding == null) {
- throw new PresenterAnnotationException("presenterClazz missing @IsPresenterFor annotation");
- }
- return presenterBinding.value();
- }
-}
diff --git a/plugins/org.eclipse.osee.display.mvp/src/org/eclipse/osee/display/mvp/internal/Subscribers.java b/plugins/org.eclipse.osee.display.mvp/src/org/eclipse/osee/display/mvp/internal/Subscribers.java
deleted file mode 100644
index 97aa0add4f..0000000000
--- a/plugins/org.eclipse.osee.display.mvp/src/org/eclipse/osee/display/mvp/internal/Subscribers.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*******************************************************************************
- * 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.mvp.internal;
-
-import java.lang.ref.WeakReference;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-import org.eclipse.osee.logger.Log;
-
-/**
- * @author Roberto E. Escobar
- */
-public class Subscribers {
-
- private final Log logger;
- private final Map<Class<?>, WeakReference<?>> subscribers = new ConcurrentHashMap<Class<?>, WeakReference<?>>();
-
- public Subscribers(Log logger) {
- this.logger = logger;
- }
-
- public void addSubscriber(Object subscriber) {
- manageReferences();
- logger.debug("Adding subscriber: [%s]", subscriber);
- subscribers.put(subscriber.getClass(), new WeakReference<Object>(subscriber));
- }
-
- private void manageReferences() {
- Set<Class<?>> toRemove = new HashSet<Class<?>>();
- for (Entry<Class<?>, WeakReference<?>> entry : subscribers.entrySet()) {
- WeakReference<?> reference = entry.getValue();
- Object object = reference.get();
- if (object == null) {
- toRemove.add(entry.getKey());
- }
- }
- for (Class<?> item : toRemove) {
- subscribers.remove(item);
- logger.debug("Removing subscriber: [%s]", item);
- }
- }
-
- @SuppressWarnings("unchecked")
- public <T> T findSubscriber(Class<T> subscriberType) {
- T subscriber = null;
- for (Entry<Class<?>, WeakReference<?>> entry : subscribers.entrySet()) {
- if (subscriberType.isAssignableFrom(entry.getKey())) {
- WeakReference<T> reference = (WeakReference<T>) entry.getValue();
- subscriber = reference.get();
- if (subscriber == null) {
- logger.debug("Removing subscriber: [%s]", subscriberType);
- subscribers.remove(subscriberType);
- } else {
- break;
- }
- }
- }
- return subscriber;
- }
-}
diff --git a/plugins/org.eclipse.osee.display.mvp/src/org/eclipse/osee/display/mvp/presenter/AbstractPresenter.java b/plugins/org.eclipse.osee.display.mvp/src/org/eclipse/osee/display/mvp/presenter/AbstractPresenter.java
deleted file mode 100644
index 51b3552e64..0000000000
--- a/plugins/org.eclipse.osee.display.mvp/src/org/eclipse/osee/display/mvp/presenter/AbstractPresenter.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*******************************************************************************
- * 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.mvp.presenter;
-
-import org.eclipse.osee.display.mvp.BindException;
-import org.eclipse.osee.display.mvp.MessageType;
-import org.eclipse.osee.display.mvp.event.EventBus;
-import org.eclipse.osee.display.mvp.view.View;
-import org.eclipse.osee.logger.Log;
-
-/**
- * @author Roberto E. Escobar
- */
-public abstract class AbstractPresenter<V extends View, E extends EventBus> implements Presenter<V, E> {
-
- private Log logger;
-
- private V view;
- private E eventBus;
-
- protected AbstractPresenter() {
- //
- }
-
- @Override
- public Log getLogger() {
- return logger;
- }
-
- @Override
- public void setLogger(Log logger) {
- this.logger = logger;
- }
-
- @Override
- public void setView(V view) {
- this.view = view;
- }
-
- @Override
- public V getView() {
- return this.view;
- }
-
- @Override
- public void setEventBus(E eventBus) {
- this.eventBus = eventBus;
- }
-
- @Override
- public E getEventBus() {
- return this.eventBus;
- }
-
- @SuppressWarnings("unused")
- @Override
- public void bind() throws BindException {
- //
- }
-
- @Override
- public void showNotification(String caption) {
- view.displayMessage(caption);
- }
-
- @Override
- public void showNotification(String caption, String description, MessageType type) {
- view.displayMessage(caption, description, type);
- }
-}
diff --git a/plugins/org.eclipse.osee.display.mvp/src/org/eclipse/osee/display/mvp/presenter/AbstractPresenterFactory.java b/plugins/org.eclipse.osee.display.mvp/src/org/eclipse/osee/display/mvp/presenter/AbstractPresenterFactory.java
deleted file mode 100644
index 91ba64fe06..0000000000
--- a/plugins/org.eclipse.osee.display.mvp/src/org/eclipse/osee/display/mvp/presenter/AbstractPresenterFactory.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*******************************************************************************
- * 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.mvp.presenter;
-
-import org.eclipse.osee.display.mvp.event.EventBus;
-import org.eclipse.osee.display.mvp.view.View;
-import org.eclipse.osee.logger.Log;
-
-/**
- * @author Roberto E. Escobar
- */
-public abstract class AbstractPresenterFactory implements PresenterFactory {
-
- private Log logger;
-
- public void setLogger(Log logger) {
- this.logger = logger;
- }
-
- public Log getLogger() {
- return logger;
- }
-
- @Override
- public boolean canCreate(Class<? extends Presenter<? extends View, ? extends EventBus>> presenterType) {
- return true;
- }
-
- protected boolean implementsType(Class<? extends Presenter<? extends View, ? extends EventBus>> concreteType, Class<? extends Presenter<? extends View, ? extends EventBus>> interfaceType) {
- return interfaceType.isAssignableFrom(concreteType);
- }
-}
diff --git a/plugins/org.eclipse.osee.display.mvp/src/org/eclipse/osee/display/mvp/presenter/CreatePresenterException.java b/plugins/org.eclipse.osee.display.mvp/src/org/eclipse/osee/display/mvp/presenter/CreatePresenterException.java
deleted file mode 100644
index 53c62a3833..0000000000
--- a/plugins/org.eclipse.osee.display.mvp/src/org/eclipse/osee/display/mvp/presenter/CreatePresenterException.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * 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.mvp.presenter;
-
-import org.eclipse.osee.display.mvp.internal.BaseException;
-
-/**
- * @author Roberto E. Escobar
- */
-public class CreatePresenterException extends BaseException {
-
- private static final long serialVersionUID = 8052670886753554711L;
-
- public CreatePresenterException(String message, Object... args) {
- super(message, args);
- }
-
- public CreatePresenterException(Throwable cause, String message, Object... args) {
- super(cause, message, args);
- }
-
- public CreatePresenterException(Throwable cause) {
- super(cause);
- }
-
-}
diff --git a/plugins/org.eclipse.osee.display.mvp/src/org/eclipse/osee/display/mvp/presenter/Presenter.java b/plugins/org.eclipse.osee.display.mvp/src/org/eclipse/osee/display/mvp/presenter/Presenter.java
deleted file mode 100644
index a1e2040725..0000000000
--- a/plugins/org.eclipse.osee.display.mvp/src/org/eclipse/osee/display/mvp/presenter/Presenter.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*******************************************************************************
- * 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.mvp.presenter;
-
-import org.eclipse.osee.display.mvp.BindException;
-import org.eclipse.osee.display.mvp.MessageType;
-import org.eclipse.osee.display.mvp.event.EventBus;
-import org.eclipse.osee.display.mvp.view.View;
-import org.eclipse.osee.logger.Log;
-
-/**
- * @author Roberto E. Escobar
- */
-public interface Presenter<V extends View, E extends EventBus> {
-
- Log getLogger();
-
- void setLogger(Log logger);
-
- void setView(V view);
-
- V getView();
-
- void setEventBus(E eventBus);
-
- E getEventBus();
-
- void bind() throws BindException;
-
- void showNotification(String caption);
-
- void showNotification(String caption, String description, MessageType type);
-}
diff --git a/plugins/org.eclipse.osee.display.mvp/src/org/eclipse/osee/display/mvp/presenter/PresenterAnnotationException.java b/plugins/org.eclipse.osee.display.mvp/src/org/eclipse/osee/display/mvp/presenter/PresenterAnnotationException.java
deleted file mode 100644
index 476bc87772..0000000000
--- a/plugins/org.eclipse.osee.display.mvp/src/org/eclipse/osee/display/mvp/presenter/PresenterAnnotationException.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * 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.mvp.presenter;
-
-import org.eclipse.osee.display.mvp.internal.BaseException;
-
-/**
- * @author Roberto E. Escobar
- */
-public class PresenterAnnotationException extends BaseException {
-
- private static final long serialVersionUID = 3353674767911593102L;
-
- public PresenterAnnotationException(String message, Object... args) {
- super(message, args);
- }
-
- public PresenterAnnotationException(Throwable cause, String message, Object... args) {
- super(cause, message, args);
- }
-
- public PresenterAnnotationException(Throwable cause) {
- super(cause);
- }
-
-}
diff --git a/plugins/org.eclipse.osee.display.mvp/src/org/eclipse/osee/display/mvp/presenter/PresenterFactory.java b/plugins/org.eclipse.osee.display.mvp/src/org/eclipse/osee/display/mvp/presenter/PresenterFactory.java
deleted file mode 100644
index 55611598f8..0000000000
--- a/plugins/org.eclipse.osee.display.mvp/src/org/eclipse/osee/display/mvp/presenter/PresenterFactory.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*******************************************************************************
- * 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.mvp.presenter;
-
-import java.util.Locale;
-import org.eclipse.osee.display.mvp.event.EventBus;
-import org.eclipse.osee.display.mvp.view.View;
-
-/**
- * @author Roberto E. Escobar
- */
-public interface PresenterFactory {
-
- boolean canCreate(Class<? extends Presenter<? extends View, ? extends EventBus>> presenterType);
-
- <T extends Presenter<? extends View, ? extends EventBus>> T createPresenter(Class<? extends Presenter<? extends View, ? extends EventBus>> presenterType, Locale locale) throws CreatePresenterException;
-
-}
diff --git a/plugins/org.eclipse.osee.display.mvp/src/org/eclipse/osee/display/mvp/presenter/PresenterNotFoundException.java b/plugins/org.eclipse.osee.display.mvp/src/org/eclipse/osee/display/mvp/presenter/PresenterNotFoundException.java
deleted file mode 100644
index bea025a9ba..0000000000
--- a/plugins/org.eclipse.osee.display.mvp/src/org/eclipse/osee/display/mvp/presenter/PresenterNotFoundException.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * 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.mvp.presenter;
-
-import org.eclipse.osee.display.mvp.internal.BaseException;
-
-/**
- * @author Roberto E. Escobar
- */
-public class PresenterNotFoundException extends BaseException {
-
- private static final long serialVersionUID = 3353674767911593102L;
-
- public PresenterNotFoundException(String message, Object... args) {
- super(message, args);
- }
-
- public PresenterNotFoundException(Throwable cause, String message, Object... args) {
- super(cause, message, args);
- }
-
- public PresenterNotFoundException(Throwable cause) {
- super(cause);
- }
-
-}
diff --git a/plugins/org.eclipse.osee.display.mvp/src/org/eclipse/osee/display/mvp/presenter/annotation/IsPresenterFor.java b/plugins/org.eclipse.osee.display.mvp/src/org/eclipse/osee/display/mvp/presenter/annotation/IsPresenterFor.java
deleted file mode 100644
index 1fe6f7423c..0000000000
--- a/plugins/org.eclipse.osee.display.mvp/src/org/eclipse/osee/display/mvp/presenter/annotation/IsPresenterFor.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*******************************************************************************
- * 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.mvp.presenter.annotation;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-import org.eclipse.osee.display.mvp.view.View;
-
-/**
- * @author Roberto E. Escobar
- */
-@Target(ElementType.TYPE)
-@Retention(RetentionPolicy.RUNTIME)
-public @interface IsPresenterFor {
-
- Class<? extends View> value();
-
-}
diff --git a/plugins/org.eclipse.osee.display.mvp/src/org/eclipse/osee/display/mvp/view/AbstractView.java b/plugins/org.eclipse.osee.display.mvp/src/org/eclipse/osee/display/mvp/view/AbstractView.java
deleted file mode 100644
index cbf0ee4cab..0000000000
--- a/plugins/org.eclipse.osee.display.mvp/src/org/eclipse/osee/display/mvp/view/AbstractView.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*******************************************************************************
- * 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.mvp.view;
-
-import org.eclipse.osee.display.mvp.MessageType;
-import org.eclipse.osee.logger.Log;
-
-/**
- * @author Roberto E. Escobar
- */
-public abstract class AbstractView implements View {
-
- private Log logger;
- private boolean isDisposed = false;
-
- @Override
- public Log getLogger() {
- return logger;
- }
-
- @Override
- public void setLogger(Log logger) {
- this.logger = logger;
- }
-
- @Override
- public final void dispose() {
- if (!isDisposed()) {
- isDisposed = true;
- onDispose();
- }
- }
-
- @Override
- public boolean isDisposed() {
- return isDisposed;
- }
-
- @Override
- public void displayMessage(String caption) {
- //
- }
-
- @Override
- public void displayMessage(String caption, String description, MessageType messageType) {
- //
- }
-
- protected abstract void onDispose();
-}
diff --git a/plugins/org.eclipse.osee.display.mvp/src/org/eclipse/osee/display/mvp/view/AbstractViewFactory.java b/plugins/org.eclipse.osee.display.mvp/src/org/eclipse/osee/display/mvp/view/AbstractViewFactory.java
deleted file mode 100644
index 836868825b..0000000000
--- a/plugins/org.eclipse.osee.display.mvp/src/org/eclipse/osee/display/mvp/view/AbstractViewFactory.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*******************************************************************************
- * 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.mvp.view;
-
-import org.eclipse.osee.logger.Log;
-
-/**
- * @author Roberto E. Escobar
- */
-public abstract class AbstractViewFactory implements ViewFactory {
-
- private Log logger;
-
- public void setLogger(Log logger) {
- this.logger = logger;
- }
-
- public Log getLogger() {
- return logger;
- }
-
- @Override
- public boolean canCreate(Class<? extends View> viewType) {
- return true;
- }
-
- protected boolean implementsType(Class<? extends View> concreteType, Class<? extends View> interfaceType) {
- return interfaceType.isAssignableFrom(concreteType);
- }
-}
diff --git a/plugins/org.eclipse.osee.display.mvp/src/org/eclipse/osee/display/mvp/view/CreateViewException.java b/plugins/org.eclipse.osee.display.mvp/src/org/eclipse/osee/display/mvp/view/CreateViewException.java
deleted file mode 100644
index 5fa2b25c1c..0000000000
--- a/plugins/org.eclipse.osee.display.mvp/src/org/eclipse/osee/display/mvp/view/CreateViewException.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * 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.mvp.view;
-
-import org.eclipse.osee.display.mvp.internal.BaseException;
-
-/**
- * @author Roberto E. Escobar
- */
-public class CreateViewException extends BaseException {
-
- private static final long serialVersionUID = 8052670886753554711L;
-
- public CreateViewException(String message, Object... args) {
- super(message, args);
- }
-
- public CreateViewException(Throwable cause, String message, Object... args) {
- super(cause, message, args);
- }
-
- public CreateViewException(Throwable cause) {
- super(cause);
- }
-
-}
diff --git a/plugins/org.eclipse.osee.display.mvp/src/org/eclipse/osee/display/mvp/view/Display.java b/plugins/org.eclipse.osee.display.mvp/src/org/eclipse/osee/display/mvp/view/Display.java
deleted file mode 100644
index 15b9df5e84..0000000000
--- a/plugins/org.eclipse.osee.display.mvp/src/org/eclipse/osee/display/mvp/view/Display.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/*******************************************************************************
- * 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.mvp.view;
-
-/**
- * @author Roberto E. Escobar
- */
-public interface Display {
-
- Object getDisplay();
-}
diff --git a/plugins/org.eclipse.osee.display.mvp/src/org/eclipse/osee/display/mvp/view/View.java b/plugins/org.eclipse.osee.display.mvp/src/org/eclipse/osee/display/mvp/view/View.java
deleted file mode 100644
index 2954fc6f96..0000000000
--- a/plugins/org.eclipse.osee.display.mvp/src/org/eclipse/osee/display/mvp/view/View.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * 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.mvp.view;
-
-import org.eclipse.osee.display.mvp.MessageType;
-import org.eclipse.osee.logger.Log;
-
-/**
- * @author Roberto E. Escobar
- */
-public interface View {
-
- Log getLogger();
-
- void setLogger(Log logger);
-
- void displayMessage(String caption);
-
- void displayMessage(String caption, String description, MessageType messageType);
-
- void dispose();
-
- boolean isDisposed();
-
- Object getContent();
-}
diff --git a/plugins/org.eclipse.osee.display.mvp/src/org/eclipse/osee/display/mvp/view/ViewFactory.java b/plugins/org.eclipse.osee.display.mvp/src/org/eclipse/osee/display/mvp/view/ViewFactory.java
deleted file mode 100644
index 1040bf1ae4..0000000000
--- a/plugins/org.eclipse.osee.display.mvp/src/org/eclipse/osee/display/mvp/view/ViewFactory.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*******************************************************************************
- * 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.mvp.view;
-
-import java.util.Locale;
-import org.eclipse.osee.display.mvp.presenter.Presenter;
-
-/**
- * @author Roberto E. Escobar
- */
-public interface ViewFactory {
-
- boolean canCreate(Class<? extends View> viewType);
-
- <T extends View> T createView(Presenter<?, ?> presenter, Class<T> viewType, Locale locale) throws CreateViewException;
-
-}
diff --git a/plugins/org.eclipse.osee.display.mvp/src/org/eclipse/osee/display/mvp/view/ViewNotFoundException.java b/plugins/org.eclipse.osee.display.mvp/src/org/eclipse/osee/display/mvp/view/ViewNotFoundException.java
deleted file mode 100644
index c6ba3e01f4..0000000000
--- a/plugins/org.eclipse.osee.display.mvp/src/org/eclipse/osee/display/mvp/view/ViewNotFoundException.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * 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.mvp.view;
-
-import org.eclipse.osee.display.mvp.internal.BaseException;
-
-/**
- * @author Roberto E. Escobar
- */
-public class ViewNotFoundException extends BaseException {
-
- private static final long serialVersionUID = 3353674767911593102L;
-
- public ViewNotFoundException(String message, Object... args) {
- super(message, args);
- }
-
- public ViewNotFoundException(Throwable cause, String message, Object... args) {
- super(cause, message, args);
- }
-
- public ViewNotFoundException(Throwable cause) {
- super(cause);
- }
-
-}
diff --git a/plugins/org.eclipse.osee.display.presenter.mocks/.classpath b/plugins/org.eclipse.osee.display.presenter.mocks/.classpath
deleted file mode 100644
index ad32c83a78..0000000000
--- a/plugins/org.eclipse.osee.display.presenter.mocks/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/org.eclipse.osee.display.presenter.mocks/.project b/plugins/org.eclipse.osee.display.presenter.mocks/.project
deleted file mode 100644
index 6c01854fb9..0000000000
--- a/plugins/org.eclipse.osee.display.presenter.mocks/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.osee.display.presenter.mocks</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/plugins/org.eclipse.osee.display.presenter.mocks/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.display.presenter.mocks/META-INF/MANIFEST.MF
deleted file mode 100644
index 4775c5c812..0000000000
--- a/plugins/org.eclipse.osee.display.presenter.mocks/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,21 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Display Presenter Mocks
-Bundle-SymbolicName: org.eclipse.osee.display.presenter.mocks
-Bundle-Version: 0.17.0.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: org.eclipse.core.runtime;version="3.4.0",
- org.eclipse.osee.display.api.components,
- org.eclipse.osee.display.api.data,
- org.eclipse.osee.display.api.search,
- org.eclipse.osee.display.presenter,
- org.eclipse.osee.framework.core.data,
- org.eclipse.osee.framework.core.enums,
- org.eclipse.osee.framework.core.exception,
- org.eclipse.osee.framework.core.model.type,
- org.eclipse.osee.framework.jdk.core.type,
- org.eclipse.osee.logger,
- org.eclipse.osee.orcs.data,
- org.eclipse.osee.orcs.search
-Export-Package: org.eclipse.osee.display.presenter.mocks
-Require-Bundle: org.eclipse.osee.framework.core
diff --git a/plugins/org.eclipse.osee.display.presenter.mocks/build.properties b/plugins/org.eclipse.osee.display.presenter.mocks/build.properties
deleted file mode 100644
index 34d2e4d2da..0000000000
--- a/plugins/org.eclipse.osee.display.presenter.mocks/build.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
- .
diff --git a/plugins/org.eclipse.osee.display.presenter.mocks/pom.xml b/plugins/org.eclipse.osee.display.presenter.mocks/pom.xml
deleted file mode 100644
index 96c7c5dbd4..0000000000
--- a/plugins/org.eclipse.osee.display.presenter.mocks/pom.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.eclipse.osee</groupId>
- <artifactId>org.eclipse.osee.x.ats.parent</artifactId>
- <version>0.17.0-SNAPSHOT</version>
- <relativePath>../../plugins/org.eclipse.osee.x.ats.parent</relativePath>
- </parent>
-
- <artifactId>org.eclipse.osee.display.presenter.mocks</artifactId>
- <packaging>eclipse-plugin</packaging>
- <name>OSEE Display Presenter Mocks - (Incubation)</name>
-
- <build>
- <!-- workaround for https://issues.sonatype.org/browse/TYCHO-168 -->
- <resources>
- <resource>
- <directory>src</directory>
- <excludes>
- <exclude>**/*.java</exclude>
- </excludes>
- </resource>
- </resources>
- <plugins>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-source-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
-</project> \ No newline at end of file
diff --git a/plugins/org.eclipse.osee.display.presenter.mocks/src/org/eclipse/osee/display/presenter/mocks/MockArtifact.java b/plugins/org.eclipse.osee.display.presenter.mocks/src/org/eclipse/osee/display/presenter/mocks/MockArtifact.java
deleted file mode 100644
index 2bf4e1731b..0000000000
--- a/plugins/org.eclipse.osee.display.presenter.mocks/src/org/eclipse/osee/display/presenter/mocks/MockArtifact.java
+++ /dev/null
@@ -1,307 +0,0 @@
-/*******************************************************************************
- * 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.presenter.mocks;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.LinkedHashSet;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
-import org.eclipse.osee.framework.core.data.IArtifactType;
-import org.eclipse.osee.framework.core.data.IAttributeType;
-import org.eclipse.osee.framework.core.data.IOseeBranch;
-import org.eclipse.osee.framework.core.data.IRelationType;
-import org.eclipse.osee.framework.core.data.IRelationTypeSide;
-import org.eclipse.osee.framework.core.enums.CoreArtifactTypes;
-import org.eclipse.osee.framework.core.enums.CoreAttributeTypes;
-import org.eclipse.osee.framework.core.enums.CoreBranches;
-import org.eclipse.osee.framework.core.enums.DeletionFlag;
-import org.eclipse.osee.framework.core.enums.RelationTypeMultiplicity;
-import org.eclipse.osee.framework.core.model.type.RelationType;
-import org.eclipse.osee.framework.jdk.core.type.HashCollection;
-import org.eclipse.osee.framework.jdk.core.type.Identity;
-import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
-import org.eclipse.osee.framework.jdk.core.type.ResultSet;
-import org.eclipse.osee.framework.jdk.core.type.ResultSets;
-import org.eclipse.osee.orcs.data.ArtifactReadable;
-import org.eclipse.osee.orcs.data.AttributeId;
-import org.eclipse.osee.orcs.data.AttributeReadable;
-
-/**
- * @author John R. Misinco
- */
-public class MockArtifact implements ArtifactReadable {
-
- private final Map<IRelationTypeSide, List<ArtifactReadable>> relationMap =
- new HashMap<IRelationTypeSide, List<ArtifactReadable>>();
- private final Set<RelationType> validRelationTypes = new LinkedHashSet<RelationType>();
-
- private final HashCollection<IAttributeType, String> attributes = new HashCollection<IAttributeType, String>();
-
- private final String name, guid;
- private final IArtifactType type;
- private final IOseeBranch branch;
- private ArtifactReadable parent;
-
- public MockArtifact(String guid, String name) {
- this(guid, name, CoreArtifactTypes.Artifact, CoreBranches.COMMON);
- }
-
- public MockArtifact(String guid, String name, IArtifactType type, IOseeBranch branch) {
- this.guid = guid;
- this.name = name;
- this.type = type;
- this.branch = branch;
- addAttribute(CoreAttributeTypes.Name, name);
- }
-
- public void setParent(ArtifactReadable parent) {
- this.parent = parent;
- }
-
- public void addAttribute(IAttributeType type, String value) {
- attributes.put(type, value);
- }
-
- @Override
- public Collection<RelationType> getValidRelationTypes() {
- return validRelationTypes;
- }
-
- public void addRelationType(RelationType relationType) {
- validRelationTypes.add(relationType);
- }
-
- public ResultSet<ArtifactReadable> getRelatedArtifacts(IRelationTypeSide side) {
- List<ArtifactReadable> data = relationMap.get(side);
- if (data == null) {
- data = Collections.emptyList();
- }
- return ResultSets.newResultSet(data);
- }
-
- public void addRelation(IRelationTypeSide relation, ArtifactReadable artifact) {
- List<ArtifactReadable> artList = relationMap.get(relation);
- if (artList == null) {
- artList = new LinkedList<ArtifactReadable>();
- relationMap.put(relation, artList);
- }
- artList.add(artifact);
- RelationType type =
- new RelationType(relation.getGuid(), relation.getName(), "sideA", "sideB", CoreArtifactTypes.Artifact,
- CoreArtifactTypes.Artifact, RelationTypeMultiplicity.MANY_TO_MANY, "");
- addRelationType(type);
- }
-
- @Override
- public Integer getLocalId() {
- return 0;
- }
-
- @Override
- public IOseeBranch getBranch() {
- return branch;
- }
-
- @Override
- public int getTransaction() {
- return 0;
- }
-
- @Override
- public IArtifactType getArtifactType() {
- return type;
- }
-
- @Override
- public Collection<IAttributeType> getExistingAttributeTypes() {
- return attributes.keySet();
- }
-
- @SuppressWarnings({"unchecked", "rawtypes"})
- @Override
- public <T> ResultSet<AttributeReadable<T>> getAttributes(IAttributeType attributeType) {
- Collection<String> values = attributes.getValues(attributeType);
- List<AttributeReadable<T>> toReturn = null;
- if (values != null && !values.isEmpty()) {
- toReturn = new LinkedList<AttributeReadable<T>>();
- for (String value : values) {
- AttributeReadable<T> attr = new MockAttribute(attributeType, value);
- toReturn.add(attr);
- }
- } else {
- toReturn = Collections.emptyList();
- }
- return ResultSets.newResultSet(toReturn);
- }
-
- @Override
- public String getSoleAttributeAsString(IAttributeType attributeType) {
- return null;
- }
-
- @Override
- public String getGuid() {
- return guid;
- }
-
- @Override
- public boolean matches(Identity<?>... identities) {
- return false;
- }
-
- @Override
- public String getName() {
- return name;
- }
-
- @Override
- public ResultSet<AttributeReadable<Object>> getAttributes() {
- List<AttributeReadable<Object>> toReturn = new ArrayList<AttributeReadable<Object>>();
- for (Entry<IAttributeType, Collection<String>> entry : attributes.entrySet()) {
- for (String value : entry.getValue()) {
- toReturn.add(new MockAttribute<Object>(entry.getKey(), value));
- }
- }
- return ResultSets.newResultSet(toReturn);
- }
-
- public void clearRelations() {
- validRelationTypes.clear();
- relationMap.clear();
- }
-
- @Override
- public String getSoleAttributeAsString(IAttributeType attributeType, String defaultValue) {
- return null;
- }
-
- @Override
- public boolean isOfType(IArtifactType... otherTypes) {
- return false;
- }
-
- @Override
- public <T> T getSoleAttributeValue(IAttributeType attributeType) {
- return null;
- }
-
- @Override
- public boolean isAttributeTypeValid(IAttributeType attributeType) {
- return false;
- }
-
- @Override
- public int getAttributeCount(IAttributeType type) throws OseeCoreException {
- return attributes.getValues(type).size();
- }
-
- @Override
- public <T> List<T> getAttributeValues(IAttributeType attributeType) throws OseeCoreException {
- return null;
- }
-
- @Override
- public Collection<? extends IAttributeType> getValidAttributeTypes() throws OseeCoreException {
- return null;
- }
-
- @Override
- public boolean isDeleted() {
- return false;
- }
-
- @Override
- public int getAttributeCount(IAttributeType type, DeletionFlag deletionFlag) throws OseeCoreException {
- return 0;
- }
-
- @Override
- public ResultSet<AttributeReadable<Object>> getAttributes(DeletionFlag deletionFlag) throws OseeCoreException {
- return null;
- }
-
- @Override
- public <T> ResultSet<AttributeReadable<T>> getAttributes(IAttributeType attributeType, DeletionFlag deletionFlag) throws OseeCoreException {
- return null;
- }
-
- @Override
- public AttributeReadable<Object> getAttributeById(AttributeId attributeId) throws OseeCoreException {
- return null;
- }
-
- @Override
- public int getMaximumRelationAllowed(IRelationTypeSide relationTypeSide) throws OseeCoreException {
- return 0;
- }
-
- @Override
- public Collection<? extends IRelationType> getExistingRelationTypes() throws OseeCoreException {
- return null;
- }
-
- @Override
- public ArtifactReadable getParent() throws OseeCoreException {
- return parent;
- }
-
- @Override
- public ResultSet<ArtifactReadable> getChildren() throws OseeCoreException {
- return null;
- }
-
- @Override
- public ResultSet<ArtifactReadable> getRelated(IRelationTypeSide relationTypeSide) throws OseeCoreException {
- return null;
- }
-
- @Override
- public boolean areRelated(IRelationTypeSide typeAndSide, ArtifactReadable readable) throws OseeCoreException {
- return false;
- }
-
- @Override
- public int getRelatedCount(IRelationTypeSide typeAndSide) throws OseeCoreException {
- return 0;
- }
-
- @Override
- public String getRationale(IRelationTypeSide typeAndSide, ArtifactReadable readable) throws OseeCoreException {
- return null;
- }
-
- @Override
- public <T> T getSoleAttributeValue(IAttributeType attributeType, T defaultValue) throws OseeCoreException {
- return null;
- }
-
- @Override
- public List<ArtifactReadable> getDescendants() throws OseeCoreException {
- return null;
- }
-
- @Override
- public void getDescendants(List<ArtifactReadable> descendants) throws OseeCoreException {
- //
- }
-
- @Override
- public List<ArtifactReadable> getAncestors() throws OseeCoreException {
- return null;
- }
-
-}
diff --git a/plugins/org.eclipse.osee.display.presenter.mocks/src/org/eclipse/osee/display/presenter/mocks/MockArtifactHeaderComponent.java b/plugins/org.eclipse.osee.display.presenter.mocks/src/org/eclipse/osee/display/presenter/mocks/MockArtifactHeaderComponent.java
deleted file mode 100644
index 5f15e9c05f..0000000000
--- a/plugins/org.eclipse.osee.display.presenter.mocks/src/org/eclipse/osee/display/presenter/mocks/MockArtifactHeaderComponent.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*******************************************************************************
- * 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.presenter.mocks;
-
-import org.eclipse.osee.display.api.components.ArtifactHeaderComponent;
-import org.eclipse.osee.display.api.data.ViewArtifact;
-
-/**
- * @author John R. Misinco
- */
-public class MockArtifactHeaderComponent implements ArtifactHeaderComponent {
-
- private ViewArtifact artifact;
- private String errorMessage;
-
- public ViewArtifact getArtifact() {
- return artifact;
- }
-
- public String getErrorMessage() {
- return errorMessage;
- }
-
- @Override
- public void setErrorMessage(String shortMsg, String longMsg, MsgType msgType) {
- errorMessage = shortMsg;
- }
-
- @Override
- public void clearAll() {
- // do nothing
- }
-
- @Override
- public void setArtifact(ViewArtifact artifact) {
- this.artifact = artifact;
- }
-}
diff --git a/plugins/org.eclipse.osee.display.presenter.mocks/src/org/eclipse/osee/display/presenter/mocks/MockArtifactProvider.java b/plugins/org.eclipse.osee.display.presenter.mocks/src/org/eclipse/osee/display/presenter/mocks/MockArtifactProvider.java
deleted file mode 100644
index dc71c2242d..0000000000
--- a/plugins/org.eclipse.osee.display.presenter.mocks/src/org/eclipse/osee/display/presenter/mocks/MockArtifactProvider.java
+++ /dev/null
@@ -1,122 +0,0 @@
-/*******************************************************************************
- * 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.presenter.mocks;
-
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import org.eclipse.osee.display.api.search.ArtifactProvider;
-import org.eclipse.osee.display.api.search.AsyncSearchListener;
-import org.eclipse.osee.framework.core.data.IArtifactToken;
-import org.eclipse.osee.framework.core.data.IOseeBranch;
-import org.eclipse.osee.framework.core.data.IRelationType;
-import org.eclipse.osee.framework.core.data.IRelationTypeSide;
-import org.eclipse.osee.framework.core.enums.RelationSide;
-import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
-import org.eclipse.osee.framework.jdk.core.type.ResultSet;
-import org.eclipse.osee.framework.jdk.core.type.ResultSets;
-import org.eclipse.osee.orcs.data.ArtifactReadable;
-import org.eclipse.osee.orcs.data.AttributeReadable;
-import org.eclipse.osee.orcs.search.Match;
-
-/**
- * @author John R. Misinco
- */
-public class MockArtifactProvider implements ArtifactProvider {
-
- private final Map<String, ArtifactReadable> artifacts = new HashMap<String, ArtifactReadable>();
- private List<Match<ArtifactReadable, AttributeReadable<?>>> resultList;
-
- public void addArtifact(ArtifactReadable artifact) {
- artifacts.put(artifact.getGuid(), artifact);
- }
-
- public void setResultList(List<Match<ArtifactReadable, AttributeReadable<?>>> resultList) {
- this.resultList = resultList;
- }
-
- @Override
- public ArtifactReadable getArtifactByArtifactToken(IOseeBranch branch, IArtifactToken token) {
- return artifacts.get(token.getGuid());
- }
-
- @Override
- public ArtifactReadable getArtifactByGuid(IOseeBranch branch, String guid) {
- return artifacts.get(guid);
- }
-
- // @Override
- // public List<Match<ReadableArtifact, ReadableAttribute<?>>> getSearchResults(IOseeBranch branch, boolean nameOnly, String searchPhrase) {
- // return resultList;
- // }
-
- @Override
- public ResultSet<ArtifactReadable> getRelatedArtifacts(ArtifactReadable art, IRelationTypeSide relationTypeSide) throws OseeCoreException {
- if (art instanceof MockArtifact) {
- MockArtifact mArt = (MockArtifact) art;
- ResultSet<ArtifactReadable> result = mArt.getRelatedArtifacts(relationTypeSide);
- return result;
- } else {
- return ResultSets.emptyResultSet();
- }
- }
-
- @Override
- public ArtifactReadable getRelatedArtifact(ArtifactReadable art, IRelationTypeSide relationTypeSide) {
- if (art instanceof MockArtifact) {
- MockArtifact mArt = (MockArtifact) art;
- return mArt.getRelatedArtifacts(relationTypeSide).iterator().next();
- } else {
- return null;
- }
- }
-
- @Override
- public ArtifactReadable getParent(ArtifactReadable art) {
- if (art instanceof MockArtifact) {
- MockArtifact mArt = (MockArtifact) art;
- return mArt.getParent();
- } else {
- return null;
- }
- }
-
- @Override
- public Collection<? extends IRelationType> getValidRelationTypes(ArtifactReadable art) {
- if (art instanceof MockArtifact) {
- return ((MockArtifact) art).getValidRelationTypes();
- } else {
- return Collections.emptyList();
- }
- }
-
- @Override
- public void getSearchResults(IOseeBranch branch, boolean nameOnly, String searchPhrase, AsyncSearchListener callback) {
- callback.onSearchComplete(resultList);
- }
-
- @Override
- public void cancelSearch() {
- //do nothing
- }
-
- @Override
- public String getSideAName(IRelationType type) {
- return String.format("%s:%s", type, RelationSide.SIDE_A);
- }
-
- @Override
- public String getSideBName(IRelationType type) {
- return String.format("%s:%s", type, RelationSide.SIDE_B);
- }
-} \ No newline at end of file
diff --git a/plugins/org.eclipse.osee.display.presenter.mocks/src/org/eclipse/osee/display/presenter/mocks/MockAttribute.java b/plugins/org.eclipse.osee.display.presenter.mocks/src/org/eclipse/osee/display/presenter/mocks/MockAttribute.java
deleted file mode 100644
index bbc9ae4366..0000000000
--- a/plugins/org.eclipse.osee.display.presenter.mocks/src/org/eclipse/osee/display/presenter/mocks/MockAttribute.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*******************************************************************************
- * 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.presenter.mocks;
-
-import org.eclipse.osee.framework.core.data.IAttributeType;
-import org.eclipse.osee.framework.core.enums.ModificationType;
-import org.eclipse.osee.orcs.data.AttributeReadable;
-
-/**
- * @author John R. Misinco
- */
-public class MockAttribute<T> implements AttributeReadable<T> {
-
- private final IAttributeType attrType;
- private final T value;
-
- public MockAttribute(IAttributeType attrType, T value) {
- this.attrType = attrType;
- this.value = value;
- }
-
- @Override
- public long getGammaId() {
- return 0;
- }
-
- @Override
- public ModificationType getModificationType() {
- return null;
- }
-
- @Override
- public Integer getLocalId() {
- return 0;
- }
-
- @Override
- public IAttributeType getAttributeType() {
- return attrType;
- }
-
- @Override
- public boolean isOfType(IAttributeType otherAttributeType) {
- return attrType.matches(otherAttributeType);
- }
-
- @Override
- public T getValue() {
- return value;
- }
-
- @Override
- public String getDisplayableString() {
- return String.valueOf(value);
- }
-
- @Override
- public boolean isDeleted() {
- return false;
- }
-} \ No newline at end of file
diff --git a/plugins/org.eclipse.osee.display.presenter.mocks/src/org/eclipse/osee/display/presenter/mocks/MockAttributeComponent.java b/plugins/org.eclipse.osee.display.presenter.mocks/src/org/eclipse/osee/display/presenter/mocks/MockAttributeComponent.java
deleted file mode 100644
index 8c89f61514..0000000000
--- a/plugins/org.eclipse.osee.display.presenter.mocks/src/org/eclipse/osee/display/presenter/mocks/MockAttributeComponent.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * 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.presenter.mocks;
-
-import java.util.HashMap;
-import java.util.Map;
-import org.eclipse.osee.display.api.components.AttributeComponent;
-
-/**
- * @author John R. Misinco
- */
-public class MockAttributeComponent implements AttributeComponent {
-
- private final Map<String, String> attributes = new HashMap<String, String>();
- private String errorMessage;
-
- public Map<String, String> getAttributes() {
- return attributes;
- }
-
- public String getErrorMessage() {
- return errorMessage;
- }
-
- @Override
- public void setErrorMessage(String shortMsg, String longMsg, MsgType msgType) {
- // errorMessage = message;
- }
-
- @Override
- public void clearAll() {
- attributes.clear();
- }
-
- @Override
- public void addAttribute(String type, String value) {
- attributes.put(type, value);
- }
-
-} \ No newline at end of file
diff --git a/plugins/org.eclipse.osee.display.presenter.mocks/src/org/eclipse/osee/display/presenter/mocks/MockDisplayOptionsComponent.java b/plugins/org.eclipse.osee.display.presenter.mocks/src/org/eclipse/osee/display/presenter/mocks/MockDisplayOptionsComponent.java
deleted file mode 100644
index 245a370c7a..0000000000
--- a/plugins/org.eclipse.osee.display.presenter.mocks/src/org/eclipse/osee/display/presenter/mocks/MockDisplayOptionsComponent.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*******************************************************************************
- * 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.presenter.mocks;
-
-import org.eclipse.osee.display.api.components.DisplayOptionsComponent;
-import org.eclipse.osee.display.api.data.DisplayOptions;
-
-/**
- * @author John R. Misinco
- */
-public class MockDisplayOptionsComponent implements DisplayOptionsComponent {
-
- @Override
- public void clearAll() {
- // do nothing
- }
-
- @Override
- public void setDisplayOptions(DisplayOptions options) {
- // do nothing
- }
-
-} \ No newline at end of file
diff --git a/plugins/org.eclipse.osee.display.presenter.mocks/src/org/eclipse/osee/display/presenter/mocks/MockLogger.java b/plugins/org.eclipse.osee.display.presenter.mocks/src/org/eclipse/osee/display/presenter/mocks/MockLogger.java
deleted file mode 100644
index 2e47f69439..0000000000
--- a/plugins/org.eclipse.osee.display.presenter.mocks/src/org/eclipse/osee/display/presenter/mocks/MockLogger.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*******************************************************************************
- * 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.presenter.mocks;
-
-import org.eclipse.osee.logger.Log;
-
-/**
- * @author John R. Misinco
- */
-public class MockLogger implements Log {
-
- @Override
- public boolean isTraceEnabled() {
- return false;
- }
-
- @Override
- public void trace(String format, Object... args) {
- // do nothing
- }
-
- @Override
- public void trace(Throwable th, String format, Object... args) {
- // do nothing
- }
-
- @Override
- public boolean isDebugEnabled() {
- return false;
- }
-
- @Override
- public void debug(String format, Object... args) {
- // do nothing
- }
-
- @Override
- public void debug(Throwable th, String format, Object... args) {
- // do nothing
- }
-
- @Override
- public boolean isInfoEnabled() {
- return false;
- }
-
- @Override
- public void info(String format, Object... args) {
- // do nothing
- }
-
- @Override
- public void info(Throwable th, String format, Object... args) {
- // do nothing
- }
-
- @Override
- public boolean isWarnEnabled() {
- return false;
- }
-
- @Override
- public void warn(String format, Object... args) {
- // do nothing
- }
-
- @Override
- public void warn(Throwable th, String format, Object... args) {
- // do nothing
- }
-
- @Override
- public boolean isErrorEnabled() {
- return false;
- }
-
- @Override
- public void error(String format, Object... args) {
- // do nothing
- }
-
- @Override
- public void error(Throwable th, String format, Object... args) {
- // do nothing
- }
-
-}
diff --git a/plugins/org.eclipse.osee.display.presenter.mocks/src/org/eclipse/osee/display/presenter/mocks/MockMatch.java b/plugins/org.eclipse.osee.display.presenter.mocks/src/org/eclipse/osee/display/presenter/mocks/MockMatch.java
deleted file mode 100644
index f662dab4eb..0000000000
--- a/plugins/org.eclipse.osee.display.presenter.mocks/src/org/eclipse/osee/display/presenter/mocks/MockMatch.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*******************************************************************************
- * 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.presenter.mocks;
-
-import java.util.LinkedList;
-import java.util.List;
-import org.eclipse.osee.framework.jdk.core.type.MatchLocation;
-import org.eclipse.osee.orcs.data.ArtifactReadable;
-import org.eclipse.osee.orcs.data.AttributeReadable;
-import org.eclipse.osee.orcs.search.Match;
-
-/**
- * @author John R. Misinco
- */
-public class MockMatch implements Match<ArtifactReadable, AttributeReadable<String>> {
-
- private final ArtifactReadable artifact;
- private final List<AttributeReadable<String>> attributes = new LinkedList<AttributeReadable<String>>();
-
- public MockMatch(ArtifactReadable artifact) {
- this.artifact = artifact;
- }
-
- public MockMatch(ArtifactReadable artifact, AttributeReadable<String> attribute) {
- this(artifact);
- attributes.add(attribute);
- }
-
- public MockMatch(ArtifactReadable artifact, List<AttributeReadable<String>> attributes) {
- this(artifact);
- attributes.addAll(attributes);
- }
-
- @Override
- public boolean hasLocationData() {
- return false;
- }
-
- @Override
- public ArtifactReadable getItem() {
- return artifact;
- }
-
- @Override
- public List<AttributeReadable<String>> getElements() {
- return attributes;
- }
-
- @Override
- public List<MatchLocation> getLocation(AttributeReadable<String> element) {
- List<MatchLocation> toReturn = new LinkedList<MatchLocation>();
- toReturn.add(new MatchLocation());
- return toReturn;
- }
-} \ No newline at end of file
diff --git a/plugins/org.eclipse.osee.display.presenter.mocks/src/org/eclipse/osee/display/presenter/mocks/MockRelationComponent.java b/plugins/org.eclipse.osee.display.presenter.mocks/src/org/eclipse/osee/display/presenter/mocks/MockRelationComponent.java
deleted file mode 100644
index d6b31531ad..0000000000
--- a/plugins/org.eclipse.osee.display.presenter.mocks/src/org/eclipse/osee/display/presenter/mocks/MockRelationComponent.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*******************************************************************************
- * 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.presenter.mocks;
-
-import java.util.LinkedList;
-import java.util.List;
-import org.eclipse.osee.display.api.components.RelationComponent;
-import org.eclipse.osee.display.api.data.ViewArtifact;
-import org.eclipse.osee.display.api.data.ViewId;
-
-/**
- * @author John R. Misinco
- */
-public class MockRelationComponent implements RelationComponent {
-
- private ViewArtifact artifact;
- private final List<ViewId> relationTypes = new LinkedList<ViewId>();
- private final List<ViewArtifact> leftRelations = new LinkedList<ViewArtifact>();
- private final List<ViewArtifact> rightRelations = new LinkedList<ViewArtifact>();
- private String errorMessage;
- private String leftName, rightName;
-
- public String getLeftName() {
- return leftName;
- }
-
- public String getRightName() {
- return rightName;
- }
-
- public ViewArtifact getArtifact() {
- return artifact;
- }
-
- public List<ViewId> getRelationTypes() {
- return relationTypes;
- }
-
- public List<ViewArtifact> getRightRelations() {
- return rightRelations;
- }
-
- public List<ViewArtifact> getLeftRelations() {
- return leftRelations;
- }
-
- public String getErrorMessage() {
- return errorMessage;
- }
-
- @Override
- public void setErrorMessage(String shortMsg, String longMsg, MsgType msgType) {
- errorMessage = shortMsg;
- }
-
- @Override
- public void setArtifact(ViewArtifact artifact) {
- this.artifact = artifact;
- }
-
- @Override
- public void clearAll() {
- clearRelations();
- relationTypes.clear();
- }
-
- @Override
- public void addRelationType(ViewId id) {
- relationTypes.add(id);
- }
-
- @Override
- public void clearRelations() {
- rightRelations.clear();
- leftRelations.clear();
- }
-
- @Override
- public void addLeftRelated(ViewArtifact id) {
- if (id != null) {
- leftRelations.add(id);
- }
- }
-
- @Override
- public void addRightRelated(ViewArtifact id) {
- if (id != null) {
- rightRelations.add(id);
- }
- }
-
- @Override
- public void setLeftName(String name) {
- leftName = name;
- }
-
- @Override
- public void setRightName(String name) {
- rightName = name;
- }
-
-} \ No newline at end of file
diff --git a/plugins/org.eclipse.osee.display.presenter.mocks/src/org/eclipse/osee/display/presenter/mocks/MockSearchHeaderComponent.java b/plugins/org.eclipse.osee.display.presenter.mocks/src/org/eclipse/osee/display/presenter/mocks/MockSearchHeaderComponent.java
deleted file mode 100644
index 58705ef1fe..0000000000
--- a/plugins/org.eclipse.osee.display.presenter.mocks/src/org/eclipse/osee/display/presenter/mocks/MockSearchHeaderComponent.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*******************************************************************************
- * 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.presenter.mocks;
-
-import org.eclipse.osee.display.api.components.SearchHeaderComponent;
-
-/**
- * @author John R. Misinco
- */
-public class MockSearchHeaderComponent implements SearchHeaderComponent {
-
- private boolean clearAllCalled = false;
- private String errorMessage;
-
- public boolean isClearAllCalled() {
- return clearAllCalled;
- }
-
- public String getErrorMessage() {
- return errorMessage;
- }
-
- @Override
- public void setErrorMessage(String shortMsg, String longMsg, MsgType msgType) {
- errorMessage = shortMsg;
- }
-
- @Override
- public void clearAll() {
- clearAllCalled = true;
- }
-
-} \ No newline at end of file
diff --git a/plugins/org.eclipse.osee.display.presenter.mocks/src/org/eclipse/osee/display/presenter/mocks/MockSearchNavigator.java b/plugins/org.eclipse.osee.display.presenter.mocks/src/org/eclipse/osee/display/presenter/mocks/MockSearchNavigator.java
deleted file mode 100644
index 38f1de5e10..0000000000
--- a/plugins/org.eclipse.osee.display.presenter.mocks/src/org/eclipse/osee/display/presenter/mocks/MockSearchNavigator.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*******************************************************************************
- * 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.presenter.mocks;
-
-import org.eclipse.osee.display.api.search.SearchNavigator;
-
-/**
- * @author John R. Misinco
- */
-public class MockSearchNavigator implements SearchNavigator {
- private String resultsUrl, artifactUrl;
-
- public String getResultsUrl() {
- return resultsUrl;
- }
-
- public String getArtifactUrl() {
- return artifactUrl;
- }
-
- @Override
- public void navigateSearchResults(String url) {
- resultsUrl = url;
- }
-
- @Override
- public void navigateArtifactPage(String url) {
- artifactUrl = url;
- }
-
-} \ No newline at end of file
diff --git a/plugins/org.eclipse.osee.display.presenter.mocks/src/org/eclipse/osee/display/presenter/mocks/MockSearchPresenter.java b/plugins/org.eclipse.osee.display.presenter.mocks/src/org/eclipse/osee/display/presenter/mocks/MockSearchPresenter.java
deleted file mode 100644
index 0a7ad70938..0000000000
--- a/plugins/org.eclipse.osee.display.presenter.mocks/src/org/eclipse/osee/display/presenter/mocks/MockSearchPresenter.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) October 21, 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.presenter.mocks;
-
-import org.eclipse.osee.display.api.components.SearchHeaderComponent;
-import org.eclipse.osee.display.api.data.ViewSearchParameters;
-import org.eclipse.osee.display.api.search.SearchNavigator;
-import org.eclipse.osee.display.api.search.SearchPresenter;
-import org.eclipse.osee.display.presenter.SearchProgressListenerImpl;
-
-/**
- * @author Shawn F. Cook
- */
-public abstract class MockSearchPresenter<T extends SearchHeaderComponent, K extends ViewSearchParameters> extends SearchProgressListenerImpl implements SearchPresenter<T, K> {
-
- @Override
- public void selectSearch(String url, ViewSearchParameters params, SearchNavigator atsNavigator) {
- System.out.println("");
- }
-}
diff --git a/plugins/org.eclipse.osee.display.presenter.mocks/src/org/eclipse/osee/display/presenter/mocks/MockSearchResultComponent.java b/plugins/org.eclipse.osee.display.presenter.mocks/src/org/eclipse/osee/display/presenter/mocks/MockSearchResultComponent.java
deleted file mode 100644
index c7aa797839..0000000000
--- a/plugins/org.eclipse.osee.display.presenter.mocks/src/org/eclipse/osee/display/presenter/mocks/MockSearchResultComponent.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*******************************************************************************
- * 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.presenter.mocks;
-
-import java.util.ArrayList;
-import java.util.List;
-import org.eclipse.osee.display.api.components.SearchResultComponent;
-import org.eclipse.osee.display.api.data.DisplayOptions;
-import org.eclipse.osee.display.api.data.SearchResultMatch;
-import org.eclipse.osee.display.api.data.ViewArtifact;
-
-/**
- * @author John R. Misinco
- */
-public class MockSearchResultComponent implements SearchResultComponent {
-
- private ViewArtifact artifact;
- private final List<SearchResultMatch> matches = new ArrayList<SearchResultMatch>();
-
- public ViewArtifact getArtifact() {
- return artifact;
- }
-
- public List<SearchResultMatch> getMatches() {
- return matches;
- }
-
- @Override
- public void setArtifact(ViewArtifact artifact) {
- this.artifact = artifact;
- }
-
- @Override
- public void addSearchResultMatch(SearchResultMatch match) {
- this.matches.add(match);
- }
-
- @Override
- public void setErrorMessage(String shortMsg, String longMsg, MsgType msgType) {
- // do nothing
- }
-
- @Override
- public void setDisplayOptions(DisplayOptions options) {
- // do nothing
- }
-} \ No newline at end of file
diff --git a/plugins/org.eclipse.osee.display.presenter.mocks/src/org/eclipse/osee/display/presenter/mocks/MockSearchResultsListComponent.java b/plugins/org.eclipse.osee.display.presenter.mocks/src/org/eclipse/osee/display/presenter/mocks/MockSearchResultsListComponent.java
deleted file mode 100644
index 246fbe68b8..0000000000
--- a/plugins/org.eclipse.osee.display.presenter.mocks/src/org/eclipse/osee/display/presenter/mocks/MockSearchResultsListComponent.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*******************************************************************************
- * 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.presenter.mocks;
-
-import java.util.LinkedList;
-import java.util.List;
-import org.eclipse.osee.display.api.components.SearchResultComponent;
-import org.eclipse.osee.display.api.components.SearchResultsListComponent;
-
-/**
- * @author John R. Misinco
- */
-public class MockSearchResultsListComponent implements SearchResultsListComponent {
-
- private boolean clearAllCalled = false;
- private String errorMessage;
- private final List<MockSearchResultComponent> searchResults = new LinkedList<MockSearchResultComponent>();
-
- public boolean isClearAllCalled() {
- return clearAllCalled;
- }
-
- public String getErrorMessage() {
- return errorMessage;
- }
-
- public List<MockSearchResultComponent> getSearchResults() {
- return searchResults;
- }
-
- @Override
- public void clearAll() {
- clearAllCalled = true;
- }
-
- @Override
- public SearchResultComponent createSearchResult() {
- MockSearchResultComponent toReturn = new MockSearchResultComponent();
- searchResults.add(toReturn);
- return toReturn;
- }
-
- @Override
- public void setErrorMessage(String shortMsg, String longMsg, MsgType msgType) {
- errorMessage = shortMsg;
- }
-
- @Override
- public void noSearchResultsFound() {
- // do nothing
- }
-
-} \ No newline at end of file
diff --git a/plugins/org.eclipse.osee.display.presenter.test/.classpath b/plugins/org.eclipse.osee.display.presenter.test/.classpath
deleted file mode 100644
index ad32c83a78..0000000000
--- a/plugins/org.eclipse.osee.display.presenter.test/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/org.eclipse.osee.display.presenter.test/.project b/plugins/org.eclipse.osee.display.presenter.test/.project
deleted file mode 100644
index c3e2154bf1..0000000000
--- a/plugins/org.eclipse.osee.display.presenter.test/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.osee.display.presenter.test</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/plugins/org.eclipse.osee.display.presenter.test/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.display.presenter.test/META-INF/MANIFEST.MF
deleted file mode 100644
index d66edff2a8..0000000000
--- a/plugins/org.eclipse.osee.display.presenter.test/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,17 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Display Presenter Test
-Bundle-SymbolicName: org.eclipse.osee.display.presenter.test
-Bundle-Version: 0.17.0.qualifier
-Fragment-Host: org.eclipse.osee.display.presenter
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Bundle-Vendor: Eclipse Open System Engineering Environment
-Import-Package: org.eclipse.osee.display.api.components,
- org.eclipse.osee.display.api.data,
- org.eclipse.osee.display.api.search,
- org.eclipse.osee.display.presenter.mocks,
- org.eclipse.osee.framework.jdk.core.type,
- org.eclipse.osee.framework.jdk.core.util,
- org.junit;version="4.8.2",
- org.junit.runner;version="4.8.2",
- org.junit.runners;version="4.8.2"
diff --git a/plugins/org.eclipse.osee.display.presenter.test/build.properties b/plugins/org.eclipse.osee.display.presenter.test/build.properties
deleted file mode 100644
index 34d2e4d2da..0000000000
--- a/plugins/org.eclipse.osee.display.presenter.test/build.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
- .
diff --git a/plugins/org.eclipse.osee.display.presenter.test/pom.xml b/plugins/org.eclipse.osee.display.presenter.test/pom.xml
deleted file mode 100644
index d187e285f3..0000000000
--- a/plugins/org.eclipse.osee.display.presenter.test/pom.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.eclipse.osee</groupId>
- <artifactId>org.eclipse.osee.x.ats.parent</artifactId>
- <version>0.17.0-SNAPSHOT</version>
- <relativePath>../../plugins/org.eclipse.osee.x.ats.parent</relativePath>
- </parent>
-
- <artifactId>org.eclipse.osee.display.presenter.test</artifactId>
- <packaging>eclipse-test-plugin</packaging>
- <name>OSEE Display Presenter Test - (Incubation)</name>
-
- <build>
- <!-- workaround for https://issues.sonatype.org/browse/TYCHO-168 -->
- <!-- <resources> <resource> <directory>src</directory> <excludes> <exclude>**/*.java</exclude>
- </excludes> </resource> </resources> -->
- <plugins>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-source-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-surefire-plugin</artifactId>
- <version>${tycho-version}</version>
- <configuration>
- <testSuite>org.eclipse.osee.display.presenter.test</testSuite>
- <testClass>org.eclipse.osee.display.presenter.SearchPresenterTestSuite</testClass>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project> \ No newline at end of file
diff --git a/plugins/org.eclipse.osee.display.presenter.test/src/org/eclipse/osee/display/presenter/SearchPresenterTestSuite.java b/plugins/org.eclipse.osee.display.presenter.test/src/org/eclipse/osee/display/presenter/SearchPresenterTestSuite.java
deleted file mode 100644
index aba7f49c57..0000000000
--- a/plugins/org.eclipse.osee.display.presenter.test/src/org/eclipse/osee/display/presenter/SearchPresenterTestSuite.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*******************************************************************************
- * 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.presenter;
-
-import org.eclipse.osee.display.presenter.internal.SearchPresenterTest;
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
-
-@RunWith(Suite.class)
-@Suite.SuiteClasses({SearchPresenterTest.class, UtilityTest.class})
-/**
- * @author John R. Misinco
- */
-public class SearchPresenterTestSuite {
- //Test Suite class
-}
diff --git a/plugins/org.eclipse.osee.display.presenter.test/src/org/eclipse/osee/display/presenter/UtilityTest.java b/plugins/org.eclipse.osee.display.presenter.test/src/org/eclipse/osee/display/presenter/UtilityTest.java
deleted file mode 100644
index 6929745574..0000000000
--- a/plugins/org.eclipse.osee.display.presenter.test/src/org/eclipse/osee/display/presenter/UtilityTest.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*******************************************************************************
- * 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.presenter;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import org.eclipse.osee.display.api.data.StyledText;
-import org.eclipse.osee.framework.jdk.core.type.MatchLocation;
-import org.junit.Assert;
-import org.junit.Test;
-
-/**
- * Test Case for {@link Utility}
- *
- * @author Roberto E. Escobar
- */
-public class UtilityTest {
-
- @Test
- public void testGetMatchedTextInner() {
- List<MatchLocation> matches = new ArrayList<MatchLocation>();
- matches.add(new MatchLocation(5, 8));
- matches.add(new MatchLocation(12, 14));
-
- List<StyledText> actual = Utility.getMatchedText("Software Requirements", matches);
- Assert.assertEquals(5, actual.size());
- Iterator<StyledText> iterator = actual.iterator();
- checkText(iterator.next(), "Soft", false);
- checkText(iterator.next(), "ware", true);
- checkText(iterator.next(), " Re", false);
- checkText(iterator.next(), "qui", true);
- checkText(iterator.next(), "rements", false);
- }
-
- @Test
- public void testGetMatchedTextOuter() {
- List<MatchLocation> matches = new ArrayList<MatchLocation>();
- matches.add(new MatchLocation(0, 4));
- matches.add(new MatchLocation(17, 21));
-
- List<StyledText> actual = Utility.getMatchedText("Software Requirements", matches);
- Assert.assertEquals(3, actual.size());
- Iterator<StyledText> iterator = actual.iterator();
- checkText(iterator.next(), "Soft", true);
- checkText(iterator.next(), "ware Require", false);
- checkText(iterator.next(), "ments", true);
- }
-
- private static void checkText(StyledText text, String expected, boolean isHighlighted) {
- Assert.assertEquals(expected, text.getData());
- Assert.assertEquals(isHighlighted, text.isHighLighted());
- }
-}
diff --git a/plugins/org.eclipse.osee.display.presenter.test/src/org/eclipse/osee/display/presenter/internal/SearchPresenterTest.java b/plugins/org.eclipse.osee.display.presenter.test/src/org/eclipse/osee/display/presenter/internal/SearchPresenterTest.java
deleted file mode 100644
index 57139e7aca..0000000000
--- a/plugins/org.eclipse.osee.display.presenter.test/src/org/eclipse/osee/display/presenter/internal/SearchPresenterTest.java
+++ /dev/null
@@ -1,316 +0,0 @@
-/*******************************************************************************
- * 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.presenter.internal;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import org.eclipse.osee.display.api.components.SearchHeaderComponent;
-import org.eclipse.osee.display.api.data.ViewArtifact;
-import org.eclipse.osee.display.api.data.ViewId;
-import org.eclipse.osee.display.api.data.ViewSearchParameters;
-import org.eclipse.osee.display.api.search.ArtifactProvider;
-import org.eclipse.osee.display.api.search.AsyncSearchListener;
-import org.eclipse.osee.display.presenter.SearchPresenterImpl;
-import org.eclipse.osee.display.presenter.mocks.MockArtifact;
-import org.eclipse.osee.display.presenter.mocks.MockArtifactHeaderComponent;
-import org.eclipse.osee.display.presenter.mocks.MockArtifactProvider;
-import org.eclipse.osee.display.presenter.mocks.MockAttribute;
-import org.eclipse.osee.display.presenter.mocks.MockAttributeComponent;
-import org.eclipse.osee.display.presenter.mocks.MockDisplayOptionsComponent;
-import org.eclipse.osee.display.presenter.mocks.MockLogger;
-import org.eclipse.osee.display.presenter.mocks.MockMatch;
-import org.eclipse.osee.display.presenter.mocks.MockRelationComponent;
-import org.eclipse.osee.display.presenter.mocks.MockSearchHeaderComponent;
-import org.eclipse.osee.display.presenter.mocks.MockSearchNavigator;
-import org.eclipse.osee.display.presenter.mocks.MockSearchResultComponent;
-import org.eclipse.osee.display.presenter.mocks.MockSearchResultsListComponent;
-import org.eclipse.osee.framework.core.data.IArtifactToken;
-import org.eclipse.osee.framework.core.data.IOseeBranch;
-import org.eclipse.osee.framework.core.data.IRelationType;
-import org.eclipse.osee.framework.core.data.IRelationTypeSide;
-import org.eclipse.osee.framework.core.enums.CoreArtifactTypes;
-import org.eclipse.osee.framework.core.enums.CoreAttributeTypes;
-import org.eclipse.osee.framework.core.enums.CoreBranches;
-import org.eclipse.osee.framework.core.enums.CoreRelationTypes;
-import org.eclipse.osee.framework.core.enums.RelationTypeMultiplicity;
-import org.eclipse.osee.framework.core.model.type.RelationType;
-import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
-import org.eclipse.osee.framework.jdk.core.type.ResultSet;
-import org.eclipse.osee.framework.jdk.core.util.GUID;
-import org.eclipse.osee.framework.jdk.core.util.Lib;
-import org.eclipse.osee.framework.jdk.core.util.UrlQuery;
-import org.eclipse.osee.orcs.data.ArtifactReadable;
-import org.eclipse.osee.orcs.data.AttributeReadable;
-import org.eclipse.osee.orcs.search.Match;
-import org.junit.Assert;
-import org.junit.Test;
-
-/**
- * @author John R. Misinco
- */
-public class SearchPresenterTest {
-
- @SuppressWarnings({"rawtypes", "unchecked"})
- private List<Match<ArtifactReadable, AttributeReadable<?>>> getSearchResults() {
- List<Match<ArtifactReadable, AttributeReadable<?>>> toReturn =
- new ArrayList<Match<ArtifactReadable, AttributeReadable<?>>>();
- MockArtifact art = new MockArtifact("guid1", "matchArt");
- MockAttribute attr = new MockAttribute(CoreAttributeTypes.Name, "matchArt");
- Match match = new MockMatch(art, attr);
- toReturn.add(match);
- return toReturn;
- }
-
- @Test
- public void testInitSearchResults() {
- MockArtifactProvider provider = new MockArtifactProvider();
- MockDisplayOptionsComponent optionsComp = new MockDisplayOptionsComponent();
- provider.setResultList(getSearchResults());
- SearchPresenterImpl<SearchHeaderComponent, ViewSearchParameters> presenter =
- new SearchPresenterImpl<SearchHeaderComponent, ViewSearchParameters>(provider, new MockLogger());
- MockSearchHeaderComponent searchHeaderComp = new MockSearchHeaderComponent();
- MockSearchResultsListComponent searchResultsComp = new MockSearchResultsListComponent();
- String url =
- "/" + new UrlQuery().put("branch", CoreBranches.COMMON.getGuid()).put("nameOnly", "true").put("search",
- "this is a test").toString();
-
- presenter.initSearchResults(url, searchHeaderComp, searchResultsComp, optionsComp);
- List<MockSearchResultComponent> searchResults = searchResultsComp.getSearchResults();
- Assert.assertEquals(1, searchResults.size());
- }
-
- @Test
- public void testInitSearchResultsErrors() {
- SearchPresenterImpl<SearchHeaderComponent, ViewSearchParameters> presenter =
- new SearchPresenterImpl<SearchHeaderComponent, ViewSearchParameters>(null, new MockLogger());
- MockSearchHeaderComponent searchHeaderComp = new MockSearchHeaderComponent();
- MockDisplayOptionsComponent optionsComp = new MockDisplayOptionsComponent();
- MockSearchResultsListComponent searchResultsComp = new MockSearchResultsListComponent();
-
- ExceptionArtifactProvider provider = new ExceptionArtifactProvider();
- presenter = new SearchPresenterImpl<SearchHeaderComponent, ViewSearchParameters>(provider, new MockLogger());
- searchHeaderComp = new MockSearchHeaderComponent();
- searchResultsComp = new MockSearchResultsListComponent();
-
- String url =
- "/" + new UrlQuery().put("branch", CoreBranches.COMMON.getGuid()).put("nameOnly", "true").put("search",
- "this is a test").toString();
-
- presenter.initSearchResults(url, searchHeaderComp, searchResultsComp, optionsComp);
- Assert.assertNotNull(searchResultsComp.getErrorMessage());
- }
-
- @Test
- public void testSelectArtifact() {
- MockSearchNavigator navigator = new MockSearchNavigator();
- SearchPresenterImpl<SearchHeaderComponent, ViewSearchParameters> presenter =
- new SearchPresenterImpl<SearchHeaderComponent, ViewSearchParameters>(null, new MockLogger());
- String branchGuid = GUID.create();
- String artGuid = GUID.create();
- ViewArtifact artifact = new ViewArtifact(artGuid, "name", "type", null, new ViewId(branchGuid, "branchName"));
- presenter.selectArtifact("", artifact, navigator);
-
- String expectedUrl = "/" + new UrlQuery().put("artifact", artGuid).put("branch", branchGuid).toString();
-
- Assert.assertEquals(expectedUrl, navigator.getArtifactUrl());
- }
-
- @Test
- public void testInitArtifactPage() {
- MockArtifactProvider provider = new MockArtifactProvider();
- MockDisplayOptionsComponent optionsComp = new MockDisplayOptionsComponent();
- provider.setResultList(getSearchResults());
- SearchPresenterImpl<SearchHeaderComponent, ViewSearchParameters> presenter =
- new SearchPresenterImpl<SearchHeaderComponent, ViewSearchParameters>(provider, new MockLogger());
- String artGuid = GUID.create();
- MockArtifact testArt = new MockArtifact(artGuid, "name");
- RelationType relType =
- new RelationType(0L, "typeName", "sideA", "sideB", CoreArtifactTypes.AbstractSoftwareRequirement,
- CoreArtifactTypes.AbstractTestResult, RelationTypeMultiplicity.ONE_TO_ONE, "");
- testArt.addRelationType(relType);
- provider.addArtifact(testArt);
-
- String url =
- "/" + new UrlQuery().put("branch", CoreBranches.COMMON.getGuid()).put("artifact", artGuid).toString();
-
- MockSearchHeaderComponent searchHeaderComp = new MockSearchHeaderComponent();
- MockArtifactHeaderComponent artHeaderComp = new MockArtifactHeaderComponent();
- MockRelationComponent relComp = new MockRelationComponent();
- MockAttributeComponent attrComp = new MockAttributeComponent();
- presenter.initArtifactPage(url, searchHeaderComp, artHeaderComp, relComp, attrComp, optionsComp);
-
- ViewArtifact artifact = artHeaderComp.getArtifact();
- Assert.assertNotNull(artifact);
- Assert.assertEquals(artGuid, artifact.getGuid());
- Assert.assertEquals(1, relComp.getRelationTypes().size());
- Assert.assertEquals(1, attrComp.getAttributes().keySet().size());
-
- provider = new MockArtifactProvider();
- presenter = new SearchPresenterImpl<SearchHeaderComponent, ViewSearchParameters>(provider, new MockLogger());
- presenter.initArtifactPage(url, searchHeaderComp, artHeaderComp, relComp, attrComp, optionsComp);
- Assert.assertNotNull(artHeaderComp.getErrorMessage());
- }
-
- @Test
- public void testInitArtifactPageErrors() {
- String url = "badUrl";
- SearchPresenterImpl<SearchHeaderComponent, ViewSearchParameters> presenter =
- new SearchPresenterImpl<SearchHeaderComponent, ViewSearchParameters>(new MockArtifactProvider(),
- new MockLogger());
-
- MockSearchHeaderComponent searchHeaderComp = new MockSearchHeaderComponent();
- MockArtifactHeaderComponent artHeaderComp = new MockArtifactHeaderComponent();
- MockDisplayOptionsComponent optionsComp = new MockDisplayOptionsComponent();
- MockRelationComponent relComp = new MockRelationComponent();
- MockAttributeComponent attrComp = new MockAttributeComponent();
- presenter.initArtifactPage(url, searchHeaderComp, artHeaderComp, relComp, attrComp, optionsComp);
- Assert.assertNotNull(artHeaderComp.getErrorMessage());
-
- url = "/" + new UrlQuery().put("branch", CoreBranches.COMMON.getGuid()).put("artifact", GUID.create()).toString();
-
- ExceptionArtifactProvider provider = new ExceptionArtifactProvider();
- presenter = new SearchPresenterImpl<SearchHeaderComponent, ViewSearchParameters>(provider, new MockLogger());
- searchHeaderComp = new MockSearchHeaderComponent();
- artHeaderComp = new MockArtifactHeaderComponent();
- relComp = new MockRelationComponent();
- attrComp = new MockAttributeComponent();
- presenter.initArtifactPage(url, searchHeaderComp, artHeaderComp, relComp, attrComp, optionsComp);
- Assert.assertNotNull(artHeaderComp.getErrorMessage());
- }
-
- @Test
- public void testSelectRelationType() {
- MockArtifactProvider provider = new MockArtifactProvider();
- MockRelationComponent relComp = new MockRelationComponent();
-
- provider.setResultList(getSearchResults());
- SearchPresenterImpl<SearchHeaderComponent, ViewSearchParameters> presenter =
- new SearchPresenterImpl<SearchHeaderComponent, ViewSearchParameters>(provider, new MockLogger());
- String artGuid = GUID.create();
- String artGuidA = GUID.create();
- String artGuidB = GUID.create();
-
- MockArtifact testArt = new MockArtifact(artGuid, "name");
- long relGuid = CoreRelationTypes.Allocation__Component.getGuid();
- String relName = CoreRelationTypes.Allocation__Component.getName();
- RelationType relType =
- new RelationType(relGuid, relName, "sideA", "sideB", CoreArtifactTypes.AbstractSoftwareRequirement,
- CoreArtifactTypes.AbstractTestResult, RelationTypeMultiplicity.ONE_TO_ONE, "");
- testArt.addRelationType(relType);
-
- provider.addArtifact(testArt);
-
- ViewId branch = new ViewId(String.valueOf(Lib.generateUuid()), "branchName");
- ViewArtifact artifact = new ViewArtifact(artGuid, "artName", "artType", null, branch);
- ViewId relation = new ViewId(Long.toString(relGuid), relName);
- presenter.selectRelationType(artifact, relation, relComp);
- Assert.assertEquals(0, relComp.getLeftRelations().size());
- Assert.assertEquals(0, relComp.getRightRelations().size());
-
- MockArtifact relatedArtA = new MockArtifact(artGuidA, "related");
- testArt.addRelation(CoreRelationTypes.Allocation__Requirement, relatedArtA);
- presenter.selectRelationType(artifact, relation, relComp);
- Assert.assertEquals(1, relComp.getLeftRelations().size());
- Assert.assertEquals(0, relComp.getRightRelations().size());
-
- MockArtifact relatedArtB = new MockArtifact(artGuidB, "related");
- testArt.addRelation(CoreRelationTypes.Allocation__Component, relatedArtB);
- presenter.selectRelationType(artifact, relation, relComp);
- Assert.assertEquals(1, relComp.getLeftRelations().size());
- Assert.assertEquals(1, relComp.getRightRelations().size());
-
- testArt.clearRelations();
- testArt.addRelationType(relType);
- testArt.addRelation(CoreRelationTypes.Allocation__Component, relatedArtB);
- presenter.selectRelationType(artifact, relation, relComp);
- Assert.assertEquals(0, relComp.getLeftRelations().size());
- Assert.assertEquals(1, relComp.getRightRelations().size());
-
- }
-
- @Test
- public void testSelectRelationTypeErrors() {
- SearchPresenterImpl<SearchHeaderComponent, ViewSearchParameters> presenter =
- new SearchPresenterImpl<SearchHeaderComponent, ViewSearchParameters>(null, new MockLogger());
- MockRelationComponent relComp = new MockRelationComponent();
- ViewId relation = new ViewId("0", "Name");
- presenter.selectRelationType(null, relation, relComp);
- Assert.assertNotNull(relComp.getErrorMessage());
-
- relComp = new MockRelationComponent();
- ViewArtifact artifact =
- new ViewArtifact(GUID.create(), "name", "type", null, new ViewId(String.valueOf(Lib.generateUuid()),
- "branchName"));
- presenter.selectRelationType(artifact, null, relComp);
- Assert.assertNotNull(relComp.getErrorMessage());
-
- ExceptionArtifactProvider provider = new ExceptionArtifactProvider();
- relComp = new MockRelationComponent();
- presenter = new SearchPresenterImpl<SearchHeaderComponent, ViewSearchParameters>(provider, new MockLogger());
- presenter.selectRelationType(artifact, relation, relComp);
- Assert.assertNotNull(relComp.getErrorMessage());
- }
-
- private class ExceptionArtifactProvider implements ArtifactProvider {
-
- @Override
- public ArtifactReadable getArtifactByArtifactToken(IOseeBranch branch, IArtifactToken token) throws OseeCoreException {
- throw new OseeCoreException("test");
- }
-
- @Override
- public ArtifactReadable getArtifactByGuid(IOseeBranch branch, String guid) throws OseeCoreException {
- throw new OseeCoreException("test");
- }
-
- @Override
- public ResultSet<ArtifactReadable> getRelatedArtifacts(ArtifactReadable art, IRelationTypeSide relationTypeSide) throws OseeCoreException {
- throw new OseeCoreException("test");
- }
-
- @Override
- public ArtifactReadable getRelatedArtifact(ArtifactReadable art, IRelationTypeSide relationTypeSide) throws OseeCoreException {
- throw new OseeCoreException("test");
- }
-
- @Override
- public ArtifactReadable getParent(ArtifactReadable art) throws OseeCoreException {
- throw new OseeCoreException("test");
- }
-
- @Override
- public Collection<? extends IRelationType> getValidRelationTypes(ArtifactReadable art) throws OseeCoreException {
- throw new OseeCoreException("test");
- }
-
- @Override
- public void getSearchResults(IOseeBranch branch, boolean nameOnly, String searchPhrase, AsyncSearchListener callback) throws OseeCoreException {
- throw new OseeCoreException("test");
- }
-
- @Override
- public void cancelSearch() {
- // do nothing
- }
-
- @Override
- public String getSideAName(IRelationType type) throws OseeCoreException {
- throw new OseeCoreException("test");
- }
-
- @Override
- public String getSideBName(IRelationType type) throws OseeCoreException {
- throw new OseeCoreException("test");
- }
-
- }
-}
diff --git a/plugins/org.eclipse.osee.display.presenter/.classpath b/plugins/org.eclipse.osee.display.presenter/.classpath
deleted file mode 100644
index ad32c83a78..0000000000
--- a/plugins/org.eclipse.osee.display.presenter/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/org.eclipse.osee.display.presenter/.project b/plugins/org.eclipse.osee.display.presenter/.project
deleted file mode 100644
index 98adb3fd5f..0000000000
--- a/plugins/org.eclipse.osee.display.presenter/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.osee.display.presenter</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/plugins/org.eclipse.osee.display.presenter/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.display.presenter/META-INF/MANIFEST.MF
deleted file mode 100644
index f0ee6a13aa..0000000000
--- a/plugins/org.eclipse.osee.display.presenter/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,27 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Osee Display Presenter
-Bundle-SymbolicName: org.eclipse.osee.display.presenter
-Bundle-Version: 0.17.0.qualifier
-Bundle-Vendor: Eclipse Open System Engineering Environment
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: com.google.common.collect,
- org.eclipse.osee.display.api,
- org.eclipse.osee.display.api.components,
- org.eclipse.osee.display.api.data,
- org.eclipse.osee.display.api.search,
- org.eclipse.osee.executor.admin,
- org.eclipse.osee.framework.core.data,
- org.eclipse.osee.framework.core.enums,
- org.eclipse.osee.framework.core.exception,
- org.eclipse.osee.framework.core.model,
- org.eclipse.osee.framework.core.model.type,
- org.eclipse.osee.framework.jdk.core.type,
- org.eclipse.osee.framework.jdk.core.util,
- org.eclipse.osee.logger,
- org.eclipse.osee.mail,
- org.eclipse.osee.orcs,
- org.eclipse.osee.orcs.data,
- org.eclipse.osee.orcs.search,
- org.eclipse.osee.orcs.utility
-Export-Package: org.eclipse.osee.display.presenter
diff --git a/plugins/org.eclipse.osee.display.presenter/build.properties b/plugins/org.eclipse.osee.display.presenter/build.properties
deleted file mode 100644
index 34d2e4d2da..0000000000
--- a/plugins/org.eclipse.osee.display.presenter/build.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
- .
diff --git a/plugins/org.eclipse.osee.display.presenter/pom.xml b/plugins/org.eclipse.osee.display.presenter/pom.xml
deleted file mode 100644
index 0cb6c3c2b4..0000000000
--- a/plugins/org.eclipse.osee.display.presenter/pom.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.eclipse.osee</groupId>
- <artifactId>org.eclipse.osee.x.ats.parent</artifactId>
- <version>0.17.0-SNAPSHOT</version>
- <relativePath>../../plugins/org.eclipse.osee.x.ats.parent</relativePath>
- </parent>
-
- <artifactId>org.eclipse.osee.display.presenter</artifactId>
- <packaging>eclipse-plugin</packaging>
- <name>OSEE Display Presenter - (Incubation)</name>
-
- <build>
- <!-- workaround for https://issues.sonatype.org/browse/TYCHO-168 -->
- <resources>
- <resource>
- <directory>src</directory>
- <excludes>
- <exclude>**/*.java</exclude>
- </excludes>
- </resource>
- </resources>
- <plugins>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-source-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
-</project> \ No newline at end of file
diff --git a/plugins/org.eclipse.osee.display.presenter/src/org/eclipse/osee/display/presenter/ArtifactFilter.java b/plugins/org.eclipse.osee.display.presenter/src/org/eclipse/osee/display/presenter/ArtifactFilter.java
deleted file mode 100644
index 10f7e77446..0000000000
--- a/plugins/org.eclipse.osee.display.presenter/src/org/eclipse/osee/display/presenter/ArtifactFilter.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*******************************************************************************
- * 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.presenter;
-
-import java.util.Arrays;
-import java.util.List;
-import org.eclipse.osee.display.api.search.ArtifactProvider;
-import org.eclipse.osee.framework.core.data.IArtifactType;
-import org.eclipse.osee.framework.core.enums.CoreArtifactTypes;
-import org.eclipse.osee.framework.core.enums.CoreBranches;
-import org.eclipse.osee.framework.jdk.core.util.Filter;
-import org.eclipse.osee.orcs.data.ArtifactReadable;
-
-/**
- * @author John R. Misinco
- */
-public class ArtifactFilter implements Filter<ArtifactReadable> {
-
- private static final IArtifactType[] notAllowedTypes = {CoreArtifactTypes.TestRun};
-
- private static final IArtifactType[] allowedTypes = {
- CoreArtifactTypes.SoftwareRequirement,
- CoreArtifactTypes.SubsystemRequirementMSWord,
- CoreArtifactTypes.SystemRequirementMSWord,
- CoreArtifactTypes.IndirectSoftwareRequirement,
- CoreArtifactTypes.TestUnit};
-
- private boolean allTypesAllowed = false;
-
- private static final List<String> allowed = Arrays.asList("System Requirements", "Subsystem Requirements",
- "Software Requirements");
-
- private final ArtifactProvider provider;
-
- public ArtifactFilter(ArtifactProvider provider) {
- this.provider = provider;
- }
-
- public void setAllTypesAllowed(boolean allTypesAllowed) {
- this.allTypesAllowed = allTypesAllowed;
- }
-
- @Override
- public boolean accept(ArtifactReadable item) throws Exception {
- boolean isAllowed = false;
- if (allTypesAllowed) {
- isAllowed = true;
- } else if (item != null) {
- if (item.isOfType(allowedTypes) || item.getBranch().equals(CoreBranches.COMMON)) {
- isAllowed = true;
- } else if (!item.isOfType(notAllowedTypes)) {
- ArtifactReadable current = item;
- while (current != null) {
- if (allowed.contains(current.getName())) {
- isAllowed = true;
- break;
- }
- current = provider.getParent(current);
- }
- }
- }
- return isAllowed;
- }
-}
diff --git a/plugins/org.eclipse.osee.display.presenter/src/org/eclipse/osee/display/presenter/ArtifactProviderImpl.java b/plugins/org.eclipse.osee.display.presenter/src/org/eclipse/osee/display/presenter/ArtifactProviderImpl.java
deleted file mode 100644
index 4d93ce36cf..0000000000
--- a/plugins/org.eclipse.osee.display.presenter/src/org/eclipse/osee/display/presenter/ArtifactProviderImpl.java
+++ /dev/null
@@ -1,206 +0,0 @@
-/*******************************************************************************
- * 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.presenter;
-
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.concurrent.Callable;
-import java.util.concurrent.Future;
-import org.eclipse.osee.display.api.search.ArtifactProvider;
-import org.eclipse.osee.display.api.search.AsyncSearchListener;
-import org.eclipse.osee.display.presenter.internal.ArtifactProviderCache;
-import org.eclipse.osee.display.presenter.internal.FilteredArtifactCallable;
-import org.eclipse.osee.display.presenter.internal.FilteredResultSetCallable;
-import org.eclipse.osee.display.presenter.internal.SearchExecutionCallback;
-import org.eclipse.osee.display.presenter.internal.SearchParameters;
-import org.eclipse.osee.executor.admin.ExecutorAdmin;
-import org.eclipse.osee.executor.admin.PassThroughCallable;
-import org.eclipse.osee.framework.core.data.IArtifactToken;
-import org.eclipse.osee.framework.core.data.IAttributeType;
-import org.eclipse.osee.framework.core.data.IOseeBranch;
-import org.eclipse.osee.framework.core.data.IRelationType;
-import org.eclipse.osee.framework.core.data.IRelationTypeSide;
-import org.eclipse.osee.framework.core.enums.CaseType;
-import org.eclipse.osee.framework.core.enums.CoreAttributeTypes;
-import org.eclipse.osee.framework.core.enums.CoreRelationTypes;
-import org.eclipse.osee.framework.core.enums.MatchTokenCountType;
-import org.eclipse.osee.framework.core.enums.TokenDelimiterMatch;
-import org.eclipse.osee.framework.core.enums.TokenOrderType;
-import org.eclipse.osee.framework.core.exception.OseeExceptions;
-import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
-import org.eclipse.osee.framework.jdk.core.type.ResultSet;
-import org.eclipse.osee.framework.jdk.core.type.ResultSets;
-import org.eclipse.osee.logger.Log;
-import org.eclipse.osee.orcs.OrcsTypes;
-import org.eclipse.osee.orcs.data.ArtifactReadable;
-import org.eclipse.osee.orcs.data.AttributeReadable;
-import org.eclipse.osee.orcs.search.Match;
-import org.eclipse.osee.orcs.search.QueryBuilder;
-import org.eclipse.osee.orcs.search.QueryFactory;
-import com.google.common.collect.Lists;
-
-/**
- * @author John R. Misinco
- */
-public class ArtifactProviderImpl implements ArtifactProvider {
-
- private final Log logger;
- private final ExecutorAdmin executorAdmin;
- private final QueryFactory queryFactory;
-
- private final ArtifactProviderCache cache = new ArtifactProviderCache();
- private final ArtifactFilter filter = new ArtifactFilter(this);
- private final OrcsTypes orcsTypes;
-
- public ArtifactProviderImpl(Log logger, ExecutorAdmin executorAdmin, QueryFactory queryFactory, OrcsTypes orcsTypes) {
- this.logger = logger;
- this.executorAdmin = executorAdmin;
- this.queryFactory = queryFactory;
- this.orcsTypes = orcsTypes;
- }
-
- protected void setFilterAllTypesAllowed(boolean allTypesAllowed) {
- filter.setAllTypesAllowed(allTypesAllowed);
- }
-
- protected QueryFactory getFactory() {
- return queryFactory;
- }
-
- @Override
- public ArtifactReadable getArtifactByArtifactToken(IOseeBranch branch, IArtifactToken token) throws OseeCoreException {
- return getArtifactByGuid(branch, token.getGuid());
- }
-
- @Override
- public ArtifactReadable getArtifactByGuid(IOseeBranch branch, String guid) throws OseeCoreException {
- ArtifactReadable item =
- getFactory().fromBranch(branch).andGuids(Collections.singleton(guid)).getResults().getOneOrNull();
- try {
- if (!filter.accept(item)) {
- item = null;
- }
- } catch (Exception ex) {
- logger.error(ex, "Sanitization error");
- OseeExceptions.wrapAndThrow(ex);
- }
- return item;
- }
-
- @Override
- public void getSearchResults(IOseeBranch branch, boolean nameOnly, String searchPhrase, AsyncSearchListener callback) throws OseeCoreException {
- SearchParameters params = new SearchParameters(branch, nameOnly, searchPhrase);
-
- Callable<ResultSet<Match<ArtifactReadable, AttributeReadable<?>>>> callable =
- createSearchCallable(params, callback);
-
- SearchExecutionCallback providerCallback = new SearchExecutionCallback(cache, callback);
-
- Future<?> searchFuture = null;
- try {
- searchFuture = executorAdmin.schedule(callable, providerCallback);
- } catch (Exception ex) {
- OseeExceptions.wrapAndThrow(ex);
- }
- cache.clearSearchCache();
- cache.cacheSearch(params);
- cache.cacheSearchFuture(searchFuture);
- }
-
- private Callable<ResultSet<Match<ArtifactReadable, AttributeReadable<?>>>> createSearchCallable(SearchParameters params, AsyncSearchListener callback) throws OseeCoreException {
- Callable<ResultSet<Match<ArtifactReadable, AttributeReadable<?>>>> callable;
- if (cache.isSearchCached(params)) {
- callable =
- new PassThroughCallable<ResultSet<Match<ArtifactReadable, AttributeReadable<?>>>>(cache.getSearchResults());
- } else {
- IAttributeType type = params.isNameOnly() ? CoreAttributeTypes.Name : QueryBuilder.ANY_ATTRIBUTE_TYPE;
- QueryBuilder builder = getFactory().fromBranch(params.getBranch());
- builder.and(type, params.getSearchPhrase(), TokenDelimiterMatch.ANY, CaseType.IGNORE_CASE,
- TokenOrderType.ANY_ORDER, MatchTokenCountType.IGNORE_TOKEN_COUNT);
- callable = new FilteredResultSetCallable(executorAdmin, filter, builder.createSearchWithMatches());
- }
- return callable;
- }
-
- @Override
- public ResultSet<ArtifactReadable> getRelatedArtifacts(ArtifactReadable art, IRelationTypeSide relationTypeSide) throws OseeCoreException {
- final ResultSet<ArtifactReadable> artifacts = art.getRelated(relationTypeSide);
- List<ArtifactReadable> results = Collections.emptyList();
- try {
- FilteredArtifactCallable callable = new FilteredArtifactCallable(executorAdmin, filter, artifacts);
- Future<? extends Iterable<ArtifactReadable>> future = executorAdmin.schedule(callable);
- results = Utility.sort(future.get());
- } catch (Exception ex) {
- logger.error(ex, "Sanitization error");
- OseeExceptions.wrapAndThrow(ex);
- }
- return ResultSets.newResultSet(results);
- }
-
- @Override
- public ArtifactReadable getRelatedArtifact(ArtifactReadable art, IRelationTypeSide relationTypeSide) throws OseeCoreException {
- ArtifactReadable item = art.getRelated(relationTypeSide).getOneOrNull();
- try {
- if (!filter.accept(item)) {
- item = null;
- }
- } catch (Exception ex) {
- logger.error(ex, "Sanitization error");
- OseeExceptions.wrapAndThrow(ex);
- }
- return item;
- }
-
- @Override
- public ArtifactReadable getParent(ArtifactReadable art) throws OseeCoreException {
- ArtifactReadable parent = null;
- if (cache.isParentCached(art)) {
- parent = cache.getParent(art);
- } else {
- parent = getRelatedArtifact(art, CoreRelationTypes.Default_Hierarchical__Parent);
- cache.cacheParent(art, parent);
- }
- return parent;
- }
-
- @Override
- public Collection<? extends IRelationType> getValidRelationTypes(ArtifactReadable art) throws OseeCoreException {
- Collection<? extends IRelationType> existingRelationTypes = art.getExistingRelationTypes();
- Set<IRelationType> toReturn = new HashSet<IRelationType>();
- for (IRelationType type : existingRelationTypes) {
- toReturn.add(type);
- }
- List<? extends IRelationType> listToReturn = Lists.newLinkedList(toReturn);
- java.util.Collections.sort(listToReturn);
- return listToReturn;
- }
-
- @Override
- public String getSideAName(IRelationType type) throws OseeCoreException {
- return orcsTypes.getRelationTypes().getSideAName(type);
- }
-
- @Override
- public String getSideBName(IRelationType type) throws OseeCoreException {
- return orcsTypes.getRelationTypes().getSideBName(type);
- }
-
- @Override
- public void cancelSearch() {
- if (cache.isSearchInProgress()) {
- cache.getSearchFuture().cancel(true);
- }
- }
-
-}
diff --git a/plugins/org.eclipse.osee.display.presenter/src/org/eclipse/osee/display/presenter/AttributeTypeUtil.java b/plugins/org.eclipse.osee.display.presenter/src/org/eclipse/osee/display/presenter/AttributeTypeUtil.java
deleted file mode 100644
index 1a679f391c..0000000000
--- a/plugins/org.eclipse.osee.display.presenter/src/org/eclipse/osee/display/presenter/AttributeTypeUtil.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 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.presenter;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import org.eclipse.osee.framework.core.data.IAttributeType;
-import org.eclipse.osee.framework.core.enums.CoreAttributeTypes;
-import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
-import org.eclipse.osee.orcs.data.ArtifactReadable;
-
-/**
- * @author Roberto E. Escobar
- */
-public class AttributeTypeUtil {
-
- public static List<IAttributeType> getEmptyTypes(ArtifactReadable artifact) throws OseeCoreException {
- List<IAttributeType> items = new ArrayList<IAttributeType>();
- for (IAttributeType type : artifact.getExistingAttributeTypes()) {
- if (!CoreAttributeTypes.Name.equals(type) && artifact.getAttributeCount(type) == 0) {
- items.add(type);
- }
- }
- Collections.sort(items);
- return items;
- }
-
- public static List<IAttributeType> getTypesWithData(ArtifactReadable artifact) throws OseeCoreException {
- List<IAttributeType> items = new ArrayList<IAttributeType>();
-
- Collection<? extends IAttributeType> typesInExistence = artifact.getExistingAttributeTypes();
-
- IAttributeType nameType = null;
- IAttributeType annotations = null;
- IAttributeType relationOrder = null;
-
- for (IAttributeType type : typesInExistence) {
- if (CoreAttributeTypes.Name.equals(type)) {
- nameType = type;
- } else if (CoreAttributeTypes.Annotation.equals(type)) {
- annotations = type;
- } else if (CoreAttributeTypes.RelationOrder.equals(type)) {
- relationOrder = type;
- } else {
- items.add(type);
- }
- }
- Collections.sort(items);
- if (nameType != null) {
- items.add(0, nameType);
- }
- if (annotations != null) {
- items.add(annotations);
- }
- if (relationOrder != null) {
- // Skip relation order items
- // items.add(relationOrder);
- }
- return items;
- }
-} \ No newline at end of file
diff --git a/plugins/org.eclipse.osee.display.presenter/src/org/eclipse/osee/display/presenter/EmailPresenter.java b/plugins/org.eclipse.osee.display.presenter/src/org/eclipse/osee/display/presenter/EmailPresenter.java
deleted file mode 100644
index 13b96d8a3e..0000000000
--- a/plugins/org.eclipse.osee.display.presenter/src/org/eclipse/osee/display/presenter/EmailPresenter.java
+++ /dev/null
@@ -1,190 +0,0 @@
-/*******************************************************************************
- * 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.presenter;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import java.util.concurrent.Callable;
-import java.util.concurrent.Future;
-import java.util.concurrent.TimeUnit;
-import org.eclipse.osee.display.api.EmailView;
-import org.eclipse.osee.display.api.EmailView.EmailSendStatus;
-import org.eclipse.osee.display.api.EmailView.SendListener;
-import org.eclipse.osee.display.api.EmailView.Validator;
-import org.eclipse.osee.executor.admin.ExecutionCallback;
-import org.eclipse.osee.executor.admin.ExecutorAdmin;
-import org.eclipse.osee.framework.jdk.core.util.Lib;
-import org.eclipse.osee.logger.Log;
-import org.eclipse.osee.mail.MailMessage;
-import org.eclipse.osee.mail.MailService;
-import org.eclipse.osee.mail.MailUtils;
-import org.eclipse.osee.mail.SendMailStatus;
-
-/**
- * @author Roberto E. Escobar
- */
-public class EmailPresenter implements SendListener, Validator {
- private Log logger;
- private EmailView view;
- private MailService mailService;
- private ExecutorAdmin executorAdmin;
-
- private final List<Future<?>> futures = new ArrayList<Future<?>>();
-
- public EmailPresenter() {
- //
- }
-
- public Log getLogger() {
- return logger;
- }
-
- public void setLogger(Log logger) {
- this.logger = logger;
- }
-
- public void setView(EmailView view) {
- this.view = view;
- }
-
- public EmailView getView() {
- return view;
- }
-
- public void setMailService(MailService mailService) {
- this.mailService = mailService;
- }
-
- public MailService getMailService() {
- return mailService;
- }
-
- public void bind() {
- view.addEmailValidator(this);
- view.addOnSendListener(this);
- }
-
- public void setEmailBody(String body) {
- view.setBody(body);
- }
-
- public void setFrom(String email) {
- checkEmails(Collections.singleton(email));
- view.setFrom(email);
- }
-
- public void setReplyTo(Collection<String> emails) {
- checkEmails(emails);
- view.setReplyTo(emails);
- }
-
- public void setRecipients(Collection<String> emails) {
- checkEmails(emails);
- view.setRecipients(emails);
- }
-
- public void setSubject(String subject) {
- view.setSubject(subject);
- }
-
- public void setBody(String body) {
- view.setBody(body);
- }
-
- public String getMessage(String message, Object... args) {
- return String.format(message, args);
- }
-
- public void showNotification(String caption) {
- view.displayMessage(caption);
- }
-
- public void showNotification(String caption, String description) {
- view.displayMessage(caption, description);
- }
-
- public void cancelSendEmail() {
- if (!futures.isEmpty()) {
- for (Future<?> future : futures) {
- future.cancel(true);
- }
- }
- }
-
- public void sendEmail(MailMessage message) {
- List<Callable<SendMailStatus>> callables = getMailService().createSendCalls(3, TimeUnit.SECONDS, message);
- view.setEmailStatus(EmailSendStatus.SEND_IN_PROGRESS);
- view.displayMessage("Email", "Sending...");
- EmailExecutionCallback callback = new EmailExecutionCallback();
- for (Callable<SendMailStatus> callable : callables) {
- try {
- futures.add(executorAdmin.schedule(callable, callback));
- } catch (Exception ex) {
- getLogger().error(ex, "Error sending emails");
- }
- }
- }
-
- @Override
- public void onSend() {
- String from = view.getFrom();
- Collection<String> recepients = view.getRecipients();
- Collection<String> replyTos = view.getReplyTos();
- String subject = view.getSubject();
- String body = view.getBody();
-
- MailMessage message = new MailMessage();
- message.setFrom(from);
- message.setReplyTo(replyTos);
- message.setRecipients(recepients);
- message.setSubject(subject);
- message.addAttachment(MailUtils.createFromString(subject, body));
- sendEmail(message);
- }
-
- private void checkEmails(Collection<String> emails) {
- List<String> badEmails = new ArrayList<String>();
- for (String email : emails) {
- if (!accept(email)) {
- badEmails.add(email);
- }
- }
- }
-
- @Override
- public boolean accept(String toValidate) {
- return MailUtils.isValidEmail(toValidate);
- }
-
- private final class EmailExecutionCallback implements ExecutionCallback<SendMailStatus> {
-
- @Override
- public void onSuccess(SendMailStatus result) {
- view.setEmailStatus(EmailSendStatus.SUCCESS);
- futures.clear();
- }
-
- @Override
- public void onCancelled() {
- view.setEmailStatus(EmailSendStatus.CANCELLED);
- futures.clear();
- }
-
- @Override
- public void onFailure(Throwable throwable) {
- view.setEmailStatus(EmailSendStatus.FAILED);
- view.displayMessage("Email", getMessage("Error while sending email:\n%s", Lib.exceptionToString(throwable)));
- futures.clear();
- }
- }
-}
diff --git a/plugins/org.eclipse.osee.display.presenter/src/org/eclipse/osee/display/presenter/SearchPresenterImpl.java b/plugins/org.eclipse.osee.display.presenter/src/org/eclipse/osee/display/presenter/SearchPresenterImpl.java
deleted file mode 100644
index 707432a8b5..0000000000
--- a/plugins/org.eclipse.osee.display.presenter/src/org/eclipse/osee/display/presenter/SearchPresenterImpl.java
+++ /dev/null
@@ -1,473 +0,0 @@
-/*******************************************************************************
- * 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.presenter;
-
-import java.io.UnsupportedEncodingException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import org.eclipse.osee.display.api.components.ArtifactHeaderComponent;
-import org.eclipse.osee.display.api.components.AttributeComponent;
-import org.eclipse.osee.display.api.components.DisplayOptionsComponent;
-import org.eclipse.osee.display.api.components.DisplaysErrorComponent;
-import org.eclipse.osee.display.api.components.DisplaysErrorComponent.MsgType;
-import org.eclipse.osee.display.api.components.RelationComponent;
-import org.eclipse.osee.display.api.components.SearchHeaderComponent;
-import org.eclipse.osee.display.api.components.SearchResultComponent;
-import org.eclipse.osee.display.api.components.SearchResultsListComponent;
-import org.eclipse.osee.display.api.data.DisplayOptions;
-import org.eclipse.osee.display.api.data.SearchResultMatch;
-import org.eclipse.osee.display.api.data.StyledText;
-import org.eclipse.osee.display.api.data.ViewArtifact;
-import org.eclipse.osee.display.api.data.ViewId;
-import org.eclipse.osee.display.api.data.ViewSearchParameters;
-import org.eclipse.osee.display.api.search.ArtifactProvider;
-import org.eclipse.osee.display.api.search.AsyncSearchListener;
-import org.eclipse.osee.display.api.search.SearchNavigator;
-import org.eclipse.osee.display.api.search.SearchPresenter;
-import org.eclipse.osee.display.api.search.SearchProgressListener;
-import org.eclipse.osee.display.api.search.SearchProgressProvider;
-import org.eclipse.osee.framework.core.data.IAttributeType;
-import org.eclipse.osee.framework.core.data.IOseeBranch;
-import org.eclipse.osee.framework.core.data.IRelationType;
-import org.eclipse.osee.framework.core.data.TokenFactory;
-import org.eclipse.osee.framework.core.enums.RelationSide;
-import org.eclipse.osee.framework.jdk.core.type.MatchLocation;
-import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
-import org.eclipse.osee.framework.jdk.core.type.ResultSet;
-import org.eclipse.osee.framework.jdk.core.util.Lib;
-import org.eclipse.osee.framework.jdk.core.util.Strings;
-import org.eclipse.osee.framework.jdk.core.util.UrlQuery;
-import org.eclipse.osee.logger.Log;
-import org.eclipse.osee.orcs.data.ArtifactReadable;
-import org.eclipse.osee.orcs.data.AttributeReadable;
-import org.eclipse.osee.orcs.search.Match;
-import com.google.common.collect.Iterables;
-
-/**
- * @author John R. Misinco
- */
-public class SearchPresenterImpl<T extends SearchHeaderComponent, K extends ViewSearchParameters> implements SearchPresenter<T, K>, SearchProgressProvider {
-
- protected final ArtifactProvider artifactProvider;
-
- private final static String SIDE_A_KEY = "sideAName";
- private final static String SIDE_B_KEY = "sideBName";
- protected final Log logger;
- private final AsyncSearchHandler searchHandler = new AsyncSearchHandler();
- protected final Set<SearchProgressListener> searchListeners = new HashSet<SearchProgressListener>();
-
- public SearchPresenterImpl(ArtifactProvider artifactProvider, Log logger) {
- this.artifactProvider = artifactProvider;
- this.logger = logger;
- }
-
- @Override
- public void initSearchResults(String url, T searchHeaderComp, SearchResultsListComponent searchResultsComp, DisplayOptionsComponent options) {
- artifactProvider.cancelSearch();
- SearchParameters params = null;
- try {
- params = decodeSearchUrl(url);
- } catch (UnsupportedEncodingException ex) {
- setErrorMessage(searchResultsComp, "Error parsing url", ex);
- }
-
- if (!Strings.isValid(url) || params == null || !params.isValid()) {
- sendSearchCompleted();
- return;
- }
-
- options.setDisplayOptions(new DisplayOptions(params.isVerbose()));
-
- try {
- searchHandler.setSearchValues(searchResultsComp, params.isVerbose());
- artifactProvider.getSearchResults(TokenFactory.createBranch(params.getBranchUuid(), ""), params.isNameOnly(),
- params.getSearchPhrase(), searchHandler);
- } catch (Exception ex) {
- setErrorMessage(searchResultsComp, "Error loading search results", ex);
- }
- searchResultsComp.clearAll();
- sendSearchInProgress();
- }
-
- private void processSearchResults(Iterable<Match<ArtifactReadable, AttributeReadable<?>>> searchResults, SearchResultsListComponent searchResultsComp, boolean isVerbose) throws OseeCoreException {
- searchResultsComp.clearAll();
- if (searchResults != null && Iterables.isEmpty(searchResults)) {
- searchResultsComp.noSearchResultsFound();
- } else {
- for (Match<ArtifactReadable, AttributeReadable<?>> match : searchResults) {
- ArtifactReadable matchedArtifact = match.getItem();
- ViewArtifact viewArtifact = convertToViewArtifact(matchedArtifact, isVerbose);
-
- SearchResultComponent searchResult = searchResultsComp.createSearchResult();
- searchResult.setArtifact(viewArtifact);
- if (isVerbose) {
- for (AttributeReadable<?> element : match.getElements()) {
- List<MatchLocation> matches = match.getLocation(element);
- String data = String.valueOf(element.getDisplayableString());
- List<StyledText> text = Utility.getMatchedText(data, matches);
- SearchResultMatch srm =
- new SearchResultMatch(element.getAttributeType().getName(), matches.size(), text);
- searchResult.addSearchResultMatch(srm);
- }
- }
- }
- }
- sendSearchCompleted();
- }
-
- @Override
- public void selectArtifact(String url, ViewArtifact artifact, SearchNavigator oseeNavigator) {
- try {
- UrlQuery query = new UrlQuery();
- query.parse(url);
- query.putInPlace("branch", artifact.getBranch().getGuid());
- query.putInPlace("artifact", artifact.getGuid());
-
- String value = query.toUrl();
- oseeNavigator.navigateArtifactPage("/" + value);
- } catch (UnsupportedEncodingException ex) {
- logger.error(ex, "Error in Encoding url in selectArtifact");
- }
- }
-
- @Override
- public void initArtifactPage(String url, T searchHeaderComp, ArtifactHeaderComponent artHeaderComp, RelationComponent relComp, AttributeComponent attrComp, DisplayOptionsComponent options) {
- if (!Strings.isValid(url)) {
- return;
- }
-
- ArtifactParameters params = null;
- try {
- params = decodeArtifactUrl(url);
- } catch (UnsupportedEncodingException ex1) {
- setErrorMessage(artHeaderComp, String.format("Invalid url received: %s", url), ex1);
- }
- if (params == null || !params.isValid()) {
- setErrorMessage(artHeaderComp, String.format("Invalid url received: %s", url), null);
- return;
- }
-
- long branch = params.getBranchUuid();
- String art = params.getArtifactId();
- ArtifactReadable displayArt = null;
- try {
- displayArt = artifactProvider.getArtifactByGuid(TokenFactory.createBranch(branch, ""), art);
- } catch (Exception ex) {
- setErrorMessage(artHeaderComp, "Error finding artifact", ex);
- return;
- }
- if (displayArt == null) {
- setErrorMessage(artHeaderComp, String.format("No artifact[%s] found on branch:[%s]", art, branch), null);
- return;
- }
-
- ViewArtifact artifact = null;
- try {
- artifact = convertToViewArtifact(displayArt, true);
- } catch (Exception ex) {
- setErrorMessage(artHeaderComp, "Error in initArtifactPage", ex);
- return;
- }
-
- artHeaderComp.setArtifact(artifact);
-
- relComp.clearAll();
- relComp.setArtifact(artifact);
-
- try {
- Collection<? extends IRelationType> relationTypes = artifactProvider.getValidRelationTypes(displayArt);
- for (IRelationType relType : relationTypes) {
- ViewId toAdd = new ViewId(relType.getGuid().toString(), relType.getName());
- toAdd.setAttribute(SIDE_A_KEY, artifactProvider.getSideAName(relType));
- toAdd.setAttribute(SIDE_B_KEY, artifactProvider.getSideBName(relType));
- relComp.addRelationType(toAdd);
- }
- } catch (Exception ex) {
- setErrorMessage(relComp, "Error in initArtifactPage:\n Cannot load valid relation types", ex);
- return;
- }
-
- attrComp.clearAll();
- Collection<IAttributeType> attributeTypes = null;
- try {
- attributeTypes = AttributeTypeUtil.getTypesWithData(displayArt);
- } catch (Exception ex) {
- setErrorMessage(attrComp, "Error in initArtifactPage:\n Cannot load attribute types", ex);
- return;
- }
- for (IAttributeType attrType : attributeTypes) {
- try {
- for (AttributeReadable<Object> value : displayArt.getAttributes(attrType)) {
- attrComp.addAttribute(attrType.getName(), value.getDisplayableString());
- }
- } catch (Exception ex) {
- setErrorMessage(attrComp, "Error in initArtifactPage:\n Cannot load attribute values", ex);
- return;
- }
- }
- }
-
- @Override
- public void selectRelationType(ViewArtifact artifact, ViewId relation, RelationComponent relationComponent) {
- relationComponent.clearRelations();
- if (artifact == null || relation == null) {
- setErrorMessage(relationComponent, "Error: Null detected in selectRelationType parameters", null);
- return;
- }
- String relGuid = relation.getGuid();
-
- IRelationType type = TokenFactory.createRelationType(Long.parseLong(relGuid), relation.getName());
- IOseeBranch branch = TokenFactory.createBranch(Long.valueOf(artifact.getBranch().getGuid()), "");
- ArtifactReadable sourceArt;
- ResultSet<ArtifactReadable> relatedSideA;
- ResultSet<ArtifactReadable> relatedSideB;
- try {
- sourceArt = artifactProvider.getArtifactByGuid(branch, artifact.getGuid());
- relatedSideA =
- artifactProvider.getRelatedArtifacts(sourceArt,
- TokenFactory.createRelationTypeSide(RelationSide.SIDE_A, type.getGuid(), type.getName()));
- relatedSideB =
- artifactProvider.getRelatedArtifacts(sourceArt,
- TokenFactory.createRelationTypeSide(RelationSide.SIDE_B, type.getGuid(), type.getName()));
- } catch (Exception ex) {
- setErrorMessage(relationComponent, "Error in selectRelationType", ex);
- return;
- }
-
- String leftSideName = Strings.capitalize(relation.getAttribute(SIDE_A_KEY));
- String rightSideName = Strings.capitalize(relation.getAttribute(SIDE_B_KEY));
- relationComponent.setLeftName(leftSideName);
- relationComponent.setRightName(rightSideName);
-
- if (relatedSideA.isEmpty()) {
- relationComponent.addLeftRelated(null);
- }
- if (relatedSideB.isEmpty()) {
- relationComponent.addRightRelated(null);
- }
-
- try {
- for (ArtifactReadable rel : relatedSideA) {
- ViewArtifact id = convertToViewArtifact(rel, false);
- relationComponent.addLeftRelated(id);
- }
- for (ArtifactReadable rel : relatedSideB) {
- ViewArtifact id = convertToViewArtifact(rel, false);
- relationComponent.addRightRelated(id);
- }
- } catch (Exception ex) {
- setErrorMessage(relationComponent, "Error in selectRelationType", ex);
- return;
- }
- }
-
- protected ViewArtifact convertToViewArtifact(ArtifactReadable artifact, boolean addAncestry) throws OseeCoreException {
- ViewId branch = new ViewId(String.valueOf(artifact.getBranch().getGuid()), artifact.getBranch().getName());
- List<ViewArtifact> ancestry = addAncestry ? getAncestry(artifact) : null;
- ViewArtifact toReturn =
- new ViewArtifact(artifact.getGuid(), artifact.getName(), artifact.getArtifactType().getName(), ancestry,
- branch);
- return toReturn;
- }
-
- protected List<ViewArtifact> getAncestry(ArtifactReadable art) throws OseeCoreException {
- ArtifactReadable cur = artifactProvider.getParent(art);
- List<ViewArtifact> ancestry = new ArrayList<ViewArtifact>();
- while (cur != null) {
- ancestry.add(convertToViewArtifact(cur, false));
- cur = artifactProvider.getParent(cur);
- }
- return ancestry;
- }
-
- protected void setErrorMessage(DisplaysErrorComponent component, String message, Throwable ex) {
- if (component != null) {
- String longMsg = "No Details";
- if (ex != null) {
- longMsg = Lib.exceptionToString(ex);
- logger.error(ex, message);
- }
- component.setErrorMessage(message, longMsg, MsgType.MSGTYPE_ERROR);
- }
- }
-
- private ArtifactParameters decodeArtifactUrl(String url) throws UnsupportedEncodingException {
- UrlQuery query = new UrlQuery();
- query.parse(url);
- String branchId = query.getParameter("branch");
- long branch = 0;
- if (Strings.isValid(branchId)) {
- branch = Long.valueOf(branchId);
- }
- String artifact = query.getParameter("artifact");
- return new ArtifactParameters(branch, artifact);
- }
-
- private SearchParameters decodeSearchUrl(String url) throws UnsupportedEncodingException {
- UrlQuery query = new UrlQuery();
- query.parse(url);
- long branch = Long.valueOf(query.getParameter("branch"));
- String vValue = query.getParameter("verbose");
- boolean verbose = vValue == null ? false : vValue.equalsIgnoreCase("true");
- String nValue = query.getParameter("nameOnly");
- boolean nameOnly = nValue == null ? false : nValue.equalsIgnoreCase("true");
- String searchPhrase = query.getParameter("search");
- return new SearchParameters(branch, nameOnly, searchPhrase, verbose);
- }
-
- @Override
- public void selectDisplayOptions(String url, DisplayOptions options, SearchNavigator navigator) {
- UrlQuery query = new UrlQuery();
- try {
- query.parse(url);
- query.putInPlace("verbose", options.getVerboseResults());
- String newUrl = query.toUrl();
- navigator.navigateSearchResults("/" + newUrl);
- } catch (UnsupportedEncodingException ex) {
- logger.error(ex, "Error in Encoding url in selectArtifact");
- }
- }
-
- @Override
- public void selectSearch(String url, K params, SearchNavigator navigator) {
- //do nothing for now
- }
-
- @Override
- public void selectCancel() {
- artifactProvider.cancelSearch();
- }
-
- protected void sendSearchCancelled() {
- for (SearchProgressListener listener : searchListeners) {
- listener.searchCancelled();
- }
- }
-
- protected void sendSearchInProgress() {
- for (SearchProgressListener listener : searchListeners) {
- listener.searchInProgress();
- }
- }
-
- protected void sendSearchCompleted() {
- for (SearchProgressListener listener : searchListeners) {
- listener.searchCompleted();
- }
- }
-
- protected void sendSearchFailed(Throwable throwable, SearchResultsListComponent component) {
- setErrorMessage(component, "Search failed", throwable);
- for (SearchProgressListener listener : searchListeners) {
- listener.searchCancelled();
- }
- }
-
- @Override
- public void addListener(SearchProgressListener listener) {
- searchListeners.add(listener);
- }
-
- @Override
- public void removeListener(SearchProgressListener listener) {
- searchListeners.remove(listener);
- }
-
- private class AsyncSearchHandler implements AsyncSearchListener {
- private SearchResultsListComponent resultsComp;
- private boolean isVerbose;
-
- public void setSearchValues(SearchResultsListComponent resultsComp, boolean isVerbose) {
- this.resultsComp = resultsComp;
- this.isVerbose = isVerbose;
- }
-
- @Override
- public void onSearchComplete(Iterable<Match<ArtifactReadable, AttributeReadable<?>>> results) {
- try {
- processSearchResults(results, resultsComp, isVerbose);
- } catch (OseeCoreException ex) {
- setErrorMessage(resultsComp, "Error processing results", ex);
- }
- }
-
- @Override
- public void onSearchCancelled() {
- sendSearchCancelled();
- }
-
- @Override
- public void onSearchFailed(Throwable throwable) {
- sendSearchFailed(throwable, resultsComp);
- }
-
- }
-
- private class ArtifactParameters {
- private final long branchUuid;
- private final String artifactId;
-
- public ArtifactParameters(long branchUuid, String artifactId) {
- this.branchUuid = branchUuid;
- this.artifactId = artifactId;
- }
-
- public long getBranchUuid() {
- return branchUuid;
- }
-
- public String getArtifactId() {
- return artifactId;
- }
-
- public boolean isValid() {
- return branchUuid > 0 && Strings.isValid(artifactId);
- }
- }
-
- private class SearchParameters {
-
- private final long branchUuid;
- private final boolean nameOnly, verbose;
- private final String searchPhrase;
-
- public SearchParameters(long branchUuid, boolean nameOnly, String searchPhrase, boolean verbose) {
- this.branchUuid = branchUuid;
- this.nameOnly = nameOnly;
- this.searchPhrase = searchPhrase;
- this.verbose = verbose;
- }
-
- public boolean isVerbose() {
- return verbose;
- }
-
- public long getBranchUuid() {
- return branchUuid;
- }
-
- public boolean isNameOnly() {
- return nameOnly;
- }
-
- public String getSearchPhrase() {
- return searchPhrase;
- }
-
- public boolean isValid() {
- return branchUuid > 0;
- }
- }
-
-}
diff --git a/plugins/org.eclipse.osee.display.presenter/src/org/eclipse/osee/display/presenter/SearchProgressListenerImpl.java b/plugins/org.eclipse.osee.display.presenter/src/org/eclipse/osee/display/presenter/SearchProgressListenerImpl.java
deleted file mode 100644
index a28eaa3a6f..0000000000
--- a/plugins/org.eclipse.osee.display.presenter/src/org/eclipse/osee/display/presenter/SearchProgressListenerImpl.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*******************************************************************************
- * 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.presenter;
-
-import java.util.HashSet;
-import org.eclipse.osee.display.api.search.SearchProgressProvider;
-import org.eclipse.osee.display.api.search.SearchProgressListener;
-
-/**
- * @author Shawn F. Cook
- */
-public class SearchProgressListenerImpl implements SearchProgressProvider {
-
- private final HashSet<SearchProgressListener> listeners = new HashSet<SearchProgressListener>();
-
- @Override
- public void addListener(SearchProgressListener listener) {
- listeners.add(listener);
- }
-
- @Override
- public void removeListener(SearchProgressListener listener) {
- listeners.remove(listener);
- }
-
- protected void fireSearchInProgressEvent() {
- for (SearchProgressListener listener : listeners) {
- listener.searchInProgress();
- }
- }
-
- protected void fireSearchCancelledEvent() {
- for (SearchProgressListener listener : listeners) {
- listener.searchCancelled();
- }
- }
-
- protected void fireSearchCompletedEvent() {
- for (SearchProgressListener listener : listeners) {
- listener.searchCompleted();
- }
- }
-}
diff --git a/plugins/org.eclipse.osee.display.presenter/src/org/eclipse/osee/display/presenter/Utility.java b/plugins/org.eclipse.osee.display.presenter/src/org/eclipse/osee/display/presenter/Utility.java
deleted file mode 100644
index a39d223871..0000000000
--- a/plugins/org.eclipse.osee.display.presenter/src/org/eclipse/osee/display/presenter/Utility.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*******************************************************************************
- * 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.presenter;
-
-import java.util.ArrayList;
-import java.util.List;
-import org.eclipse.osee.display.api.data.StyledText;
-import org.eclipse.osee.framework.jdk.core.type.MatchLocation;
-import org.eclipse.osee.orcs.data.ArtifactReadable;
-import org.eclipse.osee.orcs.utility.NameComparator;
-import org.eclipse.osee.orcs.utility.SortOrder;
-import com.google.common.collect.Ordering;
-
-/**
- * @author Roberto E. Escobar
- */
-public final class Utility {
-
- private Utility() {
- //
- }
-
- public static List<ArtifactReadable> sort(Iterable<ArtifactReadable> toSort) {
- return Ordering.from(new NameComparator(SortOrder.ASCENDING)).sortedCopy(toSort);
- }
-
- public static List<StyledText> getMatchedText(String data, List<MatchLocation> matches) {
- List<StyledText> text = new ArrayList<StyledText>();
- if (matches.isEmpty()) {
- text.add(new StyledText(data, false));
- } else {
- int lastStop = 0;
- for (MatchLocation location : matches) {
- int start = location.getStartPosition();
- int stop = location.getEndPosition();
- String section;
- if (start > lastStop) {
- section = data.substring(lastStop, start - 1);
- text.add(new StyledText(section, false));
- }
-
- int startAt = start;
- if (startAt - 1 < 0) {
- startAt = 0;
- } else {
- startAt = start - 1;
- }
- section = data.substring(startAt, stop);
- text.add(new StyledText(section, true));
- lastStop = location.getEndPosition();
- }
- if (lastStop < data.length()) {
- String section = data.substring(lastStop, data.length());
- text.add(new StyledText(section, false));
- }
- }
- return text;
- }
-}
diff --git a/plugins/org.eclipse.osee.display.presenter/src/org/eclipse/osee/display/presenter/internal/ArtifactProviderCache.java b/plugins/org.eclipse.osee.display.presenter/src/org/eclipse/osee/display/presenter/internal/ArtifactProviderCache.java
deleted file mode 100644
index 6b13d6fee0..0000000000
--- a/plugins/org.eclipse.osee.display.presenter/src/org/eclipse/osee/display/presenter/internal/ArtifactProviderCache.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*******************************************************************************
- * 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.presenter.internal;
-
-import java.util.HashSet;
-import java.util.Set;
-import java.util.concurrent.ConcurrentMap;
-import java.util.concurrent.Future;
-import org.eclipse.osee.framework.jdk.core.type.ResultSet;
-import org.eclipse.osee.framework.jdk.core.type.ResultSets;
-import org.eclipse.osee.orcs.data.ArtifactReadable;
-import org.eclipse.osee.orcs.data.AttributeReadable;
-import org.eclipse.osee.orcs.search.Match;
-import com.google.common.collect.MapMaker;
-
-/**
- * @author Roberto E. Escobar
- */
-public class ArtifactProviderCache {
- private static final ResultSet<Match<ArtifactReadable, AttributeReadable<?>>> EMPTY_SET =
- ResultSets.emptyResultSet();
- private final ConcurrentMap<ArtifactReadable, ArtifactReadable> parentCache;
- private final Set<ArtifactReadable> artifactsWithNoParent = new HashSet<ArtifactReadable>();
-
- private ResultSet<Match<ArtifactReadable, AttributeReadable<?>>> searchResults;
- private SearchParameters searchParameters;
- private Future<?> future;
-
- public ArtifactProviderCache() {
- this.parentCache = new MapMaker()//
- .initialCapacity(500)//
- // .expiration(30, TimeUnit.MINUTES)//
- .makeMap();
- clearSearchCache();
- }
-
- public void cacheParent(ArtifactReadable art, ArtifactReadable parent) {
- if (parent != null) {
- parentCache.put(art, parent);
- } else {
- artifactsWithNoParent.add(art);
- }
- }
-
- public boolean isParentCached(ArtifactReadable artifact) {
- return parentCache.containsKey(artifact) || artifactsWithNoParent.contains(artifact);
- }
-
- public ArtifactReadable getParent(ArtifactReadable artifact) {
- return parentCache.get(artifact);
- }
-
- public void cacheResults(ResultSet<Match<ArtifactReadable, AttributeReadable<?>>> searchResults) {
- this.searchResults = searchResults;
- }
-
- public void cacheSearch(SearchParameters searchParameters) {
- this.searchParameters = searchParameters;
- }
-
- public ResultSet<Match<ArtifactReadable, AttributeReadable<?>>> getSearchResults() {
- return searchResults;
- }
-
- public SearchParameters getSearchParameters() {
- return searchParameters;
- }
-
- public boolean isSearchCached(SearchParameters params) {
- return searchParameters != null && searchParameters.equals(params);
- }
-
- public void clearSearchCache() {
- cacheSearch(null);
- cacheResults(EMPTY_SET);
- cacheSearchFuture(null);
- }
-
- public void cacheSearchFuture(Future<?> future) {
- this.future = future;
- }
-
- public Future<?> getSearchFuture() {
- return future;
- }
-
- public boolean isSearchInProgress() {
- return future != null && !future.isDone() && !future.isCancelled();
- }
-}
diff --git a/plugins/org.eclipse.osee.display.presenter/src/org/eclipse/osee/display/presenter/internal/FilteredArtifactCallable.java b/plugins/org.eclipse.osee.display.presenter/src/org/eclipse/osee/display/presenter/internal/FilteredArtifactCallable.java
deleted file mode 100644
index 7ed3b631a4..0000000000
--- a/plugins/org.eclipse.osee.display.presenter/src/org/eclipse/osee/display/presenter/internal/FilteredArtifactCallable.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*******************************************************************************
- * 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.presenter.internal;
-
-import java.util.Collection;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.concurrent.Callable;
-import java.util.concurrent.Future;
-import org.eclipse.osee.display.presenter.ArtifactFilter;
-import org.eclipse.osee.executor.admin.CancellableCallable;
-import org.eclipse.osee.executor.admin.ExecutorAdmin;
-import org.eclipse.osee.executor.admin.WorkUtility;
-import org.eclipse.osee.executor.admin.WorkUtility.PartitionFactory;
-import org.eclipse.osee.framework.jdk.core.util.Collections;
-import org.eclipse.osee.orcs.data.ArtifactReadable;
-
-/**
- * @author Roberto E. Escobar
- */
-public class FilteredArtifactCallable extends CancellableCallable<List<ArtifactReadable>> implements PartitionFactory<ArtifactReadable, ArtifactReadable> {
-
- private static final String FILTER_WORKER_ID = "artifact.filter.workers";
-
- private final ExecutorAdmin executorAdmin;
- private final ArtifactFilter filter;
- private final Iterable<ArtifactReadable> artifacts;
-
- public FilteredArtifactCallable(ExecutorAdmin executorAdmin, ArtifactFilter filter, Iterable<ArtifactReadable> artifacts) {
- super();
- this.executorAdmin = executorAdmin;
- this.filter = filter;
- this.artifacts = artifacts;
- }
-
- @Override
- public List<ArtifactReadable> call() throws Exception {
- List<Future<Collection<ArtifactReadable>>> futures =
- WorkUtility.partitionAndScheduleWork(executorAdmin, FILTER_WORKER_ID, this, artifacts);
- final List<ArtifactReadable> results = new LinkedList<ArtifactReadable>();
- for (Future<Collection<ArtifactReadable>> future : futures) {
- checkForCancelled();
- results.addAll(future.get());
- }
- return results;
- }
-
- @Override
- public Callable<Collection<ArtifactReadable>> createWorker(final Collection<ArtifactReadable> toProcess) {
- return new CancellableCallable<Collection<ArtifactReadable>>() {
-
- @Override
- public Collection<ArtifactReadable> call() throws Exception {
- checkForCancelled();
- Collections.filter(toProcess, filter);
- return toProcess;
- }
- };
- }
-
-}
diff --git a/plugins/org.eclipse.osee.display.presenter/src/org/eclipse/osee/display/presenter/internal/FilteredMatchCallable.java b/plugins/org.eclipse.osee.display.presenter/src/org/eclipse/osee/display/presenter/internal/FilteredMatchCallable.java
deleted file mode 100644
index 9a5fc11533..0000000000
--- a/plugins/org.eclipse.osee.display.presenter/src/org/eclipse/osee/display/presenter/internal/FilteredMatchCallable.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*******************************************************************************
- * 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.presenter.internal;
-
-import java.util.Collection;
-import org.eclipse.osee.display.presenter.ArtifactFilter;
-import org.eclipse.osee.executor.admin.CancellableCallable;
-import org.eclipse.osee.framework.jdk.core.util.Collections;
-import org.eclipse.osee.framework.jdk.core.util.Filter;
-import org.eclipse.osee.orcs.data.ArtifactReadable;
-import org.eclipse.osee.orcs.data.AttributeReadable;
-import org.eclipse.osee.orcs.search.Match;
-
-/**
- * @author Roberto E. Escobar
- */
-public class FilteredMatchCallable extends CancellableCallable<Collection<Match<ArtifactReadable, AttributeReadable<?>>>> implements Filter<Match<ArtifactReadable, AttributeReadable<?>>> {
-
- private final Collection<Match<ArtifactReadable, AttributeReadable<?>>> toSanitize;
- private final ArtifactFilter sanitizer;
-
- public FilteredMatchCallable(ArtifactFilter sanitizer, Collection<Match<ArtifactReadable, AttributeReadable<?>>> toSanitize) {
- this.sanitizer = sanitizer;
- this.toSanitize = toSanitize;
- }
-
- @Override
- public Collection<Match<ArtifactReadable, AttributeReadable<?>>> call() throws Exception {
- Collections.filter(toSanitize, this);
- return toSanitize;
- }
-
- @Override
- public boolean accept(Match<ArtifactReadable, AttributeReadable<?>> item) throws Exception {
- checkForCancelled();
- return sanitizer.accept(item.getItem());
- }
-} \ No newline at end of file
diff --git a/plugins/org.eclipse.osee.display.presenter/src/org/eclipse/osee/display/presenter/internal/FilteredResultSetCallable.java b/plugins/org.eclipse.osee.display.presenter/src/org/eclipse/osee/display/presenter/internal/FilteredResultSetCallable.java
deleted file mode 100644
index bc9387c72f..0000000000
--- a/plugins/org.eclipse.osee.display.presenter/src/org/eclipse/osee/display/presenter/internal/FilteredResultSetCallable.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*******************************************************************************
- * 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.presenter.internal;
-
-import java.util.Collection;
-import java.util.Collections;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.concurrent.Callable;
-import java.util.concurrent.CancellationException;
-import java.util.concurrent.Future;
-import org.eclipse.osee.display.presenter.ArtifactFilter;
-import org.eclipse.osee.executor.admin.CancellableCallable;
-import org.eclipse.osee.executor.admin.ExecutorAdmin;
-import org.eclipse.osee.executor.admin.WorkUtility;
-import org.eclipse.osee.executor.admin.WorkUtility.PartitionFactory;
-import org.eclipse.osee.framework.jdk.core.type.ResultSet;
-import org.eclipse.osee.framework.jdk.core.type.ResultSets;
-import org.eclipse.osee.orcs.data.ArtifactReadable;
-import org.eclipse.osee.orcs.data.AttributeReadable;
-import org.eclipse.osee.orcs.search.Match;
-import org.eclipse.osee.orcs.utility.MatchComparator;
-import org.eclipse.osee.orcs.utility.SortOrder;
-
-/**
- * @author Roberto E. Escobar
- */
-public class FilteredResultSetCallable extends CancellableCallable<ResultSet<Match<ArtifactReadable, AttributeReadable<?>>>> implements PartitionFactory<Match<ArtifactReadable, AttributeReadable<?>>, Match<ArtifactReadable, AttributeReadable<?>>> {
- private static final String FILTER_WORKER_ID = "artifact.filter.workers";
-
- private final ExecutorAdmin executorAdmin;
- private final ArtifactFilter filter;
- private final CancellableCallable<ResultSet<Match<ArtifactReadable, AttributeReadable<?>>>> innerWorker;
-
- public FilteredResultSetCallable(ExecutorAdmin executorAdmin, ArtifactFilter filter, CancellableCallable<ResultSet<Match<ArtifactReadable, AttributeReadable<?>>>> innerWorker) {
- super();
- this.executorAdmin = executorAdmin;
- this.filter = filter;
- this.innerWorker = innerWorker;
- }
-
- @Override
- public ResultSet<Match<ArtifactReadable, AttributeReadable<?>>> call() throws Exception {
- ResultSet<Match<ArtifactReadable, AttributeReadable<?>>> results = innerWorker.call();
-
- List<Match<ArtifactReadable, AttributeReadable<?>>> artifacts = filter(results);
-
- Collections.sort(artifacts, new MatchComparator(SortOrder.ASCENDING));
- return ResultSets.newResultSet(artifacts);
- }
-
- @Override
- public boolean isCancelled() {
- return super.isCancelled() && innerWorker.isCancelled();
- }
-
- @Override
- public void setCancel(boolean isCancelled) {
- super.setCancel(isCancelled);
- innerWorker.setCancel(isCancelled);
- }
-
- @Override
- public void checkForCancelled() throws CancellationException {
- super.checkForCancelled();
- innerWorker.checkForCancelled();
- }
-
- @Override
- public Callable<Collection<Match<ArtifactReadable, AttributeReadable<?>>>> createWorker(Collection<Match<ArtifactReadable, AttributeReadable<?>>> toProcess) {
- return new FilteredMatchCallable(filter, toProcess);
- }
-
- private List<Match<ArtifactReadable, AttributeReadable<?>>> filter(Iterable<Match<ArtifactReadable, AttributeReadable<?>>> items) throws Exception {
- List<Future<Collection<Match<ArtifactReadable, AttributeReadable<?>>>>> futures =
- WorkUtility.partitionAndScheduleWork(executorAdmin, FILTER_WORKER_ID, this, items);
- final List<Match<ArtifactReadable, AttributeReadable<?>>> results =
- new LinkedList<Match<ArtifactReadable, AttributeReadable<?>>>();
- for (Future<Collection<Match<ArtifactReadable, AttributeReadable<?>>>> future : futures) {
- checkForCancelled();
- results.addAll(future.get());
- }
- return results;
- }
-}
diff --git a/plugins/org.eclipse.osee.display.presenter/src/org/eclipse/osee/display/presenter/internal/SearchExecutionCallback.java b/plugins/org.eclipse.osee.display.presenter/src/org/eclipse/osee/display/presenter/internal/SearchExecutionCallback.java
deleted file mode 100644
index b4fb2cbfaf..0000000000
--- a/plugins/org.eclipse.osee.display.presenter/src/org/eclipse/osee/display/presenter/internal/SearchExecutionCallback.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*******************************************************************************
- * 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.presenter.internal;
-
-import org.eclipse.osee.display.api.search.AsyncSearchListener;
-import org.eclipse.osee.executor.admin.ExecutionCallback;
-import org.eclipse.osee.framework.jdk.core.type.ResultSet;
-import org.eclipse.osee.orcs.data.ArtifactReadable;
-import org.eclipse.osee.orcs.data.AttributeReadable;
-import org.eclipse.osee.orcs.search.Match;
-
-/**
- * @author Roberto E. Escobar
- */
-public class SearchExecutionCallback implements ExecutionCallback<ResultSet<Match<ArtifactReadable, AttributeReadable<?>>>> {
-
- private final AsyncSearchListener callback;
- private final ArtifactProviderCache cache;
-
- public SearchExecutionCallback(ArtifactProviderCache cache, AsyncSearchListener callback) {
- this.cache = cache;
- this.callback = callback;
- }
-
- @Override
- public void onSuccess(ResultSet<Match<ArtifactReadable, AttributeReadable<?>>> result) {
- cache.cacheResults(result);
- callback.onSearchComplete(result);
- }
-
- @Override
- public void onFailure(Throwable throwable) {
- cache.cacheSearch(null);
- callback.onSearchFailed(throwable);
- }
-
- @Override
- public void onCancelled() {
- cache.cacheSearch(null);
- callback.onSearchCancelled();
- }
-} \ No newline at end of file
diff --git a/plugins/org.eclipse.osee.display.presenter/src/org/eclipse/osee/display/presenter/internal/SearchParameters.java b/plugins/org.eclipse.osee.display.presenter/src/org/eclipse/osee/display/presenter/internal/SearchParameters.java
deleted file mode 100644
index 1762727a28..0000000000
--- a/plugins/org.eclipse.osee.display.presenter/src/org/eclipse/osee/display/presenter/internal/SearchParameters.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*******************************************************************************
- * 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.presenter.internal;
-
-import org.eclipse.osee.framework.core.data.IOseeBranch;
-
-/**
- * @author John R. Misinco
- */
-public class SearchParameters {
- private final IOseeBranch branch;
- private final boolean nameOnly;
- private final String searchPhrase;
-
- public SearchParameters(IOseeBranch branch, boolean nameOnly, String searchPhrase) {
- this.branch = branch;
- this.nameOnly = nameOnly;
- this.searchPhrase = searchPhrase;
- }
-
- public IOseeBranch getBranch() {
- return branch;
- }
-
- public boolean isNameOnly() {
- return nameOnly;
- }
-
- public String getSearchPhrase() {
- return searchPhrase;
- }
-
- @Override
- public boolean equals(Object obj) {
- if (obj instanceof SearchParameters) {
- SearchParameters sObj = (SearchParameters) obj;
- return sObj.getBranch().getGuid().equals(branch.getUuid()) && sObj.isNameOnly() == nameOnly && sObj.getSearchPhrase().equals(
- searchPhrase);
- }
- return false;
- }
-
- @Override
- public int hashCode() {
- return super.hashCode();
- }
-
-} \ No newline at end of file
diff --git a/plugins/org.eclipse.osee.display.view.web/.classpath b/plugins/org.eclipse.osee.display.view.web/.classpath
deleted file mode 100644
index ad32c83a78..0000000000
--- a/plugins/org.eclipse.osee.display.view.web/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/org.eclipse.osee.display.view.web/.project b/plugins/org.eclipse.osee.display.view.web/.project
deleted file mode 100644
index c48743528f..0000000000
--- a/plugins/org.eclipse.osee.display.view.web/.project
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.osee.display.view.web</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ds.core.builder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/plugins/org.eclipse.osee.display.view.web/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.display.view.web/META-INF/MANIFEST.MF
deleted file mode 100644
index c2a691dc3a..0000000000
--- a/plugins/org.eclipse.osee.display.view.web/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,25 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Osee Display View Web
-Bundle-SymbolicName: org.eclipse.osee.display.view.web
-Bundle-Version: 0.17.0.qualifier
-Bundle-Vendor: Eclipse Open System Engineering Environment
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: com.vaadin,
- com.vaadin.data,
- com.vaadin.ui,
- javax.servlet;version="2.5.0",
- javax.servlet.http;version="2.5.0",
- org.eclipse.osee.display.api.components,
- org.eclipse.osee.display.api.data,
- org.eclipse.osee.display.api.search,
- org.eclipse.osee.framework.core.data,
- org.eclipse.osee.framework.jdk.core.type,
- org.eclipse.osee.vaadin,
- org.eclipse.osee.vaadin.widgets,
- org.osgi.framework;version="1.6.0"
-Export-Package: org.eclipse.osee.display.view.web,
- org.eclipse.osee.display.view.web.components,
- org.eclipse.osee.display.view.web.search
-Require-Bundle: org.eclipse.osee.display.api,
- org.eclipse.osee.vaadin
diff --git a/plugins/org.eclipse.osee.display.view.web/build.properties b/plugins/org.eclipse.osee.display.view.web/build.properties
deleted file mode 100644
index 3af869a6dd..0000000000
--- a/plugins/org.eclipse.osee.display.view.web/build.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
- .
-
diff --git a/plugins/org.eclipse.osee.display.view.web/pom.xml b/plugins/org.eclipse.osee.display.view.web/pom.xml
deleted file mode 100644
index 4cee707dfa..0000000000
--- a/plugins/org.eclipse.osee.display.view.web/pom.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.eclipse.osee</groupId>
- <artifactId>org.eclipse.osee.x.ats.parent</artifactId>
- <version>0.17.0-SNAPSHOT</version>
- <relativePath>../../plugins/org.eclipse.osee.x.ats.parent</relativePath>
- </parent>
-
- <artifactId>org.eclipse.osee.display.view.web</artifactId>
- <packaging>eclipse-plugin</packaging>
- <name>OSEE Display View Web - (Incubation)</name>
-
- <build>
- <!-- workaround for https://issues.sonatype.org/browse/TYCHO-168 -->
- <resources>
- <resource>
- <directory>src</directory>
- <excludes>
- <exclude>**/*.java</exclude>
- </excludes>
- </resource>
- </resources>
- <plugins>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-source-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
-</project> \ No newline at end of file
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
deleted file mode 100644
index f4bbc40c35..0000000000
--- a/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/AbstractCommonView.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*******************************************************************************
- * 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.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;
-import com.vaadin.ui.VerticalLayout;
-
-/**
- * @author Shawn F. Cook
- */
-@SuppressWarnings("serial")
-public abstract class AbstractCommonView extends VerticalLayout implements Navigator.View, HasViewTitle {
-
- protected OseeSearchHeaderComponent searchHeader;
- private SearchPresenter<?, ?> searchPresenter;
-
- private boolean isLayoutComplete = false;
- private String initialUrl;
-
- @Override
- public void init(Navigator navigator, Application application) {
- searchPresenter = ComponentUtility.getPresenter(this);
- }
-
- @Override
- public final void attach() {
- if (!isLayoutComplete) {
- initComponents();
- if (searchHeader != null) {
- setSizeFull();
-
- addComponent(searchHeader);
- setComponentAlignment(searchHeader, Alignment.TOP_LEFT);
-
- createLayout();
-
- callInit(initialUrl);
- }
- isLayoutComplete = true;
- }
- }
-
- @Override
- public final void navigateTo(String requestedDataId) {
- ComponentUtility.setUrl(this, requestedDataId);
- searchPresenter = ComponentUtility.getPresenter(this);
- initialUrl = requestedDataId;
- if (searchPresenter != null) {
- callInit(initialUrl);
- }
- }
-
- protected abstract void callInit(String url);
-
- protected abstract void createLayout();
-
- protected abstract void initComponents();
-
- protected OseeSearchHeaderComponent getSearchHeader() {
- return searchHeader;
- }
-
- protected void setSearchHeader(OseeSearchHeaderComponent searchHeader) {
- this.searchHeader = searchHeader;
- }
-
- @Override
- public String getWarningForNavigatingFrom() {
- return null;
- }
-
-}
diff --git a/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/CssConstants.java b/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/CssConstants.java
deleted file mode 100644
index 9b70734196..0000000000
--- a/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/CssConstants.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*******************************************************************************
- * 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.view.web;
-
-/**
- * @author Shawn F. Cook
- */
-public final class CssConstants {
-
- private CssConstants() {
- // Constants Class
- }
-
- public static final String OSEE_MAIN_CONTAINER_LAYOUT = "osee-main-container-layout";
-
- public static final String OSEE_HEADER_SECTION = "osee-header-section";
- public static final String OSEE_PAGE_CONTENT_SECTION = "osee-page-content-section";
-
- public static final String OSEE_FOOTER_SECTION = "osee-footer-section";
- public static final String OSEE_LOGO = "osee-logo";
-
- public static final String OSEE_HEADER_BAR = "osee-header-bar";
- public static final String OSEE_HEADER = "osee-header";
- public static final String OSEE_FOOTER = "osee-footer";
- public static final String OSEE_FOOTER_BAR = "osee-footer-bar";
- public static final String OSEE_PRODUCT_SUMMARY = "osee-product-summary";
-
- public static final String OSEE_SEARCH_HEADER_COMPONENT_SMALL = "osee-search-header-component-small";
- public static final String OSEE_TITLE_MEDIUM_TEXT = "osee-title-medium-text";
- public static final String OSEE_SEARCH_TEXTFIELD = "osee-search-textfield";
-
- public static final String OSEE_SEARCHRESULTS_NORESULTS = "osee-searchresults-noresults";
- public static final String OSEE_SEARCHRESULTS_MANYRESULTSFIELD = "osee-searchresults-manyresultsfield";
- public static final String OSEE_SEARCHRESULT_ARTNAME = "osee-searchresult-artname";
- public static final String OSEE_SEARCHRESULT_ARTNAME_NOLINK = "osee-searchresult-artname-nolink";
- public static final String OSEE_SEARCHRESULT_ARTTYPE = "osee-searchresult-arttype";
- public static final String OSEE_ATTRNAME = "osee-attrname";
- public static final String OSEE_SEARCHRESULT_MATCH_MANY = "osee-searchresult-match-many";
-
- public static final String OSEE_HORIZONTAL_LINE = "osee-horizontal-line";
- public static final String OSEE_BREADCRUMB_ARTNAME = "osee-breadcrumb-artname";
-
- public static final String OSEE_RIGHTARROW = "osee-rightarrow";
- public static final String OSEE_LEFTARROW = "osee-leftarrow";
-
- public static final String OSEE_ATTRIBUTELABEL_LONG = "osee-attributelabel-long";
- public static final String OSEE_ATTRIBUTELABEL = "osee-attributelabel";
- public static final String OSEE_ATTRIBUTEVALUE = "osee-attributevalue";
- public static final String OSEE_ATTRIBUTESTITLELABEL = "osee-attributestitlelabel";
- public static final String OSEE_ATTRIBUTESBORDER = "osee-attributesborder";
-
- public static final String OSEE_CURRENTPAGELABEL = "osee-currentpagelabel";
- public static final int OSEE_LEFTMARGINWIDTH = 15;
- public static final String OSEE_EXCEPTION = "osee-exception";
- public static final String OSEE_EXCEPTION_ERROR_TITLE_TEXT = "osee-exception-error-title-text";
- public static final String OSEE_EXCEPTION_WARNING_TITLE_TEXT = "osee-exception-warning-title-text";
- public static final String OSEE_EXCEPTION_LONGMSG = "osee-exception-longmsg";
- public static final String OSEE_EMAILDIALOG_TITLES = "osee-emaildialog-titles";
-
- public static final String OSEE_WORKING_LABEL_1 = "osee-working-label-1";
- public static final String OSEE_WORKING_LABEL_2 = "osee-working-label-2";
- public static final String OSEE_WORKING_LABEL_3 = "osee-working-label-3";
-
-}
diff --git a/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/HasLogger.java b/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/HasLogger.java
deleted file mode 100644
index f1010657ea..0000000000
--- a/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/HasLogger.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*******************************************************************************
- * 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.view.web;
-
-/**
- * @author Shawn F. Cook
- */
-public interface HasLogger {
- public void logError(String format, Object... args);
-
- public void logWarn(String format, Object... args);
-
- public void logInfo(String format, Object... args);
-
- public void logDebug(String format, Object... args);
-}
diff --git a/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/HasNavigator.java b/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/HasNavigator.java
deleted file mode 100644
index c41577aa99..0000000000
--- a/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/HasNavigator.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*******************************************************************************
- * 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.view.web;
-
-import org.eclipse.osee.display.api.search.SearchNavigator;
-
-/**
- * @author Roberto E. Escobar
- */
-public interface HasNavigator {
-
- SearchNavigator getNavigator();
-
-}
diff --git a/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/HasPresenter.java b/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/HasPresenter.java
deleted file mode 100644
index 437e706de6..0000000000
--- a/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/HasPresenter.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*******************************************************************************
- * 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.view.web;
-
-import org.eclipse.osee.display.api.search.SearchPresenter;
-
-/**
- * @author Roberto E. Escobar
- */
-public interface HasPresenter {
-
- SearchPresenter<?, ?> getPresenter();
-}
diff --git a/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/HasUrl.java b/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/HasUrl.java
deleted file mode 100644
index 77c746ac13..0000000000
--- a/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/HasUrl.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*******************************************************************************
- * 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.view.web;
-
-/**
- * @author Roberto E. Escobar
- */
-public interface HasUrl {
-
- String getUrl();
-
- void setUrl(String url);
-}
diff --git a/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/OseeFooter.java b/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/OseeFooter.java
deleted file mode 100644
index b1727301d7..0000000000
--- a/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/OseeFooter.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*******************************************************************************
- * 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.view.web;
-
-import com.vaadin.ui.HorizontalLayout;
-import com.vaadin.ui.Label;
-
-@SuppressWarnings("serial")
-public class OseeFooter extends HorizontalLayout {
-
- private boolean populated;
-
- public OseeFooter() {
- }
-
- @Override
- public void attach() {
- if (populated) {
- // Only populate the layout once
- return;
- }
-
- Label summary = new Label(getApplicationInfo());
- addComponent(summary);
- populated = true;
-
- this.setStyleName(CssConstants.OSEE_FOOTER_BAR);
- this.setWidth(100, UNITS_PERCENTAGE);
- this.setHeight(null);
- }
-
- public String getApplicationInfo() {
- StringBuilder builder = new StringBuilder();
- builder.append("Version: ");
- builder.append(getApplication().getVersion());
- return builder.toString();
- }
-
-} \ No newline at end of file
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
deleted file mode 100644
index f569608bae..0000000000
--- a/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/components/ComponentUtility.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/*******************************************************************************
- * 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.view.web.components;
-
-import org.eclipse.osee.display.api.search.SearchNavigator;
-import org.eclipse.osee.display.api.search.SearchPresenter;
-import org.eclipse.osee.display.view.web.HasLogger;
-import org.eclipse.osee.display.view.web.HasNavigator;
-import org.eclipse.osee.display.view.web.HasPresenter;
-import org.eclipse.osee.display.view.web.HasUrl;
-import com.vaadin.Application;
-import com.vaadin.ui.Component;
-
-/**
- * @author Roberto E. Escobar
- */
-public final class ComponentUtility {
-
- private ComponentUtility() {
- // Utility Class
- }
-
- public static boolean isAccessible(Component... components) {
- boolean result = true;
- if (components == null) {
- result = false;
- } else {
- for (Component component : components) {
- result &= component != null;
- }
- }
- return result;
- }
-
- public static SearchNavigator getNavigator(Component component) {
- SearchNavigator navigator = null;
- if (isAccessible(component)) {
- Application app = component.getApplication();
- if (app instanceof HasNavigator) {
- navigator = ((HasNavigator) app).getNavigator();
- }
- }
- return navigator;
- }
-
- public static String getUrl(Component component) {
- String url = null;
- if (isAccessible(component)) {
- Application app = component.getApplication();
- if (app instanceof HasUrl) {
- url = ((HasUrl) app).getUrl();
- }
- }
- return url;
- }
-
- public static void setUrl(Component component, String url) {
- if (isAccessible(component)) {
- Application app = component.getApplication();
- if (app instanceof HasUrl) {
- ((HasUrl) app).setUrl(url);
- }
- }
- }
-
- public static SearchPresenter<?, ?> getPresenter(Component component) {
- SearchPresenter<?, ?> presenter = null;
- if (isAccessible(component)) {
- Application app = component.getApplication();
- if (app instanceof HasPresenter) {
- presenter = ((HasPresenter) app).getPresenter();
- }
- }
- return presenter;
- }
-
- public static void logError(String format, Component component, Object... args) {
- if (isAccessible(component)) {
- Application app = component.getApplication();
- if (app instanceof HasLogger) {
- ((HasLogger) app).logError(format, args);
- }
- }
- }
-
- public static void logWarn(String format, Component component, Object... args) {
- if (isAccessible(component)) {
- Application app = component.getApplication();
- if (app instanceof HasLogger) {
- ((HasLogger) app).logWarn(format, args);
- }
- }
- }
-
- public static void logInfo(String format, Component component, Object... args) {
- if (isAccessible(component)) {
- Application app = component.getApplication();
- if (app instanceof HasLogger) {
- ((HasLogger) app).logInfo(format, args);
- }
- }
- }
-
- public static void logDebug(String format, Component component, Object... args) {
- if (isAccessible(component)) {
- Application app = component.getApplication();
- if (app instanceof HasLogger) {
- ((HasLogger) app).logDebug(format, args);
- }
- }
- }
-}
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
deleted file mode 100644
index 7843107e6a..0000000000
--- a/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/components/OseeArtifactNameLinkComponent.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*******************************************************************************
- * 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.view.web.components;
-
-import org.eclipse.osee.display.api.data.ViewArtifact;
-import org.eclipse.osee.display.api.search.SearchNavigator;
-import org.eclipse.osee.display.api.search.SearchPresenter;
-import org.eclipse.osee.display.view.web.CssConstants;
-import com.vaadin.event.LayoutEvents.LayoutClickEvent;
-import com.vaadin.event.LayoutEvents.LayoutClickListener;
-import com.vaadin.ui.HorizontalLayout;
-import com.vaadin.ui.Label;
-import com.vaadin.ui.Link;
-
-/**
- * @author Shawn F. Cook
- */
-@SuppressWarnings("serial")
-public class OseeArtifactNameLinkComponent extends HorizontalLayout {
-
- private boolean isLayoutComplete = false;
- private ViewArtifact artifact = null;
- private final Link artifactNameLink = new Link();
- private final Label artifactNameNOLink = new Label();
- private boolean noLink = false;
-
- public OseeArtifactNameLinkComponent(ViewArtifact artifact) {
- this(artifact, CssConstants.OSEE_SEARCHRESULT_ARTNAME, false);
- }
-
- public OseeArtifactNameLinkComponent(final ViewArtifact artifact, String styleName, boolean noLink) {
- this.noLink = noLink;
- this.artifact = artifact;
- artifactNameLink.setStyleName(styleName);
- artifactNameNOLink.setStyleName(CssConstants.OSEE_SEARCHRESULT_ARTNAME_NOLINK);
-
- if (!noLink) {
- addListener(new LayoutClickListener() {
- @Override
- public void layoutClick(LayoutClickEvent event) {
- String url = ComponentUtility.getUrl(OseeArtifactNameLinkComponent.this);
- SearchNavigator navigator = ComponentUtility.getNavigator(OseeArtifactNameLinkComponent.this);
- SearchPresenter<?, ?> presenter = ComponentUtility.getPresenter(OseeArtifactNameLinkComponent.this);
- presenter.selectArtifact(url, OseeArtifactNameLinkComponent.this.artifact, navigator);
- }
- });
- }
- }
-
- public OseeArtifactNameLinkComponent() {
- this(null, CssConstants.OSEE_SEARCHRESULT_ARTNAME, false);
- }
-
- public OseeArtifactNameLinkComponent(boolean noLink) {
- this(null, CssConstants.OSEE_SEARCHRESULT_ARTNAME, noLink);
- }
-
- @Override
- public void attach() {
- if (!isLayoutComplete) {
- createLayout();
- isLayoutComplete = true;
- }
- }
-
- private void createLayout() {
- if (artifact != null) {
- artifactNameLink.setCaption(artifact.getArtifactName());
- artifactNameNOLink.setValue(artifact.getArtifactName());
- }
-
- if (noLink) {
- addComponent(artifactNameNOLink);
- } else {
- addComponent(artifactNameLink);
- }
- }
-
- public void updateLayout() {
- if (artifact != null) {
- artifactNameLink.setCaption(artifact.getArtifactName());
- artifactNameNOLink.setValue(artifact.getArtifactName());
- }
- }
-
- public ViewArtifact getArtifact() {
- return artifact;
- }
-
- public void setArtifact(ViewArtifact artifact) {
- this.artifact = artifact;
- updateLayout();
- }
-
-}
diff --git a/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/components/OseeAttributeComponent.java b/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/components/OseeAttributeComponent.java
deleted file mode 100644
index fe1cfeb313..0000000000
--- a/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/components/OseeAttributeComponent.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011 Boeing.
- * All rightsimport com.vaadin.Application;
-import com.vaadin.service.ApplicationContext.TransactionListener;
-he 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.view.web.components;
-
-import org.eclipse.osee.display.api.components.AttributeComponent;
-import org.eclipse.osee.display.view.web.CssConstants;
-import com.vaadin.ui.Alignment;
-import com.vaadin.ui.GridLayout;
-import com.vaadin.ui.Label;
-import com.vaadin.ui.TextField;
-import com.vaadin.ui.VerticalLayout;
-
-/**
- * @author Shawn F. Cook
- */
-@SuppressWarnings("serial")
-public class OseeAttributeComponent extends VerticalLayout implements AttributeComponent {
-
- private boolean isLayoutComplete = false;
- private final GridLayout attributesLayout = new GridLayout(3, 1);
- private int rowIndex = 0;
-
- @Override
- public void attach() {
- if (!isLayoutComplete) {
- createLayout();
- isLayoutComplete = true;
- }
- }
-
- private void createLayout() {
-
- Label titleLabel = new Label("Attributes");
- titleLabel.setStyleName(CssConstants.OSEE_ATTRIBUTESTITLELABEL);
-
- addComponent(titleLabel);
- addComponent(attributesLayout);
- }
-
- @Override
- public void clearAll() {
- attributesLayout.removeAllComponents();
- }
-
- @Override
- public void setErrorMessage(String shortMsg, String longMsg, MsgType msgType) {
- // do nothing
- }
-
- @Override
- public void addAttribute(String type, String value) {
- synchronized (getApplication()) {
- if (type != null && !type.trim().isEmpty() && value != null && !value.trim().isEmpty() && !type.toLowerCase().contains(
- "name")) {
-
- Label attrLabel = new Label(String.format("%s:", type));
- attrLabel.setStyleName(CssConstants.OSEE_ATTRIBUTELABEL);
- attributesLayout.setComponentAlignment(attrLabel, Alignment.TOP_RIGHT);
-
- Label gridSpacer = new Label();
- gridSpacer.setWidth(5, UNITS_PIXELS);
-
- attributesLayout.addComponent(attrLabel, 0, rowIndex);
- attributesLayout.addComponent(gridSpacer, 1, rowIndex);
-
- if (value.length() > 150) {
-
- TextField attrValue = new TextField();
- attrValue.setValue(value);
- attrValue.setWidth(500, UNITS_PIXELS);
- attrValue.setHeight(150, UNITS_PIXELS);
-
- attributesLayout.setRows(attributesLayout.getRows() + 1);
- attributesLayout.addComponent(attrValue, 2, rowIndex);
- } else {
-
- Label attrValue = new Label(value);
- attrValue.setStyleName(CssConstants.OSEE_ATTRIBUTEVALUE);
-
- attributesLayout.setRows(attributesLayout.getRows() + 1);
- attributesLayout.addComponent(attrValue, 2, rowIndex);
- }
- rowIndex++;
- }
- }
- }
-}
diff --git a/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/components/OseeBreadcrumbComponent.java b/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/components/OseeBreadcrumbComponent.java
deleted file mode 100644
index 2c57bbe5f1..0000000000
--- a/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/components/OseeBreadcrumbComponent.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*******************************************************************************
- * 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.view.web.components;
-
-import java.util.Collection;
-import org.eclipse.osee.display.api.data.ViewArtifact;
-import org.eclipse.osee.display.view.web.CssConstants;
-import com.vaadin.ui.HorizontalLayout;
-import com.vaadin.ui.Label;
-
-/**
- * @author Shawn F. Cook
- */
-@SuppressWarnings("serial")
-public class OseeBreadcrumbComponent extends HorizontalLayout {
- private ViewArtifact artifact;
- private boolean fixedHeight = false;
-
- public OseeBreadcrumbComponent(ViewArtifact artifact) {
- this.artifact = artifact;
- createLayout();
- }
-
- public OseeBreadcrumbComponent() {
- createLayout();
- }
-
- public OseeBreadcrumbComponent(boolean fixedHeight) {
- this.fixedHeight = fixedHeight;
- createLayout();
- }
-
- private void createLayout() {
- removeAllComponents();
-
- if (artifact != null && artifact.getAncestry() != null && artifact.getAncestry().size() > 0) {
- Collection<ViewArtifact> ancestryList = artifact.getAncestry();
- if (ancestryList.size() > 0) {
- Object[] ancestryArray = ancestryList.toArray();
- for (int i = ancestryArray.length - 1; i >= 0; i--) {
- ViewArtifact ancestor = (ViewArtifact) ancestryArray[i];
- OseeArtifactNameLinkComponent crumbLabel =
- new OseeArtifactNameLinkComponent(ancestor, CssConstants.OSEE_BREADCRUMB_ARTNAME, false);
- addComponent(crumbLabel);
- if (i > 0) {
- Label delimiter = new Label("&nbsp; >> &nbsp;", Label.CONTENT_XHTML);
- delimiter.setHeight(null);
- addComponent(delimiter);
- }
- }
- }
- } else {
- if (fixedHeight) {
- Label vSpacer = new Label();
- vSpacer.setHeight(15, UNITS_PIXELS);
- addComponent(vSpacer);
- }
- }
- }
-
- public void updateLayout() {
- createLayout();
- }
-
- public void setArtifact(ViewArtifact artifact) {
- this.artifact = artifact;
- createLayout();
- }
-}
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
deleted file mode 100644
index 474be9a87a..0000000000
--- a/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/components/OseeDisplayOptionsComponentImpl.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*******************************************************************************
- * 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.view.web.components;
-
-import org.eclipse.osee.display.api.components.DisplayOptionsComponent;
-import org.eclipse.osee.display.api.data.DisplayOptions;
-import org.eclipse.osee.display.api.search.SearchNavigator;
-import org.eclipse.osee.display.api.search.SearchPresenter;
-import com.vaadin.data.Property;
-import com.vaadin.data.Property.ValueChangeEvent;
-import com.vaadin.ui.CheckBox;
-import com.vaadin.ui.VerticalLayout;
-
-/**
- * @author Shawn F. Cook
- */
-@SuppressWarnings("serial")
-public class OseeDisplayOptionsComponentImpl extends VerticalLayout implements DisplayOptionsComponent {
-
- private final CheckBox showVerboseCheckBox = new CheckBox("Show Detailed Results", false);
- private Boolean lock_InhibitActionFromServer = false;
- private boolean isLayoutComplete = false;
-
- @Override
- public void attach() {
- if (!isLayoutComplete) {
- createLayout();
- isLayoutComplete = true;
- }
- }
-
- private void createLayout() {
- setSizeFull();
-
- showVerboseCheckBox.setImmediate(true);
- showVerboseCheckBox.addListener(new Property.ValueChangeListener() {
- @Override
- public void valueChange(ValueChangeEvent event) {
- synchronized (lock_InhibitActionFromServer) {
- if (!lock_InhibitActionFromServer) {
- boolean showVerbose = showVerboseCheckBox.toString().equalsIgnoreCase("true");
- onBoxChecked(showVerbose);
- }
- }
- }
- });
-
- addComponent(showVerboseCheckBox);
- }
-
- @Override
- public void clearAll() {
- showVerboseCheckBox.setValue(false);
- }
-
- @Override
- public void setDisplayOptions(DisplayOptions options) {
- if (options != null) {
- boolean showVerbose_fromPres = options.getVerboseResults();
- boolean showVerbose_fromUi = showVerboseCheckBox.toString().equalsIgnoreCase("true");
- if (showVerbose_fromUi != showVerbose_fromPres) {
- synchronized (lock_InhibitActionFromServer) {
- lock_InhibitActionFromServer = true;
- showVerboseCheckBox.setValue(showVerbose_fromPres);
- lock_InhibitActionFromServer = false;
- }
- }
- } else {
- ComponentUtility.logWarn("OseeDisplayOptionsComponentImpl.setDisplayOptions - WARNING: null value detected.",
- this);
- }
- }
-
- private void onBoxChecked(boolean isShowVerbose) {
- DisplayOptions options = new DisplayOptions(isShowVerbose);
-
- String url = ComponentUtility.getUrl(OseeDisplayOptionsComponentImpl.this);
- SearchNavigator navigator = ComponentUtility.getNavigator(OseeDisplayOptionsComponentImpl.this);
- SearchPresenter<?, ?> presenter = ComponentUtility.getPresenter(OseeDisplayOptionsComponentImpl.this);
- if (presenter != null) {
- presenter.selectDisplayOptions(url, options, navigator);
- } else {
- ComponentUtility.logWarn("OseeDisplayOptionsComponentImpl.onBoxChecked - WARNING: null value detected.", this);
- }
- }
-
- public void enableDisplayOptions() {
- showVerboseCheckBox.setEnabled(true);
- }
-
- public void disableDisplayOptions() {
- showVerboseCheckBox.setEnabled(false);
- }
-}
diff --git a/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/components/OseeExceptionDialogComponent.java b/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/components/OseeExceptionDialogComponent.java
deleted file mode 100644
index 6db88fc46b..0000000000
--- a/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/components/OseeExceptionDialogComponent.java
+++ /dev/null
@@ -1,359 +0,0 @@
-/*******************************************************************************
- * 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.view.web.components;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-import org.eclipse.osee.display.api.EmailView;
-import org.eclipse.osee.display.api.components.DisplaysErrorComponent.MsgType;
-import org.eclipse.osee.display.view.web.CssConstants;
-import com.vaadin.data.Property;
-import com.vaadin.event.ShortcutAction.KeyCode;
-import com.vaadin.terminal.ThemeResource;
-import com.vaadin.ui.Alignment;
-import com.vaadin.ui.Button;
-import com.vaadin.ui.HorizontalLayout;
-import com.vaadin.ui.Label;
-import com.vaadin.ui.TextField;
-import com.vaadin.ui.VerticalLayout;
-import com.vaadin.ui.Window;
-
-/**
- * @author Shawn F. Cook
- */
-@SuppressWarnings("serial")
-public class OseeExceptionDialogComponent extends Window implements EmailView {
-
- private final Label msgTypeLabel = new Label();
- private final Button closeButton = new Button();
- private final Label shortMsgLabel = new Label();
- private final TextField longMsgTextArea = new TextField();
- private final Button showHideDetailsButton = new Button("Show Details");
- private final Button emailButton = new Button("Email Support");
- private final Button emailSendButton = new Button("Send");
- private final Label emailSubjectLabel = new Label();
- private final TextField emailRecipTextArea = new TextField();
- private final TextField emailBodyTextArea = new TextField();
- private final Label emailStatusLabel = new Label();
- private final Label emailDisplayMsgLabel = new Label();
- private final VerticalLayout vLayout_Email = new VerticalLayout();
- private final Window mainWindow;
- private final int HEIGHT_CLOSED = 100;
- private final int HEIGHT_OPEN = 210;
- private final int WIDTH = 400;
- private final int MARGIN = 15;
- private String fromEmail = "";
- private Collection<String> replyToEmails = new ArrayList<String>();
- private Collection<String> recipientsEmails = new ArrayList<String>();
- private final Collection<SendListener> sendListeners = new ArrayList<SendListener>();
- private final Collection<Validator> validatorListeners = new ArrayList<Validator>();
-
- public OseeExceptionDialogComponent(MsgType msgType, String shortMsg, String longMsg, Window mainWindow) {
- this.mainWindow = mainWindow;
- createLayout();
-
- switch (msgType) {
- case MSGTYPE_ERROR:
- msgTypeLabel.setCaption("Error!");
- msgTypeLabel.setStyleName(CssConstants.OSEE_EXCEPTION_ERROR_TITLE_TEXT);
- break;
- case MSGTYPE_WARNING:
- msgTypeLabel.setCaption("Warning:");
- msgTypeLabel.setStyleName(CssConstants.OSEE_EXCEPTION_WARNING_TITLE_TEXT);
- break;
- default:
- ComponentUtility.logWarn("OseeExceptionDialogComponent.[ctor] - WARNING: invalid or unhandled msgType.",
- mainWindow);
- break;
- }
-
- shortMsgLabel.setCaption(shortMsg);
- StringBuilder sb = new StringBuilder();
- sb.append("[");
- sb.append(shortMsg);
- sb.append("]\n");
- sb.append(longMsg);
- longMsgTextArea.setValue(sb.toString());
-
- if (mainWindow != null) {
- mainWindow.addWindow(this);
- moveToCenter();
- focus();
- } else {
- ComponentUtility.logWarn("OseeExceptionDialogComponent.[ctor] - WARNING: null value detected.", mainWindow);
- }
- }
-
- private void moveToCenter() {
- float width = getApplication().getMainWindow().getWidth();
- float height = getApplication().getMainWindow().getHeight();
-
- float centerx = width / 2.0f;
- float centery = height / 2.0f;
-
- float halfwidth = this.getWidth() / 2.0f;
- float halfheight = this.getHeight() / 2.0f;
-
- float x = centerx - halfwidth;
- float y = centery - halfheight;
-
- setPositionX((int) x);
- setPositionY((int) y);
- }
-
- private void createLayout() {
- setWidth(WIDTH, UNITS_PIXELS);
- setHeight(HEIGHT_OPEN, UNITS_PIXELS);
- setCloseShortcut(KeyCode.ESCAPE);
- setScrollable(false);
- setStyleName(CssConstants.OSEE_EXCEPTION);
-
- VerticalLayout vLayout_body = new VerticalLayout();
- HorizontalLayout hLayout_Row0 = new HorizontalLayout();
- HorizontalLayout hLayout_Row1 = new HorizontalLayout();
- HorizontalLayout hLayout_Row2 = new HorizontalLayout();
- HorizontalLayout hLayout_Row3_Exception = new HorizontalLayout();
- HorizontalLayout hLayout_Row3_Email = new HorizontalLayout();
- HorizontalLayout hLayout_Row4_Email = new HorizontalLayout();
- HorizontalLayout hLayout_Row5_Email = new HorizontalLayout();
- HorizontalLayout hLayout_Row6_Email = new HorizontalLayout();
-
- Label vSpacer_AboveButtons = new Label();
- vSpacer_AboveButtons.setHeight(10, UNITS_PIXELS);
- Label vSpacer_AboveDetails = new Label();
- vSpacer_AboveDetails.setHeight(10, UNITS_PIXELS);
- Label vSpacer_Email_1 = new Label();
- vSpacer_Email_1.setHeight(10, UNITS_PIXELS);
- Label vSpacer_Email_2 = new Label();
- vSpacer_Email_2.setHeight(10, UNITS_PIXELS);
- Label hSpacer_EmailSubject = new Label();
- hSpacer_EmailSubject.setWidth(5, UNITS_PIXELS);
- Label hSpacer_EmailRecip = new Label();
- hSpacer_EmailRecip.setWidth(5, UNITS_PIXELS);
-
- closeButton.setStyleName("link");
- closeButton.setIcon(new ThemeResource("../osee/closebutton.png"));
- closeButton.addListener(new Button.ClickListener() {
- @Override
- public void buttonClick(Button.ClickEvent event) {
- mainWindow.removeWindow(OseeExceptionDialogComponent.this);
- }
- });
- msgTypeLabel.setSizeUndefined();
- closeButton.setSizeUndefined();
-
- shortMsgLabel.setWidth(null);
-
- longMsgTextArea.setWidth(WIDTH - MARGIN, UNITS_PIXELS);
- longMsgTextArea.setHeight(HEIGHT_CLOSED, UNITS_PIXELS);
- longMsgTextArea.setVisible(false);
- longMsgTextArea.setStyleName(CssConstants.OSEE_EXCEPTION_LONGMSG);
- showHideDetailsButton.setStyleName("link");
- showHideDetailsButton.addListener(new Button.ClickListener() {
- @Override
- public void buttonClick(Button.ClickEvent event) {
- longMsgTextArea.setVisible(!longMsgTextArea.isVisible());
- if (longMsgTextArea.isVisible()) {
- showHideDetailsButton.setCaption("Hide Details");
- OseeExceptionDialogComponent.this.setHeight(HEIGHT_OPEN, UNITS_PIXELS);
- emailButton.setCaption("Email Support");
- vLayout_Email.setVisible(false);
- emailSendButton.setVisible(false);
- } else {
- showHideDetailsButton.setCaption("Show Details");
- OseeExceptionDialogComponent.this.setHeight(HEIGHT_CLOSED, UNITS_PIXELS);
- }
- }
- });
-
- Label emailSubjectTitle = new Label("Subject:");
- Label emailRecipTitle = new Label("Recipients:");
- vLayout_Email.setSizeFull();
- vLayout_Email.setVisible(false);
- emailSubjectTitle.setWidth(70, UNITS_PIXELS);
- emailSubjectTitle.setStyleName(CssConstants.OSEE_EMAILDIALOG_TITLES);
- emailRecipTitle.setWidth(70, UNITS_PIXELS);
- emailRecipTitle.setStyleName(CssConstants.OSEE_EMAILDIALOG_TITLES);
- emailSubjectLabel.setSizeFull();
- emailRecipTextArea.setWidth(100, UNITS_PERCENTAGE);
- emailBodyTextArea.setWidth(WIDTH - MARGIN, UNITS_PIXELS);
- emailBodyTextArea.setHeight(HEIGHT_CLOSED, UNITS_PIXELS);
- emailSendButton.setStyleName("link");
- emailButton.setStyleName("link");
- emailButton.addListener(new Button.ClickListener() {
- @Override
- public void buttonClick(Button.ClickEvent event) {
- vLayout_Email.setVisible(!vLayout_Email.isVisible());
- if (vLayout_Email.isVisible()) {
- emailButton.setCaption("Cancel");
- OseeExceptionDialogComponent.this.setHeight(HEIGHT_OPEN + 70, UNITS_PIXELS);
- emailSendButton.setVisible(true);
- showHideDetailsButton.setCaption("Show Details");
- longMsgTextArea.setVisible(false);
- } else {
- emailButton.setCaption("Email Support");
- emailSendButton.setVisible(false);
- OseeExceptionDialogComponent.this.setHeight(HEIGHT_CLOSED, UNITS_PIXELS);
- }
- }
- });
- emailSendButton.addListener(new Button.ClickListener() {
- @Override
- public void buttonClick(Button.ClickEvent event) {
- //TODO: Send email.
- }
- });
- emailStatusLabel.setSizeFull();
- emailDisplayMsgLabel.setSizeFull();
-
- vLayout_body.setStyleName(CssConstants.OSEE_EXCEPTION);
- vLayout_body.setWidth(WIDTH - MARGIN, UNITS_PIXELS);
-
- hLayout_Row0.setSizeFull();
- hLayout_Row1.setSizeFull();
- hLayout_Row2.setSizeFull();
- hLayout_Row3_Exception.setSizeFull();
- hLayout_Row3_Email.setSizeFull();
- hLayout_Row4_Email.setSizeFull();
- hLayout_Row5_Email.setSizeFull();
- vLayout_Email.setSizeFull();
-
- hLayout_Row0.addComponent(msgTypeLabel);
- hLayout_Row0.addComponent(closeButton);
- hLayout_Row1.addComponent(shortMsgLabel);
- hLayout_Row2.addComponent(showHideDetailsButton);
- // hLayout_Row2.addComponent(emailButton);
- hLayout_Row2.addComponent(emailSendButton);
-
- hLayout_Row3_Exception.addComponent(longMsgTextArea);
-
- hLayout_Row3_Email.addComponent(emailSubjectTitle);
- hLayout_Row3_Email.addComponent(hSpacer_EmailSubject);
- hLayout_Row3_Email.addComponent(emailSubjectLabel);
- hLayout_Row4_Email.addComponent(emailRecipTitle);
- hLayout_Row4_Email.addComponent(hSpacer_EmailRecip);
- hLayout_Row4_Email.addComponent(emailRecipTextArea);
- hLayout_Row5_Email.addComponent(emailBodyTextArea);
- hLayout_Row6_Email.addComponent(emailStatusLabel);
- hLayout_Row6_Email.addComponent(emailDisplayMsgLabel);
- vLayout_Email.addComponent(hLayout_Row3_Email);
- vLayout_Email.addComponent(vSpacer_Email_1);
- vLayout_Email.addComponent(hLayout_Row4_Email);
- vLayout_Email.addComponent(vSpacer_Email_2);
- vLayout_Email.addComponent(hLayout_Row5_Email);
- vLayout_Email.addComponent(hLayout_Row6_Email);
-
- vLayout_body.addComponent(hLayout_Row0);
- vLayout_body.addComponent(hLayout_Row1);
- vLayout_body.addComponent(vSpacer_AboveButtons);
- vLayout_body.addComponent(hLayout_Row2);
- vLayout_body.addComponent(vSpacer_AboveDetails);
- vLayout_body.addComponent(hLayout_Row3_Exception);
- vLayout_body.addComponent(vLayout_Email);
- setContent(vLayout_body);
-
- hLayout_Row0.setComponentAlignment(closeButton, Alignment.TOP_RIGHT);
- hLayout_Row3_Email.setExpandRatio(emailSubjectLabel, 1.0f);
- hLayout_Row4_Email.setExpandRatio(emailRecipTextArea, 1.0f);
- }
-
- private void emailListToPropertyValue(Property property, Collection<String> emails) {
- StringBuilder sb = new StringBuilder();
- Iterator<String> iter = emails.iterator();
- while (iter.hasNext()) {
- String email = iter.next();
- sb.append(email);
- if (iter.hasNext()) {
- sb.append(", ");
- }
- }
- }
-
- @Override
- public void setFrom(String email) {
- fromEmail = email;
- }
-
- @Override
- public String getFrom() {
- return fromEmail;
- }
-
- @Override
- public void setReplyTo(Collection<String> emails) {
- replyToEmails.clear();
- replyToEmails.addAll(emails);
- }
-
- @Override
- public Collection<String> getReplyTos() {
- return replyToEmails;
- }
-
- @Override
- public void setRecipients(Collection<String> emails) {
- recipientsEmails.clear();
- recipientsEmails.addAll(emails);
- emailListToPropertyValue(emailRecipTextArea, emails);
- }
-
- @Override
- public Collection<String> getRecipients() {
- return recipientsEmails;
- }
-
- @Override
- public void setSubject(String subject) {
- emailSubjectLabel.setValue(subject);
- }
-
- @Override
- public String getSubject() {
- return (String) emailSubjectLabel.getValue();
- }
-
- @Override
- public void setBody(String body) {
- emailBodyTextArea.setValue(body);
- }
-
- @Override
- public String getBody() {
- return (String) emailBodyTextArea.getValue();
- }
-
- @Override
- public void setEmailStatus(EmailSendStatus status) {
- emailStatusLabel.setValue(status);
- }
-
- @Override
- public void addOnSendListener(SendListener listener) {
- sendListeners.add(listener);
- }
-
- @Override
- public void addEmailValidator(Validator validator) {
- validatorListeners.add(validator);
- }
-
- @Override
- public void displayMessage(String caption) {
- emailDisplayMsgLabel.setValue(caption);
- }
-
- @Override
- public void displayMessage(String caption, String description) {
- emailDisplayMsgLabel.setValue(caption);
- emailDisplayMsgLabel.setDescription(description);//tooltip
- }
-}
diff --git a/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/components/OseeLeftMarginContainer.java b/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/components/OseeLeftMarginContainer.java
deleted file mode 100644
index 4c075568fe..0000000000
--- a/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/components/OseeLeftMarginContainer.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * 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.view.web.components;
-
-import org.eclipse.osee.display.view.web.CssConstants;
-import com.vaadin.ui.HorizontalLayout;
-import com.vaadin.ui.Label;
-
-/**
- * @author Shawn F. Cook
- */
-@SuppressWarnings("serial")
-public class OseeLeftMarginContainer extends HorizontalLayout {
- private Label hSpacer_LeftMargin = new Label();
-
- public OseeLeftMarginContainer() {
- super();
-
- setSizeUndefined();
-
- hSpacer_LeftMargin.setWidth(CssConstants.OSEE_LEFTMARGINWIDTH, UNITS_PIXELS);
-
- addComponent(hSpacer_LeftMargin);
- }
-
-}
diff --git a/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/components/OseeLogoLink.java b/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/components/OseeLogoLink.java
deleted file mode 100644
index f2a3ccef5b..0000000000
--- a/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/components/OseeLogoLink.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*******************************************************************************
- * 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.view.web.components;
-
-import com.vaadin.terminal.ExternalResource;
-import com.vaadin.terminal.Resource;
-import com.vaadin.terminal.ThemeResource;
-import com.vaadin.ui.Link;
-
-@SuppressWarnings("serial")
-public class OseeLogoLink extends Link {
-
- public OseeLogoLink(String styleName, Class<?> viewClass) {
- //super("", new ExternalResource(String.format("ats#%s", navigator.getUri(viewClass))));
- super("", new ExternalResource("ats"));
- Resource logoIconRes = new ThemeResource("../osee/osee_large.png");
- setIcon(logoIconRes);
- setStyleName(styleName);
- }
-}
diff --git a/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/components/OseePagingComponent.java b/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/components/OseePagingComponent.java
deleted file mode 100644
index 4aec7c8efd..0000000000
--- a/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/components/OseePagingComponent.java
+++ /dev/null
@@ -1,343 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011 Boeing.
- * All rightsimport com.vaadin.Application;
-import com.vaadin.service.ApplicationContext.TransactionListener;
-he 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.view.web.components;
-
-import java.io.Serializable;
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.Collection;
-import org.eclipse.osee.display.api.components.PagingComponent;
-import org.eclipse.osee.display.view.web.CssConstants;
-import com.vaadin.ui.Button;
-import com.vaadin.ui.Button.ClickEvent;
-import com.vaadin.ui.Component;
-import com.vaadin.ui.HorizontalLayout;
-import com.vaadin.ui.Label;
-
-/**
- * @author Shawn F. Cook
- */
-@SuppressWarnings("serial")
-public class OseePagingComponent extends HorizontalLayout implements PagingComponent {
-
- private int manyItemsTotal = 0;
- private int manyItemsPerPage = 15;
- private boolean allItemsPerPage = false;//If TRUE then manyItemsPerPage is ignored.
- private int manyPages = 0;
- private int currentPage = 0;
- private final int MAX_PAGE_NUMBERS_SHOWN = 4;
- private final Button firstButton = new Button("<< First");
- private final Button previousButton = new Button("< Prev");
- private final Button nextButton = new Button("Next >");
- private final Button lastButton = new Button("Last >>");
- private final HorizontalLayout hLayout_PageNumbers = new HorizontalLayout();
-
- public OseePagingComponent() {
- super();
- createLayout();
- }
-
- private void updateManyPages() {
- if (manyItemsPerPage > 0) {
- manyPages = manyItemsTotal / manyItemsPerPage;
- int remainder = manyItemsTotal % manyItemsPerPage;
- if (remainder > 0) {
- manyPages += 1; //round up.
- }
- }
- setCurrentPage(currentPage);
- }
-
- @Override
- public void setManyItemsTotal(int manyItemsTotal) {
- this.manyItemsTotal = manyItemsTotal;
- updateManyPages();
- // updateLayout();<--Not needed because it is called in updateManyPages()
- }
-
- public void setCurrentPage(int currentPage) {
- this.currentPage = currentPage;
- if (this.currentPage < 0) {
- this.currentPage = 0;
- }
-
- if (this.currentPage >= manyPages) {
- this.currentPage = manyPages - 1;
- }
-
- if (manyPages == 0) {
- this.currentPage = 0;
- }
- updateLayout();
- }
-
- private void createLayout() {
- setSizeUndefined();
-
- Label spacer1 = new Label();
- spacer1.setWidth(15, UNITS_PIXELS);
-
- Label spacer2 = new Label();
- spacer2.setWidth(15, UNITS_PIXELS);
-
- Label spacer3 = new Label();
- spacer3.setWidth(15, UNITS_PIXELS);
-
- Label spacer4 = new Label();
- spacer4.setWidth(15, UNITS_PIXELS);
-
- firstButton.addListener(new Button.ClickListener() {
- @Override
- public void buttonClick(ClickEvent event) {
- OseePagingComponent.this.setCurrentPage(0);
- fireEvent(new PageSelectedEvent(OseePagingComponent.this));
- }
- });
-
- previousButton.addListener(new Button.ClickListener() {
- @Override
- public void buttonClick(ClickEvent event) {
- OseePagingComponent.this.setCurrentPage(currentPage - 1);
- fireEvent(new PageSelectedEvent(OseePagingComponent.this));
- }
- });
-
- nextButton.addListener(new Button.ClickListener() {
- @Override
- public void buttonClick(ClickEvent event) {
- OseePagingComponent.this.setCurrentPage(currentPage + 1);
- fireEvent(new PageSelectedEvent(OseePagingComponent.this));
- }
- });
-
- lastButton.addListener(new Button.ClickListener() {
- @Override
- public void buttonClick(ClickEvent event) {
- OseePagingComponent.this.setCurrentPage(manyPages - 1);
- fireEvent(new PageSelectedEvent(OseePagingComponent.this));
- }
- });
-
- addComponent(firstButton);
- addComponent(spacer1);
- addComponent(previousButton);
- addComponent(spacer2);
- addComponent(hLayout_PageNumbers);
- addComponent(spacer3);
- addComponent(nextButton);
- addComponent(spacer4);
- addComponent(lastButton);
- }
-
- private void updateLayout() {
- if (getApplication() == null) {
- return;
- }
- synchronized (getApplication()) {
- if (allItemsPerPage) {
- firstButton.setEnabled(false);
- previousButton.setEnabled(false);
- nextButton.setEnabled(false);
- lastButton.setEnabled(false);
- } else {
- if (manyPages <= 0) {
- firstButton.setEnabled(false);
- previousButton.setEnabled(false);
- nextButton.setEnabled(false);
- lastButton.setEnabled(false);
- }
-
- if (currentPage <= 0) {
- firstButton.setEnabled(false);
- previousButton.setEnabled(false);
- } else {
- firstButton.setEnabled(true);
- previousButton.setEnabled(true);
- }
-
- if (currentPage >= manyPages - 1) {
- nextButton.setEnabled(false);
- lastButton.setEnabled(false);
- } else {
- nextButton.setEnabled(true);
- lastButton.setEnabled(true);
- }
- }
-
- //Update page numbers
- hLayout_PageNumbers.removeAllComponents();
- if (allItemsPerPage) {
- Label pageLabel = new Label(String.format("1"));
- pageLabel.setStyleName(CssConstants.OSEE_CURRENTPAGELABEL);
-
- Label spacer = new Label();
- spacer.setWidth(7, UNITS_PIXELS);
-
- hLayout_PageNumbers.addComponent(pageLabel);
- hLayout_PageNumbers.addComponent(spacer);
- } else {
- int startPage = 0;
- int endPage = manyPages - 1;
-
- //If there are more pages than MAX_PAGE_NUMBERS_SHOWN, then we need to reduce
- // the number of pages shown.
- // if (manyPages > 0 && manyPages > currentPage && MAX_PAGE_NUMBERS_SHOWN > (manyPages - currentPage)) {
- int pageSetIndex = currentPage / MAX_PAGE_NUMBERS_SHOWN;
- startPage = pageSetIndex * MAX_PAGE_NUMBERS_SHOWN;
- endPage = startPage + MAX_PAGE_NUMBERS_SHOWN;
- // }
-
- if (endPage >= manyPages) {
- endPage = manyPages - 1;
- }
-
- if (startPage != 0) {
- Label pageLabel = new Label("...");
-
- Label spacer = new Label();
- spacer.setWidth(7, UNITS_PIXELS);
-
- hLayout_PageNumbers.addComponent(pageLabel);
- hLayout_PageNumbers.addComponent(spacer);
- }
-
- for (int i = startPage; i <= endPage; i++) {
- if (i == currentPage) {
- Label pageLabel = new Label(String.format("%d", i + 1));
- pageLabel.setStyleName(CssConstants.OSEE_CURRENTPAGELABEL);
-
- hLayout_PageNumbers.addComponent(pageLabel);
- } else {
- Button pageButton = new Button(String.format("%d", i + 1));
- pageButton.setStyleName("link");
- final int index = i;//needs to be 'final' for use with listener below
- pageButton.addListener(new Button.ClickListener() {
- @Override
- public void buttonClick(ClickEvent event) {
- OseePagingComponent.this.setCurrentPage(index);
- fireEvent(new PageSelectedEvent(OseePagingComponent.this));
- }
- });
-
- hLayout_PageNumbers.addComponent(pageButton);
- }
-
- if (i <= endPage) {
- Label spacer = new Label();
- spacer.setWidth(7, UNITS_PIXELS);
- hLayout_PageNumbers.addComponent(spacer);
- }
- }
-
- if (endPage != manyPages - 1) {
- Label pageLabel = new Label("...");
-
- Label spacer = new Label();
- spacer.setWidth(7, UNITS_PIXELS);
-
- hLayout_PageNumbers.addComponent(pageLabel);
- hLayout_PageNumbers.addComponent(spacer);
- }
- }
- }
- }
-
- public interface PageSelectedListener extends Serializable {
- public void pageSelected(PageSelectedEvent source);
- }
-
- public class PageSelectedEvent extends Component.Event {
-
- public PageSelectedEvent(Component source) {
- super(source);
- }
- }
-
- private static Method PAGE_SELECTED_METHOD;
-
- static {
- try {
- PAGE_SELECTED_METHOD = PageSelectedListener.class.getDeclaredMethod("pageSelected", PageSelectedEvent.class);
- } catch (final java.lang.NoSuchMethodException e) {
- // This should never happen
- throw new java.lang.RuntimeException("Internal error finding methods in PageSelectedListener");
- }
- }
-
- public void addListener(PageSelectedListener listener) {
- addListener(PageSelectedEvent.class, listener, PAGE_SELECTED_METHOD);
- }
-
- public void removeListener(PageSelectedListener listener) {
- removeListener(PageSelectedEvent.class, listener, PAGE_SELECTED_METHOD);
- }
-
- @Override
- public void gotoFirstPage() {
- this.setCurrentPage(0);
- updateLayout();
- }
-
- @Override
- public void gotoPrevPage() {
- this.setCurrentPage(currentPage - 1);
- updateLayout();
- }
-
- @Override
- public void gotoNextPage() {
- this.setCurrentPage(currentPage + 1);
- updateLayout();
- }
-
- @Override
- public void gotoLastPage() {
- this.setCurrentPage(manyPages - 1);
- updateLayout();
- }
-
- @Override
- public Collection<Integer> getCurrentVisibleItemIndices() {
- Collection<Integer> ret = new ArrayList<Integer>();
- if (allItemsPerPage) {
- for (int i = 0; i < manyItemsTotal; i++) {
- ret.add(new Integer(i));
- }
- } else if (currentPage <= manyPages) {
- for (int i = 0; i < manyItemsPerPage; i++) {
- int itemIndex = (currentPage * manyItemsPerPage) + i;
- if (itemIndex < manyItemsTotal) {
- ret.add(new Integer(itemIndex));
- }
- }
- }
- return ret;
- }
-
- @Override
- public void setManyItemsPerPage(int manyItemsPerPage) {
- this.manyItemsPerPage = manyItemsPerPage;
- this.allItemsPerPage = false;
- updateManyPages();
- }
-
- @Override
- public int getManyItemsPerPage() {
- return this.manyItemsPerPage;
- }
-
- @Override
- public void setAllItemsPerPage() {
- this.allItemsPerPage = true;
- updateManyPages();
- }
-}
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
deleted file mode 100644
index 8ecd59b1cd..0000000000
--- a/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/components/OseeRelationsComponent.java
+++ /dev/null
@@ -1,277 +0,0 @@
-/*******************************************************************************
- * 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.view.web.components;
-
-import org.eclipse.osee.display.api.components.RelationComponent;
-import org.eclipse.osee.display.api.data.ViewArtifact;
-import org.eclipse.osee.display.api.data.ViewId;
-import org.eclipse.osee.display.api.search.SearchNavigator;
-import org.eclipse.osee.display.api.search.SearchPresenter;
-import org.eclipse.osee.display.view.web.CssConstants;
-import com.vaadin.data.Property;
-import com.vaadin.data.Property.ValueChangeEvent;
-import com.vaadin.ui.Alignment;
-import com.vaadin.ui.HorizontalLayout;
-import com.vaadin.ui.Label;
-import com.vaadin.ui.ListSelect;
-import com.vaadin.ui.VerticalLayout;
-
-/**
- * @author Shawn F. Cook
- */
-@SuppressWarnings("serial")
-public class OseeRelationsComponent extends VerticalLayout implements RelationComponent {
-
- private final ListSelect relTypesSelect = new ListSelect();
- private final ListSelect leftSelect = new ListSelect();
- private final ListSelect rightSelect = new ListSelect();
- private boolean lockRelTypesListener = false;
- private boolean lockRelsListener = false;
- private ViewArtifact artifact = null;
- private final int LISTBOX_MINWIDTH = 100;
- private final Label leftTitle = new Label("");
- private final Label relTypesTitle = new Label("Relation Type");
- private final Label rightTitle = new Label("");
-
- @Override
- public void attach() {
- createLayout();
- }
-
- private void createLayout() {
- setSizeUndefined();
- removeAllComponents();
-
- final HorizontalLayout listBoxesLayout = new HorizontalLayout();
-
- Label titleLabel = new Label("Relations");
- titleLabel.setStyleName(CssConstants.OSEE_ATTRIBUTESTITLELABEL);
-
- leftTitle.setStyleName(CssConstants.OSEE_ATTRIBUTELABEL);
- relTypesTitle.setStyleName(CssConstants.OSEE_ATTRIBUTELABEL);
- rightTitle.setStyleName(CssConstants.OSEE_ATTRIBUTELABEL);
-
- //Fixed width lists make for a prettier layout
- relTypesSelect.setWidth(LISTBOX_MINWIDTH, UNITS_PIXELS);
- leftSelect.setWidth(LISTBOX_MINWIDTH, UNITS_PIXELS);
- rightSelect.setWidth(LISTBOX_MINWIDTH, UNITS_PIXELS);
-
- relTypesSelect.setNullSelectionAllowed(false);
- relTypesSelect.setImmediate(true);
-
- leftSelect.setNullSelectionAllowed(false);
- leftSelect.setImmediate(true);
-
- rightSelect.setNullSelectionAllowed(false);
- rightSelect.setImmediate(true);
-
- relTypesSelect.addListener(new Property.ValueChangeListener() {
- @Override
- public void valueChange(ValueChangeEvent event) {
- if (!lockRelTypesListener) {
- try {
- ViewId relationType = (ViewId) relTypesSelect.getValue();
- if (relationType != null) {
- SearchPresenter<?, ?> presenter = ComponentUtility.getPresenter(OseeRelationsComponent.this);
- presenter.selectRelationType(artifact, relationType, OseeRelationsComponent.this);
- }
- } catch (Exception e) {
- ComponentUtility.logError(
- "OseeRelationsComponent.createLayout - CRITICAL ERROR: (WebArtifact) relationsListSelect.getValue() threw an exception:" + e.getMessage() + e.getStackTrace(),
- OseeRelationsComponent.this);
- }
- }
- }
- });
-
- leftSelect.addListener(new Property.ValueChangeListener() {
- @Override
- public void valueChange(ValueChangeEvent event) {
- if (!lockRelsListener) {
- try {
- ViewArtifact artifact = (ViewArtifact) leftSelect.getValue();
- selectArtifact(artifact);
- } catch (Exception e) {
- ComponentUtility.logError(
- "OseeRelationsComponent.createLayout - CRITICAL ERROR: (WebArtifact) relationsListSelect.getValue() threw an exception.",
- OseeRelationsComponent.this);
- }
- }
- }
- });
-
- rightSelect.addListener(new Property.ValueChangeListener() {
- @Override
- public void valueChange(ValueChangeEvent event) {
- if (!lockRelsListener) {
- try {
- ViewArtifact artifact = (ViewArtifact) rightSelect.getValue();
- selectArtifact(artifact);
- } catch (Exception e) {
- ComponentUtility.logError(
- "OseeRelationsComponent.createLayout - CRITICAL ERROR: (WebArtifact) relationsListSelect.getValue() threw an exception.",
- OseeRelationsComponent.this);
- }
- }
- }
- });
-
- VerticalLayout vLayout_LeftSelect = new VerticalLayout();
- VerticalLayout vLayout_RelTypesSelect = new VerticalLayout();
- VerticalLayout vLayout_RightSelect = new VerticalLayout();
-
- vLayout_LeftSelect.addComponent(leftTitle);
- vLayout_LeftSelect.addComponent(leftSelect);
-
- vLayout_RelTypesSelect.addComponent(relTypesTitle);
- vLayout_RelTypesSelect.addComponent(relTypesSelect);
-
- vLayout_RightSelect.addComponent(rightTitle);
- vLayout_RightSelect.addComponent(rightSelect);
-
- Label spacer = new Label();
- spacer.setWidth(15, UNITS_PIXELS);
-
- Label leftArrow = new Label();
- leftArrow.setStyleName(CssConstants.OSEE_LEFTARROW);
-
- Label rightArrow = new Label();
- rightArrow.setStyleName(CssConstants.OSEE_RIGHTARROW);
-
- listBoxesLayout.addComponent(spacer);
- listBoxesLayout.addComponent(vLayout_LeftSelect);
- listBoxesLayout.addComponent(leftArrow);
- listBoxesLayout.addComponent(vLayout_RelTypesSelect);
- listBoxesLayout.addComponent(rightArrow);
- listBoxesLayout.addComponent(vLayout_RightSelect);
-
- addComponent(titleLabel);
- addComponent(listBoxesLayout);
-
- vLayout_LeftSelect.setComponentAlignment(leftTitle, Alignment.BOTTOM_CENTER);
- vLayout_LeftSelect.setComponentAlignment(leftSelect, Alignment.BOTTOM_CENTER);
- vLayout_RelTypesSelect.setComponentAlignment(relTypesSelect, Alignment.BOTTOM_CENTER);
- vLayout_RelTypesSelect.setComponentAlignment(relTypesTitle, Alignment.MIDDLE_CENTER);
- vLayout_RightSelect.setComponentAlignment(rightTitle, Alignment.BOTTOM_CENTER);
- vLayout_RightSelect.setComponentAlignment(rightSelect, Alignment.BOTTOM_CENTER);
- listBoxesLayout.setComponentAlignment(vLayout_LeftSelect, Alignment.BOTTOM_CENTER);
- listBoxesLayout.setComponentAlignment(vLayout_RelTypesSelect, Alignment.BOTTOM_CENTER);
- listBoxesLayout.setComponentAlignment(vLayout_RightSelect, Alignment.BOTTOM_CENTER);
- listBoxesLayout.setComponentAlignment(rightArrow, Alignment.MIDDLE_CENTER);
- listBoxesLayout.setComponentAlignment(leftArrow, Alignment.MIDDLE_CENTER);
- setExpandRatio(listBoxesLayout, 1.0f);
- }
-
- private void selectArtifact(ViewArtifact artifact) {
- if (artifact != null) {
- String url = ComponentUtility.getUrl(OseeRelationsComponent.this);
- SearchPresenter<?, ?> presenter = ComponentUtility.getPresenter(OseeRelationsComponent.this);
- SearchNavigator navigator = ComponentUtility.getNavigator(OseeRelationsComponent.this);
- presenter.selectArtifact(url, artifact, navigator);
- } else {
- ComponentUtility.logWarn("OseeRelationsComponent.handleValue - WARNING: null value detected.", this);
- }
- }
-
- public OseeRelationsComponent() {
- createLayout();
- }
-
- @Override
- public void clearAll() {
- this.addRelationType(null);
- this.clearRelations();
- }
-
- @Override
- public void addRelationType(ViewId id) {
- if (id == null) {
- relTypesSelect.removeAllItems();
- relTypesSelect.setWidth(LISTBOX_MINWIDTH, UNITS_PIXELS);
- } else {
- relTypesSelect.setEnabled(true);
- if (relTypesSelect != null) {
- lockRelTypesListener = true;
- relTypesSelect.addItem(id);
- relTypesSelect.setWidth(null);
- lockRelTypesListener = false;
- }
- }
- }
-
- @Override
- public void clearRelations() {
- this.addLeftRelated(null);
- this.addRightRelated(null);
- this.setLeftName(null);
- this.setRightName(null);
- }
-
- @Override
- public void setErrorMessage(String shortMsg, String longMsg, MsgType msgType) {
- // do nothing
- }
-
- @Override
- public void setArtifact(ViewArtifact artifact) {
- this.artifact = artifact;
- }
-
- @Override
- public void addLeftRelated(ViewArtifact id) {
- if (id == null) {
- leftSelect.removeAllItems();
- leftSelect.setWidth(LISTBOX_MINWIDTH, UNITS_PIXELS);
- } else {
- leftSelect.setEnabled(true);
- if (leftSelect != null) {
- lockRelsListener = true;
- leftSelect.addItem(id);
- leftSelect.setWidth(null);
- lockRelsListener = false;
- }
- }
- }
-
- @Override
- public void addRightRelated(ViewArtifact id) {
- if (id == null) {
- rightSelect.removeAllItems();
- rightSelect.setWidth(LISTBOX_MINWIDTH, UNITS_PIXELS);
- } else {
- rightSelect.setEnabled(true);
- if (rightSelect != null) {
- lockRelsListener = true;
- rightSelect.addItem(id);
- rightSelect.setWidth(null);
- lockRelsListener = false;
- }
- }
- }
-
- @Override
- public void setLeftName(String name) {
- if (name == null) {
- leftTitle.setValue("");
- } else {
- leftTitle.setValue(name);
- }
- }
-
- @Override
- public void setRightName(String name) {
- if (name == null) {
- rightTitle.setValue("");
- } else {
- rightTitle.setValue(name);
- }
- }
-}
diff --git a/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/components/OseeSearchHeaderComponent.java b/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/components/OseeSearchHeaderComponent.java
deleted file mode 100644
index 174e40b8d5..0000000000
--- a/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/components/OseeSearchHeaderComponent.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*******************************************************************************
- * 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.view.web.components;
-
-import org.eclipse.osee.display.api.components.SearchHeaderComponent;
-import com.vaadin.ui.CustomComponent;
-
-/**
- * @author Shawn F. Cook
- */
-@SuppressWarnings("serial")
-public abstract class OseeSearchHeaderComponent extends CustomComponent implements SearchHeaderComponent {
- // do nothing
-}
diff --git a/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/components/OseeSearchResultComponent.java b/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/components/OseeSearchResultComponent.java
deleted file mode 100644
index 74cfeed22a..0000000000
--- a/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/components/OseeSearchResultComponent.java
+++ /dev/null
@@ -1,173 +0,0 @@
-/*******************************************************************************
- * 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.view.web.components;
-
-import org.eclipse.osee.display.api.components.SearchResultComponent;
-import org.eclipse.osee.display.api.data.DisplayOptions;
-import org.eclipse.osee.display.api.data.SearchResultMatch;
-import org.eclipse.osee.display.api.data.StyledText;
-import org.eclipse.osee.display.api.data.ViewArtifact;
-import org.eclipse.osee.display.view.web.CssConstants;
-import com.vaadin.ui.Alignment;
-import com.vaadin.ui.HorizontalLayout;
-import com.vaadin.ui.Label;
-import com.vaadin.ui.VerticalLayout;
-
-/**
- * @author Shawn F. Cook
- */
-@SuppressWarnings("serial")
-public class OseeSearchResultComponent extends VerticalLayout implements SearchResultComponent {
-
- private ViewArtifact artifact;
- private final OseeArtifactNameLinkComponent artifactName = new OseeArtifactNameLinkComponent();
- private final OseeBreadcrumbComponent breadcrumbComp = new OseeBreadcrumbComponent();
- private final VerticalLayout vLayout_Matches = new VerticalLayout();
- private final Label artifactType = new Label("", Label.CONTENT_XHTML);
- private final int TOPBOTTOM_VERT_SPACE = 8;
- private boolean isLayoutComplete = false;
-
- @Override
- public void attach() {
- if (!isLayoutComplete) {
- createLayout();
- isLayoutComplete = true;
- } else {
- breadcrumbComp.updateLayout();
- }
- }
-
- private void createLayout() {
- setSizeUndefined();
-
- HorizontalLayout row0 = new HorizontalLayout();
-
- Label spacer1 = new Label("");
- spacer1.setHeight(null);
- spacer1.setWidth(15, UNITS_PIXELS);
- artifactType.setStyleName(CssConstants.OSEE_SEARCHRESULT_ARTTYPE);
-
- Label bottomSpacer = new Label("");
- bottomSpacer.setHeight(TOPBOTTOM_VERT_SPACE, UNITS_PIXELS);
-
- Label topSpacer = new Label("");
- topSpacer.setHeight(TOPBOTTOM_VERT_SPACE, UNITS_PIXELS);
-
- row0.addComponent(artifactName);
- row0.addComponent(spacer1);
- row0.addComponent(artifactType);
-
- addComponent(topSpacer);
- addComponent(row0);
-
- addComponent(breadcrumbComp);
-
- addComponent(vLayout_Matches);
- addComponent(bottomSpacer);
-
- row0.setComponentAlignment(artifactName, Alignment.BOTTOM_LEFT);
- row0.setComponentAlignment(artifactType, Alignment.MIDDLE_LEFT);
- }
-
- @Override
- public void setArtifact(ViewArtifact artifact) {
- this.artifact = artifact;
- artifactName.setArtifact(this.artifact);
- breadcrumbComp.setArtifact(this.artifact);
- artifactType.setCaption(String.format("[%s]", artifact.getArtifactType()));
-
- }
-
- @Override
- public void addSearchResultMatch(SearchResultMatch match) {
- OseeSearchResultMatchComponent matchComp = new OseeSearchResultMatchComponent(match);
- vLayout_Matches.addComponent(matchComp);
- }
-
- @Override
- public void setErrorMessage(String shortMsg, String longMsg, MsgType msgType) {
- // do nothing
- }
-
- @Override
- public void setDisplayOptions(DisplayOptions options) {
- if (options != null) {
- boolean showVerbose = options.getVerboseResults();
- vLayout_Matches.setVisible(showVerbose);
- breadcrumbComp.setVisible(showVerbose);
- } else {
- ComponentUtility.logWarn("OseeSearchResultComponent.setDisplayOptions - WARNING: null value detected.", this);
- }
- }
-
- private class OseeSearchResultMatchComponent extends HorizontalLayout {
- public OseeSearchResultMatchComponent(SearchResultMatch match) {
- Label matchLabel = new Label(String.format("%s: ", match.getAttributeType()), Label.CONTENT_XHTML);
- matchLabel.setStyleName(CssConstants.OSEE_ATTRNAME);
- Label spacer4 = new Label();
- spacer4.setWidth(15, UNITS_PIXELS);
-
- int firstMatch = -1;
- int charsSinceFirst = 0;
- int displaySize = 50;
- String styleOpen = "<SPAN style=\"BACKGROUND-COLOR: #ffff00\">";
- String styleClose = "</SPAN>";
-
- StringBuilder builder = new StringBuilder();
- for (StyledText text : match.getData()) {
- if (text.isHighLighted()) {
- if (firstMatch == -1) {
- firstMatch = builder.length();
- }
- builder.append(styleOpen);
- if (charsSinceFirst <= 50) {
- displaySize += styleOpen.length() + styleClose.length();
- }
- }
-
- if (firstMatch != -1) {
- charsSinceFirst += text.getData().length();
- }
- builder.append(text.getData());
-
- if (text.isHighLighted()) {
- builder.append(styleClose);
- }
- }
-
- if (builder.length() > displaySize) {
- int end = Math.min(firstMatch + displaySize, builder.length());
- builder.delete(end, builder.length());
- builder.delete(0, firstMatch);
- if (end != builder.length()) {
- builder.append("...");
- }
- if (firstMatch != 0) {
- builder.insert(0, "...");
- }
- }
-
- Label matchLabelHint = new Label(builder.toString(), Label.CONTENT_XHTML);
- Label spacer3 = new Label();
- spacer3.setWidth(15, UNITS_PIXELS);
-
- Label matchManyLabel = new Label(String.format("(%d matches)", match.getManyMatches()), Label.CONTENT_XHTML);
- matchManyLabel.setStyleName(CssConstants.OSEE_SEARCHRESULT_MATCH_MANY);
-
- addComponent(matchLabel);
- addComponent(spacer4);
- addComponent(matchLabelHint);
- addComponent(spacer3);
- addComponent(matchManyLabel);
- }
- }
-
-}
diff --git a/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/components/OseeSearchResultsListComponent.java b/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/components/OseeSearchResultsListComponent.java
deleted file mode 100644
index 4ee20dd916..0000000000
--- a/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/components/OseeSearchResultsListComponent.java
+++ /dev/null
@@ -1,272 +0,0 @@
-/*******************************************************************************
- * 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.view.web.components;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-import org.eclipse.osee.display.api.components.SearchResultComponent;
-import org.eclipse.osee.display.api.components.SearchResultsListComponent;
-import org.eclipse.osee.display.api.search.SearchPresenter;
-import org.eclipse.osee.display.api.search.SearchProgressListener;
-import org.eclipse.osee.display.api.search.SearchProgressProvider;
-import org.eclipse.osee.display.view.web.CssConstants;
-import org.eclipse.osee.display.view.web.components.OseePagingComponent.PageSelectedEvent;
-import org.eclipse.osee.display.view.web.components.OseePagingComponent.PageSelectedListener;
-import com.vaadin.data.Property;
-import com.vaadin.data.Property.ValueChangeEvent;
-import com.vaadin.ui.Alignment;
-import com.vaadin.ui.ComboBox;
-import com.vaadin.ui.Component;
-import com.vaadin.ui.HorizontalLayout;
-import com.vaadin.ui.Label;
-import com.vaadin.ui.Panel;
-import com.vaadin.ui.VerticalLayout;
-
-/**
- * @author Shawn F. Cook
- */
-@SuppressWarnings("serial")
-public class OseeSearchResultsListComponent extends VerticalLayout implements SearchResultsListComponent, PageSelectedListener, SearchProgressListener {
-
- private final VerticalLayout mainLayout = new VerticalLayout();
- private final VerticalLayout bottomSpacer = new VerticalLayout();
- private final HorizontalLayout manySearchResultsHorizLayout = new HorizontalLayout();
- private final OseePagingComponent pagingComponent = new OseePagingComponent();
- private final List<OseeSearchResultComponent> resultList = new ArrayList<OseeSearchResultComponent>();
- private final OseeDisplayOptionsComponentImpl displayOptionsComponent = new OseeDisplayOptionsComponentImpl();
- private final ComboBox manyResultsComboBox = new ComboBox();
- private final int INIT_MANY_RES_PER_PAGE = 15;
- private final Label manySearchResults = new Label();
- private boolean isLayoutComplete = false;
- Label searchProgressLabel = new Label("No Results Found");
- private final VerticalLayout vLayout_searchProgress = new VerticalLayout();
-
- @Override
- public void attach() {
- if (!isLayoutComplete) {
- SearchPresenter<?, ?> searchPresenter = ComponentUtility.getPresenter(this);
- if (searchPresenter != null && searchPresenter instanceof SearchProgressProvider) {
- ((SearchProgressProvider) searchPresenter).addListener(this);
- }
- createLayout();
- isLayoutComplete = true;
- }
- }
-
- @Override
- public void clearAll() {
- resultList.clear();
- pagingComponent.gotoFirstPage();
- updateManySearchResultsLabel();
- updateSearchResultsLayout();
- }
-
- private void createLayout() {
- setSizeFull();
- pagingComponent.addListener(this);
- pagingComponent.setManyItemsPerPage(INIT_MANY_RES_PER_PAGE);
-
- manySearchResultsHorizLayout.setSizeUndefined();
-
- displayOptionsComponent.disableDisplayOptions();
-
- mainLayout.setMargin(false, false, false, true);
- Panel mainLayoutPanel = new Panel();
- mainLayoutPanel.setScrollable(true);
- mainLayoutPanel.getContent().setSizeUndefined();
- mainLayoutPanel.setSizeFull();
-
- bottomSpacer.setSizeFull();
-
- Label vSpacer_noResults = new Label();
- searchProgressLabel.setStyleName(CssConstants.OSEE_SEARCHRESULTS_NORESULTS);
- vSpacer_noResults.setHeight(8, UNITS_PIXELS);
-
- manyResultsComboBox.setImmediate(true);
- manyResultsComboBox.setTextInputAllowed(false);
- manyResultsComboBox.setNullSelectionAllowed(false);
- manyResultsComboBox.addItem("5");
- manyResultsComboBox.addItem("15");
- manyResultsComboBox.addItem("50");
- manyResultsComboBox.addItem("100");
- manyResultsComboBox.addItem("All");
- manyResultsComboBox.setValue((new Integer(INIT_MANY_RES_PER_PAGE)).toString());
- manyResultsComboBox.setWidth(50, UNITS_PIXELS);
- manyResultsComboBox.addListener(new Property.ValueChangeListener() {
- @Override
- public void valueChange(ValueChangeEvent event) {
- if (pagingComponent != null) {
- String manyItemsPerPage_str = (String) manyResultsComboBox.getValue();
- if (manyItemsPerPage_str.equalsIgnoreCase("All")) {
- pagingComponent.setAllItemsPerPage();
- } else {
- int manyItemsPerPage = Integer.parseInt(manyItemsPerPage_str);
- pagingComponent.setManyItemsPerPage(manyItemsPerPage);
- }
- updateSearchResultsLayout();
- }
- }
- });
-
- Label hSpacer_ManyRes = new Label();
- hSpacer_ManyRes.setWidth(5, UNITS_PIXELS);
- Label manySearchResults_suffix = new Label("Results Found");
- manySearchResults.setSizeUndefined();
- manySearchResults_suffix.setSizeUndefined();
- // manySearchResults.setStyleName(CssConstants.OSEE_SEARCHRESULT_MATCH_MANY);
-
- Label hSpacer_ManyResVerbose = new Label();
- hSpacer_ManyResVerbose.setWidth(30, UNITS_PIXELS);
-
- Label hSpacer_VerbosePerPage = new Label();
- hSpacer_VerbosePerPage.setWidth(30, UNITS_PIXELS);
- Label hSpacer_PerPage = new Label();
- hSpacer_PerPage.setWidth(5, UNITS_PIXELS);
- Label manyResultsLabel = new Label("Results Per Page");
-
- vLayout_searchProgress.addComponent(vSpacer_noResults);
- vLayout_searchProgress.addComponent(searchProgressLabel);
-
- manySearchResultsHorizLayout.addComponent(manySearchResults);
- manySearchResultsHorizLayout.addComponent(hSpacer_ManyRes);
- manySearchResultsHorizLayout.addComponent(manySearchResults_suffix);
- manySearchResultsHorizLayout.addComponent(hSpacer_ManyResVerbose);
- manySearchResultsHorizLayout.addComponent(displayOptionsComponent);
- manySearchResultsHorizLayout.addComponent(hSpacer_VerbosePerPage);
- manySearchResultsHorizLayout.addComponent(manyResultsComboBox);
- manySearchResultsHorizLayout.addComponent(hSpacer_PerPage);
- manySearchResultsHorizLayout.addComponent(manyResultsLabel);
-
- mainLayoutPanel.setContent(mainLayout);
- mainLayout.addComponent(vLayout_searchProgress);
- mainLayout.addComponent(bottomSpacer);
-
- addComponent(manySearchResultsHorizLayout);
- addComponent(mainLayoutPanel);
- addComponent(pagingComponent);
-
- manySearchResultsHorizLayout.setComponentAlignment(manyResultsComboBox, Alignment.TOP_CENTER);
- mainLayout.setExpandRatio(bottomSpacer, 1.0f);
- this.setExpandRatio(mainLayoutPanel, 1.0f);
- }
-
- private void updateManySearchResultsLabel() {
- String manyResults = String.format("%d", resultList.size());
- synchronized (getApplication()) {
- manySearchResults.setValue(manyResults);
- }
- pagingComponent.setManyItemsTotal(resultList.size());
- }
-
- private Collection<Component> getSearchResultComponents() {
- Collection<Component> resComp = new ArrayList<Component>();
- for (Iterator<Component> iter = mainLayout.getComponentIterator(); iter.hasNext();) {
- Component component = iter.next();
- if (component instanceof OseeSearchResultComponent) {
- resComp.add(component);
- }
- }
- return resComp;
- }
-
- private void updateSearchResultsLayout() {
- synchronized (getApplication()) {
- //if the list of currently visible items has not changed, then don't bother updating the layout
- Collection<Integer> resultListIndices = pagingComponent.getCurrentVisibleItemIndices();
-
- //First, remove the search result components
- for (Component component : getSearchResultComponents()) {
- mainLayout.removeComponent(component);
- }
-
- if (resultList.size() > 0) {
- //Next, add the result components to the layout that are on the current 'page'
- for (Integer i : resultListIndices) {
- try {
- OseeSearchResultComponent searchResultComp = resultList.get(i);
- int bottomIndex = mainLayout.getComponentIndex(bottomSpacer);
- mainLayout.addComponent(searchResultComp, bottomIndex);
- } catch (IndexOutOfBoundsException e) {
- ComponentUtility.logError(
- "OseeSearchResultsListComponent.updateSearchResultsLayout - CRITICAL ERROR: IndexOutOfBoundsException",
- this);
- }
- }
- }
- }
- }
-
- @Override
- public SearchResultComponent createSearchResult() {
- OseeSearchResultComponent searchResultComp = new OseeSearchResultComponent();
- resultList.add(searchResultComp);
-
- return searchResultComp;
- }
-
- @Override
- public void setErrorMessage(String shortMsg, String longMsg, MsgType msgType) {
- // do nothing
- }
-
- @Override
- public void pageSelected(PageSelectedEvent source) {
- updateSearchResultsLayout();
- }
-
- public OseeDisplayOptionsComponentImpl getDisplayOptionsComponent() {
- return displayOptionsComponent;
- }
-
- @Override
- public void searchInProgress() {
- displayOptionsComponent.disableDisplayOptions();
- searchProgressLabel.setValue("Searching");
- vLayout_searchProgress.setVisible(true);
- for (Component component : getSearchResultComponents()) {
- mainLayout.removeComponent(component);
- }
- }
-
- @Override
- public void searchCancelled() {
- if (resultList.size() > 0) {
- displayOptionsComponent.enableDisplayOptions();
- vLayout_searchProgress.setVisible(false);
- } else {
- searchProgressLabel.setValue("Search Cancelled");
- vLayout_searchProgress.setVisible(true);
- }
- updateManySearchResultsLabel();
- updateSearchResultsLayout();
- }
-
- @Override
- public void searchCompleted() {
- if (resultList.size() > 0) {
- displayOptionsComponent.enableDisplayOptions();
- vLayout_searchProgress.setVisible(false);
- } else {
- searchProgressLabel.setValue("No Results Found");
- vLayout_searchProgress.setVisible(true);
- }
- updateManySearchResultsLabel();
- updateSearchResultsLayout();
- }
-
- @Override
- public void noSearchResultsFound() {
- // do nothing
- }
-}
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
deleted file mode 100644
index 347c06ee08..0000000000
--- a/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/search/OseeArtifactView.java
+++ /dev/null
@@ -1,159 +0,0 @@
-/*******************************************************************************
- * 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.view.web.search;
-
-import org.eclipse.osee.display.api.components.ArtifactHeaderComponent;
-import org.eclipse.osee.display.api.data.ViewArtifact;
-import org.eclipse.osee.display.view.web.AbstractCommonView;
-import org.eclipse.osee.display.view.web.components.OseeArtifactNameLinkComponent;
-import org.eclipse.osee.display.view.web.components.OseeAttributeComponent;
-import org.eclipse.osee.display.view.web.components.OseeBreadcrumbComponent;
-import org.eclipse.osee.display.view.web.components.OseeLeftMarginContainer;
-import org.eclipse.osee.display.view.web.components.OseeRelationsComponent;
-import com.vaadin.ui.Alignment;
-import com.vaadin.ui.HorizontalLayout;
-import com.vaadin.ui.Label;
-import com.vaadin.ui.Panel;
-import com.vaadin.ui.VerticalLayout;
-
-/**
- * @author Shawn F. Cook
- */
-@SuppressWarnings("serial")
-public abstract class OseeArtifactView extends AbstractCommonView implements ArtifactHeaderComponent {
-
- protected final OseeRelationsComponent relationsComp = new OseeRelationsComponent();
- protected final OseeAttributeComponent attributeComp = new OseeAttributeComponent();
- private final OseeBreadcrumbComponent breadcrumbComp = new OseeBreadcrumbComponent(true);
- private final OseeArtifactNameLinkComponent artifactName = new OseeArtifactNameLinkComponent(true);
- private final Label artifactType = new Label("", Label.CONTENT_XHTML);
- private ViewArtifact artifact;
- private final int LEFTMARGIN_WIDTH = 5;
-
- @Override
- protected void createLayout() {
- setSizeFull();
-
- getSearchHeader().setWidth(100, UNITS_PERCENTAGE);
- getSearchHeader().setHeight(null);
-
- Label spacer = new Label();
- spacer.setHeight(5, UNITS_PIXELS);
-
- HorizontalLayout hLayout_LeftMargAndBody = new HorizontalLayout();
- hLayout_LeftMargAndBody.setSizeFull();
- Label leftMarginSpace = new Label("");
- leftMarginSpace.setWidth(LEFTMARGIN_WIDTH, UNITS_PIXELS);
- hLayout_LeftMargAndBody.addComponent(leftMarginSpace);
-
- VerticalLayout vLayout_OutBody = new VerticalLayout();
- vLayout_OutBody.setSizeFull();
-
- Label vSpacer = new Label();
- vSpacer.setHeight(5, UNITS_PIXELS);
-
- artifactName.setSizeUndefined();
-
- Label spacer1 = new Label();
- spacer1.setWidth(10, UNITS_PIXELS);
- spacer1.setHeight(null);
-
- artifactType.setSizeUndefined();
-
- HorizontalLayout hLayout_ArtNameAndType = new HorizontalLayout();
- hLayout_ArtNameAndType.setSizeUndefined();
-
- VerticalLayout artRelSpacer = new VerticalLayout();
- artRelSpacer.setHeight(15, UNITS_PIXELS);
-
- VerticalLayout vLayout_Body = new VerticalLayout();
- vLayout_Body.setMargin(false, false, false, true);
- vLayout_Body.setHeight(null);
- vLayout_Body.setWidth(100, UNITS_PERCENTAGE);
-
- VerticalLayout relAttrSpacer = new VerticalLayout();
- relAttrSpacer.setHeight(15, UNITS_PIXELS);
-
- VerticalLayout bottomSpacer = new VerticalLayout();
-
- OseeLeftMarginContainer leftMarginContainerBreadcrumb = new OseeLeftMarginContainer();
-
- Panel panel_Body = new Panel();
- panel_Body.setScrollable(true);
- panel_Body.setSizeFull();
-
- hLayout_ArtNameAndType.addComponent(artifactName);
- hLayout_ArtNameAndType.addComponent(spacer1);
- hLayout_ArtNameAndType.addComponent(artifactType);
-
- vLayout_Body.addComponent(vSpacer);
- vLayout_Body.addComponent(hLayout_ArtNameAndType);
- vLayout_Body.addComponent(artRelSpacer);
- vLayout_Body.addComponent(relationsComp);
- vLayout_Body.addComponent(relAttrSpacer);
- vLayout_Body.addComponent(attributeComp);
- vLayout_Body.addComponent(bottomSpacer);
-
- panel_Body.setContent(vLayout_Body);
-
- leftMarginContainerBreadcrumb.addComponent(breadcrumbComp);
-
- vLayout_OutBody.addComponent(leftMarginContainerBreadcrumb);
- vLayout_OutBody.addComponent(panel_Body);
-
- hLayout_LeftMargAndBody.addComponent(vLayout_OutBody);
-
- addComponent(getSearchHeader());
- addComponent(spacer);
- addComponent(hLayout_LeftMargAndBody);
-
- hLayout_ArtNameAndType.setComponentAlignment(artifactType, Alignment.BOTTOM_CENTER);
- vLayout_Body.setExpandRatio(bottomSpacer, 1.0f);
- vLayout_OutBody.setExpandRatio(panel_Body, 1.0f);
- hLayout_LeftMargAndBody.setExpandRatio(vLayout_OutBody, 1.0f);
- setComponentAlignment(getSearchHeader(), Alignment.TOP_LEFT);
- setExpandRatio(hLayout_LeftMargAndBody, 1.0f);
- }
-
- private void updateLayout() {
- if (artifact != null) {
- breadcrumbComp.setArtifact(artifact);
- artifactType.setCaption(String.format("[%s]", artifact.getArtifactType()));
- artifactName.setArtifact(artifact);
- }
- }
-
- @Override
- public void clearAll() {
- artifact = null;
- updateLayout();
- }
-
- @Override
- public void setArtifact(ViewArtifact artifact) {
- this.artifact = artifact;
- updateLayout();
- }
-
- @Override
- public void setErrorMessage(String shortMsg, String longMsg, MsgType msgType) {
- // do nothing
- }
-
- @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
deleted file mode 100644
index 2719659d3f..0000000000
--- a/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/search/OseeSearchResultsView.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*******************************************************************************
- * 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.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
- */
-@SuppressWarnings("serial")
-public abstract class OseeSearchResultsView extends AbstractCommonView {
-
- protected OseeSearchResultsListComponent searchResultsListComponent = new OseeSearchResultsListComponent();
-
- @Override
- protected void createLayout() {
- OseeLeftMarginContainer leftMargContainer = new OseeLeftMarginContainer();
- leftMargContainer.setSizeFull();
- searchResultsListComponent.setSizeFull();
-
- leftMargContainer.addComponent(searchResultsListComponent);
- addComponent(leftMargContainer);
-
- 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 "";
- }
- }
-}
diff --git a/plugins/org.eclipse.osee.x.ats.parent/pom.xml b/plugins/org.eclipse.osee.x.ats.parent/pom.xml
index 06dc91cedb..bf08acc118 100644
--- a/plugins/org.eclipse.osee.x.ats.parent/pom.xml
+++ b/plugins/org.eclipse.osee.x.ats.parent/pom.xml
@@ -17,19 +17,7 @@
<version>0.17.0-SNAPSHOT</version>
<modules>
- <module>../../plugins/org.eclipse.osee.display.api</module>
- <module>../../plugins/org.eclipse.osee.display.view.web</module>
- <module>../../plugins/org.eclipse.osee.display.presenter</module>
- <module>../../plugins/org.eclipse.osee.display.presenter.mocks</module>
- <module>../../plugins/org.eclipse.osee.display.presenter.test</module>
-
<module>../../plugins/org.eclipse.osee.ats.api</module>
- <module>../../plugins/org.eclipse.osee.ats.ui.api</module>
- <module>../../plugins/org.eclipse.osee.ats.view.web</module>
-
- <module>../../plugins/org.eclipse.osee.ats.presenter</module>
- <module>../../plugins/org.eclipse.osee.ats.presenter.test</module>
-
<module>../../plugins/org.eclipse.osee.ats.dsl</module>
<module>../../plugins/org.eclipse.osee.ats.core</module>
diff --git a/plugins/org.eclipse.osee.x.core.parent/pom.xml b/plugins/org.eclipse.osee.x.core.parent/pom.xml
index 28f8dffb3e..eef9f9ea34 100644
--- a/plugins/org.eclipse.osee.x.core.parent/pom.xml
+++ b/plugins/org.eclipse.osee.x.core.parent/pom.xml
@@ -64,9 +64,6 @@
<module>../../plugins/org.eclipse.osee.vaadin.widgets</module>
<module>../../plugins/org.eclipse.osee.vaadin.themes</module>
- <module>../../plugins/org.eclipse.osee.display.mvp</module>
- <module>../../plugins/org.eclipse.osee.display.mvp.test</module>
-
<module>../../plugins/org.eclipse.osee.jaxrs</module>
<module>../../plugins/org.eclipse.osee.jaxrs.server</module>
<module>../../plugins/org.eclipse.osee.jaxrs.server.test</module>

Back to the top