My Tasks for TaskEditor

3 files changed, 20 insertions, 10 deletions

diff --git a/MS_0.1.4_20080103/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/AtsNavigateViewItems.java b/MS_0.1.4_20080103/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/AtsNavigateViewItems.java
index d78503dc95b..f11861a9c05 100644
--- a/MS_0.1.4_20080103/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/AtsNavigateViewItems.java
+++ b/MS_0.1.4_20080103/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/AtsNavigateViewItems.java
@@ -62,6 +62,7 @@ import org.eclipse.osee.ats.world.search.UnReleasedTeamWorldSearchItem;
 import org.eclipse.osee.ats.world.search.UserCommunitySearchItem;
 import org.eclipse.osee.ats.world.search.VersionTargetedForTeamSearchItem;
 import org.eclipse.osee.ats.world.search.WorldSearchItem;
+import org.eclipse.osee.ats.world.search.WorldSearchItem.LoadView;
 import org.eclipse.osee.framework.skynet.core.SkynetAuthentication;
 import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactTypeSearch;
 import org.eclipse.osee.framework.skynet.core.artifact.search.ISearchPrimitive;
@@ -113,7 +114,10 @@ public class AtsNavigateViewItems extends XNavigateViewItems {
 
       XNavigateItem otherItems = new XNavigateItem(null, "Other My Searches");
       new SearchNavigateItem(otherItems, new MyTeamWFSearchItem("My Team Workflows", skynetAuth.getAuthenticatedUser()));
-      new SearchNavigateItem(otherItems, new MyTaskSearchItem("My Task", skynetAuth.getAuthenticatedUser()));
+      new SearchNavigateItem(otherItems, new MyTaskSearchItem("My Task (WorldView)", skynetAuth.getAuthenticatedUser(),
+            LoadView.WorldView));
+      new SearchNavigateItem(otherItems, new MyTaskSearchItem("My Task (Editor)", skynetAuth.getAuthenticatedUser(),
+            LoadView.TaskEditor));
       new SearchNavigateItem(otherItems, new MySubscribedSearchItem("My Subscribed", skynetAuth.getAuthenticatedUser()));
       new SearchNavigateItem(otherItems, new MyOrigSearchItem("My Originator - InWork",
             skynetAuth.getAuthenticatedUser(), true));
@@ -127,7 +131,8 @@ public class AtsNavigateViewItems extends XNavigateViewItems {
       new SearchNavigateItem(otherItems, new MyOrigSearchItem("User's Originator - InWork", null, true));
       new SearchNavigateItem(otherItems, new MyOrigSearchItem("User's Originator - All", null, false));
       new SearchNavigateItem(otherItems, new MyTeamWFSearchItem("User's Team Workflows"));
-      new SearchNavigateItem(otherItems, new MyTaskSearchItem("User's Tasks"));
+      new SearchNavigateItem(otherItems, new MyTaskSearchItem("User's Tasks (WorldView)", LoadView.WorldView));
+      new SearchNavigateItem(otherItems, new MyTaskSearchItem("User's Tasks (Editor)", LoadView.TaskEditor));
       new SearchNavigateItem(otherItems, new MyCompletedSearchItem("User's Completed"));
       new SearchNavigateItem(otherItems, new MyFavoritesSearchItem("User's Favorites"));
       new SearchNavigateItem(otherItems, new MySubscribedSearchItem("User's Subscribed"));
@@ -155,6 +160,7 @@ public class AtsNavigateViewItems extends XNavigateViewItems {
       XNavigateItem taskItem = new XNavigateItem(null, "Tasks");
       new SearchNavigateItem(taskItem, new EditTasksByTeamVersionSearchItem(null, true));
       new EditTasksBySelectedWorkflows(taskItem);
+      new SearchNavigateItem(taskItem, new MyTaskSearchItem("Edit Tasks by User", LoadView.TaskEditor));
       items.add(taskItem);
 
       XNavigateItem releaseItems = new XNavigateItem(null, "Versions");
diff --git a/MS_0.1.4_20080103/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/MyTaskSearchItem.java b/MS_0.1.4_20080103/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/MyTaskSearchItem.java
index f960b147599..f8c3df46726 100644
--- a/MS_0.1.4_20080103/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/MyTaskSearchItem.java
+++ b/MS_0.1.4_20080103/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/MyTaskSearchItem.java
@@ -31,16 +31,13 @@ import org.eclipse.osee.framework.skynet.core.artifact.search.Operator;
  */
 public class MyTaskSearchItem extends UserSearchItem {
 
-   public MyTaskSearchItem(String name) {
-      this(name, null);
+   public MyTaskSearchItem(String name, LoadView loadView) {
+      this(name, null, loadView);
    }
 
-   public MyTaskSearchItem() {
-      super("My World", null);
-   }
-
-   public MyTaskSearchItem(String name, User user) {
+   public MyTaskSearchItem(String name, User user, LoadView loadView) {
       super(name, user);
+      setLoadView(loadView);
    }
 
    @Override
diff --git a/MS_0.1.4_20080103/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/WorldSearchItem.java b/MS_0.1.4_20080103/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/WorldSearchItem.java
index 1a21b3e6a64..7aac7eff3ff 100644
--- a/MS_0.1.4_20080103/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/WorldSearchItem.java
+++ b/MS_0.1.4_20080103/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/WorldSearchItem.java
@@ -27,7 +27,7 @@ public abstract class WorldSearchItem {
    protected static Set<Artifact> EMPTY_SET = new HashSet<Artifact>();
    protected boolean cancelled = false;
    protected ArtifactPersistenceManager apm = ArtifactPersistenceManager.getInstance();
-   private final LoadView loadView;
+   private LoadView loadView;
    public static enum LoadView {
       WorldView, TaskEditor
    }
@@ -115,4 +115,11 @@ public abstract class WorldSearchItem {
       return loadView;
    }
 
+   /**
+    * @param loadView the loadView to set
+    */
+   public void setLoadView(LoadView loadView) {
+      this.loadView = loadView;
+   }
+
 }