Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorddunne2008-01-18 05:34:48 +0000
committerddunne2008-01-18 05:34:48 +0000
commit0ba87cb88e9c5d2cd489e1edaf3c5329dd9c1b97 (patch)
treeee34d33d6cec80f8684af8d05c447ce58cb675f3
parentb644d32c756f91130b33a80e0006bd130717a9dd (diff)
downloadorg.eclipse.osee-0ba87cb88e9c5d2cd489e1edaf3c5329dd9c1b97.tar.gz
org.eclipse.osee-0ba87cb88e9c5d2cd489e1edaf3c5329dd9c1b97.tar.xz
org.eclipse.osee-0ba87cb88e9c5d2cd489e1edaf3c5329dd9c1b97.zip
Added EditTasksByTeamVersion
-rw-r--r--MS_0.1.4_20080103/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/TaskEditor.java114
-rw-r--r--MS_0.1.4_20080103/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/AtsNavigateComposite.java21
-rw-r--r--MS_0.1.4_20080103/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/AtsNavigateViewItems.java5
-rw-r--r--MS_0.1.4_20080103/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/TeamDefinitionTreeDialog.java61
-rw-r--r--MS_0.1.4_20080103/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/EditTasksByTeamVersionSearchItem.java167
-rw-r--r--MS_0.1.4_20080103/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/WorldSearchItem.java16
6 files changed, 345 insertions, 39 deletions
diff --git a/MS_0.1.4_20080103/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/TaskEditor.java b/MS_0.1.4_20080103/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/TaskEditor.java
index 4f8cf438b16..ae080f090f8 100644
--- a/MS_0.1.4_20080103/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/TaskEditor.java
+++ b/MS_0.1.4_20080103/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/TaskEditor.java
@@ -11,19 +11,28 @@
package org.eclipse.osee.ats.editor;
import java.sql.SQLException;
+import java.util.ArrayList;
import java.util.Collection;
import java.util.HashSet;
import java.util.List;
import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.osee.ats.AtsPlugin;
import org.eclipse.osee.ats.artifact.TaskArtifact;
+import org.eclipse.osee.ats.util.DefaultTeamState;
import org.eclipse.osee.ats.util.widgets.dialog.TaskResOptionDefinition;
import org.eclipse.osee.ats.util.widgets.task.IXTaskViewer;
+import org.eclipse.osee.ats.world.search.WorldSearchItem;
+import org.eclipse.osee.ats.world.search.WorldSearchItem.SearchType;
+import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
import org.eclipse.osee.framework.skynet.core.event.SkynetEventManager;
import org.eclipse.osee.framework.ui.plugin.event.Event;
import org.eclipse.osee.framework.ui.plugin.event.IEventReceiver;
import org.eclipse.osee.framework.ui.plugin.util.AWorkbench;
import org.eclipse.osee.framework.ui.plugin.util.Displays;
+import org.eclipse.osee.framework.ui.plugin.util.db.ConnectionHandler;
import org.eclipse.osee.framework.ui.skynet.SkynetContributionItem;
import org.eclipse.osee.framework.ui.skynet.artifact.editor.AbstractArtifactEditor;
import org.eclipse.osee.framework.ui.skynet.util.OSEELog;
@@ -54,13 +63,21 @@ public class TaskEditor extends AbstractArtifactEditor implements IDirtiableEdit
onDirtied();
}
- public static void editArtifacts(TaskEditorInput input) {
- IWorkbenchPage page = AWorkbench.getActivePage();
- try {
- page.openEditor(input, EDITOR_ID);
- } catch (PartInitException ex) {
- OSEELog.logException(AtsPlugin.class, ex, true);
- }
+ public static void editArtifacts(final TaskEditorInput input) {
+ Displays.ensureInDisplayThread(new Runnable() {
+ /* (non-Javadoc)
+ * @see java.lang.Runnable#run()
+ */
+ public void run() {
+ IWorkbenchPage page = AWorkbench.getActivePage();
+ try {
+ page.openEditor(input, EDITOR_ID);
+ } catch (PartInitException ex) {
+ OSEELog.logException(AtsPlugin.class, ex, true);
+ }
+ }
+ });
+
}
public boolean isSaveOnCloseNeeded() {
@@ -170,7 +187,8 @@ public class TaskEditor extends AbstractArtifactEditor implements IDirtiableEdit
* @see org.eclipse.osee.ats.util.widgets.task.IXTaskViewer#getOptions()
*/
public List<TaskResOptionDefinition> getResOptions() {
- return ((TaskEditorInput) (IEditorInput) getEditorInput()).getResOptions();
+ if (((TaskEditorInput) (IEditorInput) getEditorInput()).getResOptions() != null) return ((TaskEditorInput) (IEditorInput) getEditorInput()).getResOptions();
+ return new ArrayList<TaskResOptionDefinition>();
}
/*
@@ -225,4 +243,84 @@ public class TaskEditor extends AbstractArtifactEditor implements IDirtiableEdit
return true;
}
+ public static void loadTable(WorldSearchItem searchItem, boolean sort) {
+ searchItem.setCancelled(false);
+ if (!ConnectionHandler.isConnected()) {
+ AWorkbench.popup("ERROR", "DB Connection Unavailable");
+ return;
+ }
+
+ if (searchItem == null) return;
+
+ searchItem.performUI(SearchType.Search);
+ if (searchItem.isCancelled()) return;
+
+ LoadTableJob job = null;
+ try {
+ job = new LoadTableJob(searchItem, SearchType.Search, sort);
+ job.setUser(false);
+ job.setPriority(Job.LONG);
+ job.schedule();
+ } catch (Exception ex) {
+ OSEELog.logException(AtsPlugin.class, "Load Table Failed", ex, true);
+ }
+ }
+
+ private static class LoadTableJob extends Job {
+
+ @SuppressWarnings("unused")
+ private final boolean sort;
+ private final WorldSearchItem searchItem;
+ private boolean cancel = false;
+ private final SearchType searchType;
+
+ public LoadTableJob(WorldSearchItem searchItem, SearchType searchType, boolean sort) {
+ super("Loading \"" + searchItem.getSelectedName(searchType) + "\"...");
+ this.searchItem = searchItem;
+ this.searchType = searchType;
+ this.sort = sort;
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.eclipse.core.runtime.jobs.Job#run(org.eclipse.core.runtime.IProgressMonitor)
+ */
+ @Override
+ protected IStatus run(IProgressMonitor monitor) {
+ cancel = false;
+ searchItem.setCancelled(cancel);
+ final Collection<Artifact> artifacts;
+ try {
+ artifacts = searchItem.performSearchGetResults(false, searchType);
+ if (artifacts.size() == 0) {
+ if (searchItem.isCancelled()) {
+ monitor.done();
+ return Status.CANCEL_STATUS;
+ } else {
+ monitor.done();
+ return new Status(Status.ERROR, AtsPlugin.PLUGIN_ID, -1, "No Tasks Found", null);
+ }
+ }
+ List<TaskArtifact> taskArts = new ArrayList<TaskArtifact>();
+ for (Artifact artifact : artifacts)
+ if (artifact instanceof TaskArtifact) taskArts.add((TaskArtifact) artifact);
+ TaskEditorInput input =
+ new TaskEditorInput(
+ "Tasks for \"" + (searchItem.getSelectedName(searchType) != null ? searchItem.getSelectedName(searchType) : "") + "\"",
+ taskArts,
+ taskArts.iterator().next().getParentTeamWorkflow().getSmaMgr().getWorkPage(
+ DefaultTeamState.Implement.name()).getTaskResDef() != null ? taskArts.iterator().next().getParentTeamWorkflow().getSmaMgr().getWorkPage(
+ DefaultTeamState.Implement.name()).getTaskResDef().getOptions() : null);
+ TaskEditor.editArtifacts(input);
+
+ } catch (final Exception ex) {
+ monitor.done();
+ return new Status(Status.ERROR, AtsPlugin.PLUGIN_ID, -1, "Can't load tasks", ex);
+ }
+ monitor.done();
+ return Status.OK_STATUS;
+ }
+ }
+
}
diff --git a/MS_0.1.4_20080103/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/AtsNavigateComposite.java b/MS_0.1.4_20080103/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/AtsNavigateComposite.java
index abe416fee74..f5c55416abe 100644
--- a/MS_0.1.4_20080103/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/AtsNavigateComposite.java
+++ b/MS_0.1.4_20080103/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/AtsNavigateComposite.java
@@ -13,9 +13,12 @@ package org.eclipse.osee.ats.navigate;
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.osee.ats.AtsPlugin;
+import org.eclipse.osee.ats.editor.TaskEditor;
import org.eclipse.osee.ats.world.WorldView;
import org.eclipse.osee.ats.world.search.WorldSearchItem;
+import org.eclipse.osee.ats.world.search.WorldSearchItem.LoadView;
import org.eclipse.osee.framework.ui.plugin.util.db.ConnectionHandler;
+import org.eclipse.osee.framework.ui.skynet.util.OSEELog;
import org.eclipse.osee.framework.ui.skynet.widgets.xnavigate.XNavigateComposite;
import org.eclipse.osee.framework.ui.skynet.widgets.xnavigate.XNavigateItem;
import org.eclipse.osee.framework.ui.skynet.widgets.xnavigate.XNavigateViewItems;
@@ -48,9 +51,13 @@ public class AtsNavigateComposite extends XNavigateComposite {
IStructuredSelection sel = (IStructuredSelection) filteredTree.getViewer().getSelection();
if (!sel.iterator().hasNext()) return;
XNavigateItem item = (XNavigateItem) sel.iterator().next();
- if (item instanceof SearchNavigateItem)
- openWorld(((SearchNavigateItem) item).getWsi());
- else
+ if (item instanceof SearchNavigateItem) {
+ WorldSearchItem worldSearchItem = ((SearchNavigateItem) item).getWsi();
+ if (worldSearchItem.getLoadView() == LoadView.WorldView)
+ openWorld(worldSearchItem);
+ else
+ openTaskEditor(worldSearchItem);
+ } else
super.handleDoubleClick();
}
@@ -65,6 +72,14 @@ public class AtsNavigateComposite extends XNavigateComposite {
}
}
+ public static void openTaskEditor(WorldSearchItem searchItem) {
+ try {
+ TaskEditor.loadTable(searchItem, false);
+ } catch (Exception e1) {
+ OSEELog.logException(AtsPlugin.class, null, true);
+ }
+ }
+
public void refresh() {
super.refresh();
if (AtsPlugin.isAtsAdmin()) {
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 4a64e640bb1..3e7444b1783 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
@@ -42,6 +42,7 @@ import org.eclipse.osee.ats.report.ExtendedStatusReportItem;
import org.eclipse.osee.ats.world.search.ActionableItemWorldSearchItem;
import org.eclipse.osee.ats.world.search.AtsAttributeSearchItem;
import org.eclipse.osee.ats.world.search.CriteriaSearchItem;
+import org.eclipse.osee.ats.world.search.EditTasksByTeamVersionSearchItem;
import org.eclipse.osee.ats.world.search.GroupWorldSearchItem;
import org.eclipse.osee.ats.world.search.MultipleHridSearchItem;
import org.eclipse.osee.ats.world.search.MyCompletedSearchItem;
@@ -151,6 +152,10 @@ public class AtsNavigateViewItems extends XNavigateViewItems {
new MassEditTeamVersionItem("Show Team Versions", teamItem, "");
items.add(teamItem);
+ XNavigateItem taskItem = new XNavigateItem(null, "Tasks");
+ new SearchNavigateItem(taskItem, new EditTasksByTeamVersionSearchItem(null, true));
+ items.add(taskItem);
+
XNavigateItem releaseItems = new XNavigateItem(null, "Versions");
new MassEditTeamVersionItem("Edit Versions", releaseItems, (TeamDefinitionArtifact) null);
new SearchNavigateItem(releaseItems, new VersionTargetedForTeamSearchItem(null, null, false));
diff --git a/MS_0.1.4_20080103/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/TeamDefinitionTreeDialog.java b/MS_0.1.4_20080103/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/TeamDefinitionTreeDialog.java
index 2218e874e3e..228ee66e21d 100644
--- a/MS_0.1.4_20080103/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/TeamDefinitionTreeDialog.java
+++ b/MS_0.1.4_20080103/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/TeamDefinitionTreeDialog.java
@@ -24,9 +24,9 @@ import org.eclipse.swt.widgets.Control;
public class TeamDefinitionTreeDialog extends TeamDefinitionTreeWithChildrenDialog {
XCheckBox showFinishedCheck = new XCheckBox("Show Completed and Cancelled Workflows");
- boolean showFinished = false;
+ Boolean showFinished = false;
XCheckBox showActionCheck = new XCheckBox("Show Action instead of Workflows");
- boolean showAction = false;
+ Boolean showAction = false;
public TeamDefinitionTreeDialog(Active active) {
super(active);
@@ -37,49 +37,54 @@ public class TeamDefinitionTreeDialog extends TeamDefinitionTreeWithChildrenDial
Control control = super.createDialogArea(container);
- showFinishedCheck.createWidgets(dialogComp, 2);
- showFinishedCheck.addSelectionListener(new SelectionListener() {
- public void widgetDefaultSelected(SelectionEvent e) {
- }
-
- public void widgetSelected(SelectionEvent e) {
- showFinished = showFinishedCheck.isSelected();
- };
- });
- showActionCheck.createWidgets(dialogComp, 2);
- showAction = true;
- showActionCheck.set(true);
- showActionCheck.addSelectionListener(new SelectionListener() {
- public void widgetDefaultSelected(SelectionEvent e) {
- }
-
- public void widgetSelected(SelectionEvent e) {
- showAction = showActionCheck.isSelected();
- };
- });
+ if (showFinished != null) {
+ showFinishedCheck.createWidgets(dialogComp, 2);
+ showFinishedCheck.addSelectionListener(new SelectionListener() {
+ public void widgetDefaultSelected(SelectionEvent e) {
+ }
+
+ public void widgetSelected(SelectionEvent e) {
+ showFinished = showFinishedCheck.isSelected();
+ };
+ });
+ }
+
+ if (showAction != null) {
+ showActionCheck.createWidgets(dialogComp, 2);
+ showAction = true;
+ showActionCheck.set(true);
+ showActionCheck.addSelectionListener(new SelectionListener() {
+ public void widgetDefaultSelected(SelectionEvent e) {
+ }
+
+ public void widgetSelected(SelectionEvent e) {
+ showAction = showActionCheck.isSelected();
+ };
+ });
+ }
return control;
}
- public boolean isShowFinished() {
+ public Boolean isShowFinished() {
return showFinished;
}
- public boolean isShowAction() {
+ public Boolean isShowAction() {
return showAction;
}
/**
- * @param showFinished the showFinished to set
+ * @param showFinished true/false default for showAction checkbox; null to not display showAction checkbox
*/
- public void setShowFinished(boolean showFinished) {
+ public void setShowFinished(Boolean showFinished) {
this.showFinished = showFinished;
}
/**
- * @param showAction the showAction to set
+ * @param showAction true/false default for showAction checkbox; null to not display showAction checkbox
*/
- public void setShowAction(boolean showAction) {
+ public void setShowAction(Boolean showAction) {
this.showAction = showAction;
}
diff --git a/MS_0.1.4_20080103/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/EditTasksByTeamVersionSearchItem.java b/MS_0.1.4_20080103/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/EditTasksByTeamVersionSearchItem.java
new file mode 100644
index 00000000000..99b6d5aacd3
--- /dev/null
+++ b/MS_0.1.4_20080103/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/EditTasksByTeamVersionSearchItem.java
@@ -0,0 +1,167 @@
+/*******************************************************************************
+ * 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.world.search;
+
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Set;
+import org.eclipse.osee.ats.artifact.ATSAttributes;
+import org.eclipse.osee.ats.artifact.TeamDefinitionArtifact;
+import org.eclipse.osee.ats.artifact.TeamWorkflowExtensions;
+import org.eclipse.osee.ats.artifact.VersionArtifact;
+import org.eclipse.osee.ats.util.widgets.dialog.TeamDefinitionTreeByVersionDialog;
+import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
+import org.eclipse.osee.framework.skynet.core.artifact.ArtifactPersistenceManager;
+import org.eclipse.osee.framework.skynet.core.artifact.BranchPersistenceManager;
+import org.eclipse.osee.framework.skynet.core.artifact.search.Active;
+import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactIdSearch;
+import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactTypeSearch;
+import org.eclipse.osee.framework.skynet.core.artifact.search.AttributeValueSearch;
+import org.eclipse.osee.framework.skynet.core.artifact.search.FromArtifactsSearch;
+import org.eclipse.osee.framework.skynet.core.artifact.search.ISearchPrimitive;
+import org.eclipse.osee.framework.skynet.core.artifact.search.InRelationSearch;
+import org.eclipse.osee.framework.skynet.core.artifact.search.Operator;
+import org.eclipse.osee.framework.skynet.core.relation.RelationSide;
+import org.eclipse.osee.framework.skynet.core.util.Artifacts;
+
+/**
+ * @author Donald G. Dunne
+ */
+public class EditTasksByTeamVersionSearchItem extends WorldSearchItem {
+
+ private Collection<TeamDefinitionArtifact> teamDefs;
+ private Set<TeamDefinitionArtifact> selectedTeamDefs;
+ private boolean recurseChildren;
+ private VersionArtifact selectedVersion = null;
+
+ public EditTasksByTeamVersionSearchItem(Collection<TeamDefinitionArtifact> teamDefs, boolean recurseChildren) {
+ super("Edit Tasks by Team Version", LoadView.TaskEditor);
+ this.teamDefs = teamDefs;
+ this.recurseChildren = recurseChildren;
+ }
+
+ public Collection<String> getProductSearchName() {
+ if (teamDefs != null)
+ return Artifacts.artNames(teamDefs);
+ else if (selectedTeamDefs != null) return Artifacts.artNames(selectedTeamDefs);
+ return new ArrayList<String>();
+ }
+
+ @Override
+ public String getSelectedName(SearchType searchType) {
+ if (selectedVersion != null)
+ return String.format("%s - %s - %s", super.getSelectedName(searchType), getProductSearchName(),
+ selectedVersion.getDescriptiveName());
+ else
+ return String.format("%s - %s", super.getSelectedName(searchType), getProductSearchName());
+ }
+
+ /**
+ * @return All directly specified teamDefs plus if recurse, will get all children
+ * @throws SQLException
+ */
+ public Set<TeamDefinitionArtifact> getSearchTeamDefs() throws SQLException {
+ Set<TeamDefinitionArtifact> srchTeamDefs = new HashSet<TeamDefinitionArtifact>();
+ for (TeamDefinitionArtifact teamDef : (teamDefs != null ? teamDefs : selectedTeamDefs))
+ srchTeamDefs.add(teamDef);
+ if (recurseChildren) {
+ for (TeamDefinitionArtifact teamDef : (teamDefs != null ? teamDefs : selectedTeamDefs)) {
+ Artifacts.getChildrenOfType(teamDef, srchTeamDefs, TeamDefinitionArtifact.class, true);
+ }
+ }
+ return srchTeamDefs;
+ }
+
+ @Override
+ public Collection<Artifact> performSearch(SearchType searchType) throws SQLException, IllegalArgumentException {
+
+ List<ISearchPrimitive> teamDefWorkflowCriteria = new LinkedList<ISearchPrimitive>();
+ for (TeamDefinitionArtifact tda : getSearchTeamDefs())
+ teamDefWorkflowCriteria.add(new AttributeValueSearch(
+ ATSAttributes.TEAM_DEFINITION_GUID_ATTRIBUTE.getStoreName(), tda.getGuid(), Operator.EQUAL));
+ FromArtifactsSearch teamDefWorkflowSearch = new FromArtifactsSearch(teamDefWorkflowCriteria, false);
+
+ FromArtifactsSearch versionWorkflowSearch = null;
+ if (selectedVersion != null) {
+ List<ISearchPrimitive> versionCriteria = new LinkedList<ISearchPrimitive>();
+ versionCriteria.add(new ArtifactIdSearch(selectedVersion.getArtId(), Operator.EQUAL));
+ versionWorkflowSearch = new FromArtifactsSearch(versionCriteria, true);
+ }
+
+ // Find all Team Workflows artifact types
+ List<ISearchPrimitive> teamWorkflowCriteria = new LinkedList<ISearchPrimitive>();
+ for (String teamArtName : TeamWorkflowExtensions.getInstance().getAllTeamWorkflowArtifactNames())
+ teamWorkflowCriteria.add(new ArtifactTypeSearch(teamArtName, Operator.EQUAL));
+ FromArtifactsSearch teamWorkflowSearch = new FromArtifactsSearch(teamWorkflowCriteria, false);
+
+ List<ISearchPrimitive> allProductCriteria = new LinkedList<ISearchPrimitive>();
+ allProductCriteria.add(teamDefWorkflowSearch);
+ allProductCriteria.add(teamWorkflowSearch);
+ if (selectedVersion != null) allProductCriteria.add(new InRelationSearch(versionWorkflowSearch,
+ RelationSide.TeamWorkflowTargetedForVersion_Workflow));
+ FromArtifactsSearch allTeamWorkflows = new FromArtifactsSearch(allProductCriteria, true);
+
+ List<ISearchPrimitive> taskCriteria = new LinkedList<ISearchPrimitive>();
+ taskCriteria.add(new InRelationSearch(allTeamWorkflows, RelationSide.SmaToTask_Task));
+
+ if (isCancelled()) return EMPTY_SET;
+ Collection<Artifact> arts =
+ ArtifactPersistenceManager.getInstance().getArtifacts(taskCriteria, true,
+ BranchPersistenceManager.getInstance().getAtsBranch());
+
+ if (isCancelled()) return EMPTY_SET;
+ return arts;
+ }
+
+ @Override
+ public void performUI(SearchType searchType) {
+ super.performUI(searchType);
+ if (teamDefs != null) return;
+ if (searchType == SearchType.ReSearch && selectedTeamDefs != null) return;
+ TeamDefinitionTreeByVersionDialog diag = new TeamDefinitionTreeByVersionDialog(Active.Both);
+ // set to null will not show the showAction or showFinished checkbox
+ diag.setShowAction(null);
+ diag.setShowFinished(null);
+ diag.setRecurseChildren(recurseChildren);
+ int result = diag.open();
+ if (result == 0) {
+ selectedVersion = diag.getSelectedVersion();
+ recurseChildren = diag.isRecurseChildren();
+ if (selectedTeamDefs == null)
+ selectedTeamDefs = new HashSet<TeamDefinitionArtifact>();
+ else
+ selectedTeamDefs.clear();
+ for (Object obj : diag.getResult())
+ selectedTeamDefs.add((TeamDefinitionArtifact) obj);
+ return;
+ }
+ cancelled = true;
+ }
+
+ /**
+ * @return the recurseChildren
+ */
+ public boolean isRecurseChildren() {
+ return recurseChildren;
+ }
+
+ /**
+ * @param recurseChildren the recurseChildren to set
+ */
+ public void setRecurseChildren(boolean recurseChildren) {
+ this.recurseChildren = recurseChildren;
+ }
+
+}
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 9d36006093f..1a21b3e6a64 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,13 +27,22 @@ 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;
+ public static enum LoadView {
+ WorldView, TaskEditor
+ }
public static enum SearchType {
Search, ReSearch
};
public WorldSearchItem(String name) {
+ this(name, LoadView.WorldView);
+ }
+
+ public WorldSearchItem(String name, LoadView loadView) {
super();
this.name = name;
+ this.loadView = loadView;
this.cancelled = false;
}
@@ -99,4 +108,11 @@ public abstract class WorldSearchItem {
this.cancelled = cancelled;
}
+ /**
+ * @return the loadView
+ */
+ public LoadView getLoadView() {
+ return loadView;
+ }
+
}

Back to the top