bug[ats_ATS303551]: Re-organize ATS Search widgets

Change-Id: I507a7033b837456ffc22a451422d220043381856

9 files changed, 89 insertions, 9 deletions

diff --git a/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/query/AtsSearchUtil.java b/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/query/AtsSearchUtil.java
index 5930efb4577..822db54c07c 100644
--- a/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/query/AtsSearchUtil.java
+++ b/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/query/AtsSearchUtil.java
@@ -21,10 +21,12 @@ public class AtsSearchUtil {
    public static final String ATS_QUERY_NAMESPACE = "ats.search";
    public static final String ATS_QUERY_GOAL_NAMESPACE = "ats.search.goal";
    public static final String ATS_QUERY_TEAM_WF_NAMESPACE = "ats.search.team";
+   public static final String ATS_QUERY_EV_NAMESPACE = "ats.search.ev";
    public static final String ATS_QUERY_TASK_NAMESPACE = "ats.search.task";
    public static final String ATS_QUERY_REVIEW_NAMESPACE = "ats.search.review";
-   public static final List<String> ATS_DEFAULT_SEARCH_NAMESPACES = Arrays.asList(ATS_QUERY_NAMESPACE,
-      ATS_QUERY_TEAM_WF_NAMESPACE, ATS_QUERY_GOAL_NAMESPACE, ATS_QUERY_TASK_NAMESPACE, ATS_QUERY_REVIEW_NAMESPACE);
+   public static final List<String> ATS_DEFAULT_SEARCH_NAMESPACES =
+      Arrays.asList(ATS_QUERY_NAMESPACE, ATS_QUERY_TEAM_WF_NAMESPACE, ATS_QUERY_GOAL_NAMESPACE,
+         ATS_QUERY_TASK_NAMESPACE, ATS_QUERY_REVIEW_NAMESPACE, ATS_QUERY_EV_NAMESPACE);
 
    private AtsSearchUtil() {
       // Utilility Class
diff --git a/plugins/org.eclipse.osee.ats/images/workPackage.gif b/plugins/org.eclipse.osee.ats/images/workPackage.gif
new file mode 100644
index 00000000000..6052a8687fa
--- /dev/null
+++ b/plugins/org.eclipse.osee.ats/images/workPackage.gif
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/AtsArtifactImageProvider.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/AtsArtifactImageProvider.java
index 9eaa88d60e7..f81a42389e7 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/AtsArtifactImageProvider.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/AtsArtifactImageProvider.java
@@ -52,6 +52,7 @@ public class AtsArtifactImageProvider extends ArtifactImageProvider {
       ArtifactImageManager.registerBaseImage(AtsArtifactTypes.AgileTeam, AtsImage.AGILE_TEAM, this);
       ArtifactImageManager.registerBaseImage(AtsArtifactTypes.AgileFeatureGroup, AtsImage.AGILE_FEATURE_GROUP, this);
       ArtifactImageManager.registerBaseImage(AtsArtifactTypes.AgileSprint, AtsImage.AGILE_SPRINT, this);
+      ArtifactImageManager.registerBaseImage(AtsArtifactTypes.WorkPackage, AtsImage.WORK_PACKAGE, this);
 
       ArtifactImageManager.registerOverrideImageProvider(this, AtsArtifactTypes.Version);
       ArtifactImageManager.registerOverrideImageProvider(this, AtsArtifactTypes.Task);
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/AtsImage.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/AtsImage.java
index 96a38e2c039..f910abfe645 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/AtsImage.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/AtsImage.java
@@ -85,6 +85,7 @@ public enum AtsImage implements KeyedImage {
    VERSION_LOCKED("yellowV_8_8.gif"),
    WORKFLOW_CONFIG("workflow.gif"),
    WORK_DEFINITION("workDef.gif"),
+   WORK_PACKAGE("workPackage.gif"),
    TOOL("T.gif"),
    ZOOM("zoom_in.gif"),
    ZOOM_IN("zoom_in.gif"),
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/ev/EvNavigateItems.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/ev/EvNavigateItems.java
index a34d4e0af11..5be2af11f6a 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/ev/EvNavigateItems.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/ev/EvNavigateItems.java
@@ -14,6 +14,8 @@ import java.util.List;
 import java.util.logging.Level;
 import org.eclipse.osee.ats.AtsImage;
 import org.eclipse.osee.ats.internal.Activator;
+import org.eclipse.osee.ats.navigate.SearchNavigateItem;
+import org.eclipse.osee.ats.world.search.AtsSearchWorkPackageSearchItem;
 import org.eclipse.osee.framework.logging.OseeLog;
 import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateItem;
 
@@ -27,6 +29,7 @@ public class EvNavigateItems {
          XNavigateItem evItems = new XNavigateItem(parent, "Earned Value", AtsImage.E_BOXED);
          new WorkPackageConfigReport(evItems);
          new WorkPackageQBDReport(evItems);
+         new SearchNavigateItem(evItems, new AtsSearchWorkPackageSearchItem());
          items.add(evItems);
       } catch (Exception ex) {
          OseeLog.log(Activator.class, Level.SEVERE, "Can't create Goals section");
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/ev/WorkPackageQBDReport.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/ev/WorkPackageQBDReport.java
index e8df567fec1..9645b5d3445 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/ev/WorkPackageQBDReport.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/ev/WorkPackageQBDReport.java
@@ -13,6 +13,7 @@ package org.eclipse.osee.ats.ev;
 import java.util.Collection;
 import java.util.List;
 import org.eclipse.jface.window.Window;
+import org.eclipse.osee.ats.AtsImage;
 import org.eclipse.osee.ats.api.data.AtsArtifactTypes;
 import org.eclipse.osee.ats.api.data.AtsAttributeTypes;
 import org.eclipse.osee.ats.api.ev.IAtsWorkPackage;
@@ -26,7 +27,6 @@ import org.eclipse.osee.ats.world.search.WorldSearchItem.SearchType;
 import org.eclipse.osee.framework.core.data.IArtifactToken;
 import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
 import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery;
-import org.eclipse.osee.framework.ui.plugin.PluginUiImage;
 import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateComposite.TableLoadOption;
 import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateItem;
 import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateItemAction;
@@ -40,7 +40,7 @@ public class WorkPackageQBDReport extends XNavigateItemAction implements IWorldE
    private IAtsWorkPackage selectedWorkPackage;
 
    public WorkPackageQBDReport(XNavigateItem parent) {
-      super(parent, TITLE, PluginUiImage.ADMIN);
+      super(parent, TITLE, AtsImage.WORK_PACKAGE);
    }
 
    @Override
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/search/AtsSearchWorkflowSearchItem.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/search/AtsSearchWorkflowSearchItem.java
index c6db1b0259d..ced96bb9541 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/search/AtsSearchWorkflowSearchItem.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/search/AtsSearchWorkflowSearchItem.java
@@ -89,13 +89,14 @@ public class AtsSearchWorkflowSearchItem extends WorldEditorParameterSearchItem
       getTitle().addWidget();
       getAi().addWidget(3);
       getTeamDef().addWidget(2);
-      getVersion().addWidget(8);
+      getVersion().addWidget(6);
       getStateType().addWidget();
-      getUser().addWidget();
+      getStateName().addWidget();
+      getUser().addWidget(6);
       getUserType().addWidget();
-      getColorTeam().addWidget(4);
+      getColorTeam().addWidget();
+
       if (showWorkPackageWidgets()) {
-         getStateName().addWidget();
          getProgram().addWidget(8);
          getInsertion().addWidget();
          getInsertionActivity().addWidget();
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/AtsWorldEditorItem.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/AtsWorldEditorItem.java
index 0669fa0bbf4..43e271d6f74 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/AtsWorldEditorItem.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/AtsWorldEditorItem.java
@@ -18,7 +18,9 @@ import org.eclipse.osee.ats.export.AtsExportAction;
 import org.eclipse.osee.ats.search.AtsSearchWorkflowSearchItem;
 import org.eclipse.osee.ats.world.search.AtsSearchGoalSearchItem;
 import org.eclipse.osee.ats.world.search.AtsSearchReviewSearchItem;
+import org.eclipse.osee.ats.world.search.AtsSearchTaskSearchItem;
 import org.eclipse.osee.ats.world.search.AtsSearchTeamWorkflowSearchItem;
+import org.eclipse.osee.ats.world.search.AtsSearchWorkPackageSearchItem;
 
 /**
  * @author Donald G. Dunne
@@ -34,7 +36,8 @@ public class AtsWorldEditorItem extends AtsWorldEditorItemBase {
    @Override
    public List<AtsSearchWorkflowSearchItem> getSearchWorkflowSearchItems() {
       return Arrays.asList(new AtsSearchWorkflowSearchItem(), new AtsSearchTeamWorkflowSearchItem(),
-         new AtsSearchReviewSearchItem(), new AtsSearchGoalSearchItem());
+         new AtsSearchTaskSearchItem(), new AtsSearchReviewSearchItem(), new AtsSearchGoalSearchItem(),
+         new AtsSearchWorkPackageSearchItem());
    }
 
 }
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/AtsSearchWorkPackageSearchItem.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/AtsSearchWorkPackageSearchItem.java
new file mode 100644
index 00000000000..5b91af46e0e
--- /dev/null
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/AtsSearchWorkPackageSearchItem.java
@@ -0,0 +1,69 @@
+/*******************************************************************************
+ * Copyright (c) 2015 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.world.search;
+
+import java.util.Arrays;
+import java.util.Collection;
+import org.eclipse.osee.ats.AtsImage;
+import org.eclipse.osee.ats.api.query.AtsSearchUtil;
+import org.eclipse.osee.ats.api.workflow.WorkItemType;
+
+/**
+ * @author Donald G. Dunne
+ */
+public class AtsSearchWorkPackageSearchItem extends AbstractWorkItemSearchItem {
+
+   private static final AtsImage IMAGE = AtsImage.WORK_PACKAGE;
+   private static final String TITLE = "Work Package EV Search";
+   public static final String NAMESPACE = AtsSearchUtil.ATS_QUERY_EV_NAMESPACE;
+
+   public AtsSearchWorkPackageSearchItem() {
+      super(TITLE, AtsSearchUtil.ATS_QUERY_EV_NAMESPACE, IMAGE);
+   }
+
+   public AtsSearchWorkPackageSearchItem(AbstractWorkItemSearchItem searchItem) {
+      super(searchItem, TITLE, AtsSearchUtil.ATS_QUERY_EV_NAMESPACE, IMAGE);
+   }
+
+   public AtsSearchWorkPackageSearchItem(String title, String namespace, AtsImage image) {
+      super(title, namespace, image);
+   }
+
+   @Override
+   public AbstractWorkItemSearchItem copy() {
+      AtsSearchWorkPackageSearchItem item = new AtsSearchWorkPackageSearchItem(this);
+      item.setSavedData(savedData);
+      return item;
+   }
+
+   @Override
+   public AbstractWorkItemSearchItem copyProvider() {
+      AtsSearchWorkPackageSearchItem item = new AtsSearchWorkPackageSearchItem(this);
+      item.setSavedData(savedData);
+      return item;
+   }
+
+   @Override
+   public String getShortNamePrefix() {
+      return "EV";
+   }
+
+   @Override
+   Collection<WorkItemType> getWorkItemTypes() {
+      return Arrays.asList(WorkItemType.TeamWorkflow, WorkItemType.Task, WorkItemType.Review);
+   }
+
+   @Override
+   protected boolean showWorkPackageWidgets() {
+      return true;
+   }
+
+}