13 files changed, 21 insertions, 22 deletions

diff --git a/org.eclipse.osee.ats/images/globe.gif b/org.eclipse.osee.ats/images/globe.gif
new file mode 100644
index 00000000000..212a2e8ac37
--- /dev/null
+++ b/org.eclipse.osee.ats/images/globe.gif
diff --git a/org.eclipse.osee.ats/images/globe.jpg b/org.eclipse.osee.ats/images/globe.jpg
new file mode 100644
index 00000000000..8c094ef5f7d
--- /dev/null
+++ b/org.eclipse.osee.ats/images/globe.jpg
diff --git a/org.eclipse.osee.ats/images/globePlus.gif b/org.eclipse.osee.ats/images/globePlus.gif
new file mode 100644
index 00000000000..88b8d1c7411
--- /dev/null
+++ b/org.eclipse.osee.ats/images/globePlus.gif
diff --git a/org.eclipse.osee.ats/images/globePlusSelect.gif b/org.eclipse.osee.ats/images/globePlusSelect.gif
new file mode 100644
index 00000000000..e2aba082d16
--- /dev/null
+++ b/org.eclipse.osee.ats/images/globePlusSelect.gif
diff --git a/org.eclipse.osee.ats/images/globeSelect.gif b/org.eclipse.osee.ats/images/globeSelect.gif
new file mode 100644
index 00000000000..04c16b7ee6d
--- /dev/null
+++ b/org.eclipse.osee.ats/images/globeSelect.gif
diff --git a/org.eclipse.osee.ats/plugin.xml b/org.eclipse.osee.ats/plugin.xml
index 3078a339581..4f3be8d379d 100644
--- a/org.eclipse.osee.ats/plugin.xml
+++ b/org.eclipse.osee.ats/plugin.xml
@@ -23,7 +23,7 @@
          <editor

                class="org.eclipse.osee.ats.world.WorldEditor"

                default="false"

-               icon="images/world.gif"

+               icon="images/globe.gif"

                id="org.eclipse.osee.ats.world.WorldEditor"

                name="World Editor">

          </editor>

diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/OpenInAtsWorldOperation.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/OpenInAtsWorldOperation.java
index e1a6032dd00..90cefd5f965 100644
--- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/OpenInAtsWorldOperation.java
+++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/OpenInAtsWorldOperation.java
@@ -65,7 +65,7 @@ public class OpenInAtsWorldOperation extends WorkPageService {
          }
       };
       action.setToolTipText(getName());
-      action.setImageDescriptor(AtsPlugin.getInstance().getImageDescriptor("world.gif"));
+      action.setImageDescriptor(AtsPlugin.getInstance().getImageDescriptor("globe.gif"));
       return action;
    }
 
diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/AtsNavigateViewItems.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/AtsNavigateViewItems.java
index 84a4749a64b..c279b9123f8 100644
--- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/AtsNavigateViewItems.java
+++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/AtsNavigateViewItems.java
@@ -37,7 +37,7 @@ import org.eclipse.osee.ats.world.search.ArtIdSearchItem;
 import org.eclipse.osee.ats.world.search.ArtifactTypeSearchItem;
 import org.eclipse.osee.ats.world.search.ArtifactTypesSearchItem;
 import org.eclipse.osee.ats.world.search.AtsAttributeSearchItem;
-import org.eclipse.osee.ats.world.search.EditTasksWorldSearchItem;
+import org.eclipse.osee.ats.world.search.TaskSearchWorldSearchItem;
 import org.eclipse.osee.ats.world.search.GroupWorldSearchItem;
 import org.eclipse.osee.ats.world.search.MultipleHridSearchItem;
 import org.eclipse.osee.ats.world.search.MyCompletedSearchItem;
@@ -138,9 +138,9 @@ public class AtsNavigateViewItems extends XNavigateViewItems {
          }
          items.add(otherItems);
 
-         items.add(new SearchNavigateItem(null, new EditTeamWorkflowSearchItem()));
-         items.add(new SearchNavigateItem(null, new EditTasksWorldSearchItem()));
+         items.add(new SearchNavigateItem(null, new TaskSearchWorldSearchItem()));
          items.add(new SearchNavigateItem(null, new GroupWorldSearchItem()));
+         items.add(new SearchNavigateItem(null, new TeamWorkflowSearchWorkflowSearchItem()));
          items.add(new SearchNavigateItem(null, new UserCommunitySearchItem()));
          items.add(new SearchNavigateItem(null, new ActionableItemWorldSearchItem(null, "Actionable Item Search",
                false, true, false)));
diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/FirstTimeQualityMetricReportItem.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/FirstTimeQualityMetricReportItem.java
index e26824c3880..8d3c9772a6c 100644
--- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/FirstTimeQualityMetricReportItem.java
+++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/FirstTimeQualityMetricReportItem.java
@@ -137,7 +137,7 @@ public class FirstTimeQualityMetricReportItem extends XNavigateItemAction {
     * 
     * @param teamDef
     * @param monitor
-    * @return
+    * @return report
     */
    public static String getTeamWorkflowReport(String title, TeamDefinitionArtifact teamDef, IProgressMonitor monitor) throws OseeCoreException {
       StringBuilder sb = new StringBuilder();
diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/EditTeamWorkflowSearchItem.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/TeamWorkflowSearchWorkflowSearchItem.java
index 94f83c1aa1f..cbaf19fb266 100644
--- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/EditTeamWorkflowSearchItem.java
+++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/TeamWorkflowSearchWorkflowSearchItem.java
@@ -33,7 +33,7 @@ import org.eclipse.ui.forms.widgets.FormToolkit;
 /**

  * @author Donald G. Dunne

  */

-public class EditTeamWorkflowSearchItem extends WorldEditorParameterSearchItem {

+public class TeamWorkflowSearchWorkflowSearchItem extends WorldEditorParameterSearchItem {

 

    private XHyperlabelTeamDefinitionSelection teamCombo = null;

    private XCombo releasedCombo = null;

@@ -41,11 +41,11 @@ public class EditTeamWorkflowSearchItem extends WorldEditorParameterSearchItem {
    private XMembersCombo assigneeCombo;

    private XCheckBox includeCompletedCancelledCheckbox;

 

-   public EditTeamWorkflowSearchItem() {

-      super("Team Workflows Search");

+   public TeamWorkflowSearchWorkflowSearchItem() {

+      super("Team Workflow Search");

    }

 

-   public EditTeamWorkflowSearchItem(EditTeamWorkflowSearchItem editTeamWorkflowSearchItem) {

+   public TeamWorkflowSearchWorkflowSearchItem(TeamWorkflowSearchWorkflowSearchItem editTeamWorkflowSearchItem) {

       super(editTeamWorkflowSearchItem);

    }

 

@@ -53,8 +53,8 @@ public class EditTeamWorkflowSearchItem extends WorldEditorParameterSearchItem {
     * @see org.eclipse.osee.ats.world.search.WorldSearchItem#copy()

     */

    @Override

-   public EditTeamWorkflowSearchItem copy() {

-      return new EditTeamWorkflowSearchItem(this);

+   public TeamWorkflowSearchWorkflowSearchItem copy() {

+      return new TeamWorkflowSearchWorkflowSearchItem(this);

    }

 

    /* (non-Javadoc)

diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldComposite.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldComposite.java
index 9b84f7e943b..25f2d85c298 100644
--- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldComposite.java
+++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldComposite.java
@@ -325,7 +325,7 @@ public class WorldComposite extends ScrolledComposite implements IFrameworkTrans
             }

          }

       };

-      newWorldEditor.setImageDescriptor(AtsPlugin.getInstance().getImageDescriptor("newWorld.gif"));

+      newWorldEditor.setImageDescriptor(AtsPlugin.getInstance().getImageDescriptor("globe.gif"));

       newWorldEditor.setToolTipText("Open in ATS World Editor");

 

       Action newWorldEditorSelected = new Action("Open Selected in ATS World Editor") {

@@ -350,7 +350,7 @@ public class WorldComposite extends ScrolledComposite implements IFrameworkTrans
             }

          }

       };

-      newWorldEditorSelected.setImageDescriptor(AtsPlugin.getInstance().getImageDescriptor("newWorldSelected.gif"));

+      newWorldEditorSelected.setImageDescriptor(AtsPlugin.getInstance().getImageDescriptor("globeSelect.gif"));

       newWorldEditorSelected.setToolTipText("Open Selected in ATS World Editor");

 

       Action expandAllAction = new Action("Expand All") {

diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/GroupWorldSearchItem.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/GroupWorldSearchItem.java
index 8984d9749c2..fafd7249f44 100644
--- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/GroupWorldSearchItem.java
+++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/GroupWorldSearchItem.java
@@ -34,7 +34,7 @@ public class GroupWorldSearchItem extends WorldUISearchItem {
    }
 
    public GroupWorldSearchItem() {
-      this("Groups Search", null);
+      this("Group Search", null);
    }
 
    public GroupWorldSearchItem(GroupWorldSearchItem groupWorldSearchItem) {
@@ -61,8 +61,7 @@ public class GroupWorldSearchItem extends WorldUISearchItem {
       if (groupName == null) return;
       if (group == null) group =
             UniversalGroup.getGroups(groupName, BranchManager.getDefaultBranch()).iterator().next();
-      if (group == null) throw new IllegalArgumentException(
-            "Can't Find Universal Group for " + getName());
+      if (group == null) throw new IllegalArgumentException("Can't Find Universal Group for " + getName());
    }
 
    @Override
diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/EditTasksWorldSearchItem.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/TaskSearchWorldSearchItem.java
index b00ed542bd0..51c35ae8051 100644
--- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/EditTasksWorldSearchItem.java
+++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/TaskSearchWorldSearchItem.java
@@ -45,7 +45,7 @@ import org.eclipse.ui.forms.widgets.FormToolkit;
 /**

  * @author Donald G. Dunne

  */

-public class EditTasksWorldSearchItem extends TaskEditorParameterSearchItem {

+public class TaskSearchWorldSearchItem extends TaskEditorParameterSearchItem {

 

    private XMembersCombo assigneeCombo;

    private XCheckBox includeCompletedCancelledCheckbox;

@@ -56,7 +56,7 @@ public class EditTasksWorldSearchItem extends TaskEditorParameterSearchItem {
    /**

     * @param worldSearchItem

     */

-   public EditTasksWorldSearchItem(WorldSearchItem worldSearchItem) {

+   public TaskSearchWorldSearchItem(WorldSearchItem worldSearchItem) {

       super(worldSearchItem);

    }

 

@@ -64,7 +64,7 @@ public class EditTasksWorldSearchItem extends TaskEditorParameterSearchItem {
     * @param name

     * @param loadView

     */

-   public EditTasksWorldSearchItem() {

+   public TaskSearchWorldSearchItem() {

       super("Task Search");

    }

 

@@ -339,8 +339,8 @@ public class EditTasksWorldSearchItem extends TaskEditorParameterSearchItem {
     * @see org.eclipse.osee.ats.world.search.WorldSearchItem#copy()

     */

    @Override

-   public EditTasksWorldSearchItem copy() {

-      return new EditTasksWorldSearchItem(this);

+   public TaskSearchWorldSearchItem copy() {

+      return new TaskSearchWorldSearchItem(this);

    }

 

 }