diff options
author | ddunne | 2008-11-24 22:50:46 +0000 |
---|---|---|
committer | ddunne | 2008-11-24 22:50:46 +0000 |
commit | df4b86b5c67fc71aed546e8255a0f296239876b0 (patch) | |
tree | d2bbe789e28a5f5558cc43b1d57a449e4aa7bba2 /org.eclipse.osee.ats | |
parent | 30e7f2dd8a65d2d3605d9d0dde1ff8cf3fd0fc77 (diff) | |
download | org.eclipse.osee-df4b86b5c67fc71aed546e8255a0f296239876b0.tar.gz org.eclipse.osee-df4b86b5c67fc71aed546e8255a0f296239876b0.tar.xz org.eclipse.osee-df4b86b5c67fc71aed546e8255a0f296239876b0.zip |
Diffstat (limited to 'org.eclipse.osee.ats')
34 files changed, 261 insertions, 289 deletions
diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/wizard/NewActionWizard.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/wizard/NewActionWizard.java index a742adba0ea..0944a1deeec 100644 --- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/wizard/NewActionWizard.java +++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/wizard/NewActionWizard.java @@ -19,6 +19,7 @@ import org.eclipse.jface.wizard.Wizard; import org.eclipse.osee.ats.artifact.ActionArtifact; import org.eclipse.osee.ats.artifact.ActionableItemArtifact; import org.eclipse.osee.ats.util.AtsPriority.PriorityType; +import org.eclipse.osee.framework.db.connection.exception.OseeCoreException; import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction; import org.eclipse.osee.framework.ui.plugin.util.Result; import org.eclipse.osee.framework.ui.skynet.util.ChangeType; @@ -71,6 +72,7 @@ public class NewActionWizard extends Wizard implements INewWizard { /** * (non-Javadoc) Method declared on Wizard. */ + @Override public void addPages() { page1 = new NewActionPage1(this); addPage(page1); @@ -114,7 +116,7 @@ public class NewActionWizard extends Wizard implements INewWizard { return items; } - public PriorityType getPriority() { + public PriorityType getPriority() throws OseeCoreException { // Must use skynet attribute name cause this widget uses the OPTIONS_FROM_ATTRIBUTE_VALIDITY return PriorityType.getPriority(((XCombo) page2.getXWidget("ats.Priority")).get()); } diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/ATSLog.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/ATSLog.java index 76adf62fb63..e4843b890cf 100644 --- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/ATSLog.java +++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/ATSLog.java @@ -220,7 +220,7 @@ public class ATSLog { * @param type * @param state name of state or null * @param msg - * @throws IllegalStateException + * @throws OseeArgumentException * @throws MultipleAttributesExist */ public void addLog(LogType type, String state, String msg) throws OseeCoreException { diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/ActionArtifact.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/ActionArtifact.java index bb79cfdfd8c..f67b635b493 100644 --- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/ActionArtifact.java +++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/ActionArtifact.java @@ -28,6 +28,7 @@ import org.eclipse.osee.ats.util.AtsPriority.PriorityType; import org.eclipse.osee.ats.util.widgets.XActionableItemsDam; import org.eclipse.osee.ats.util.widgets.dialog.AICheckTreeDialog; import org.eclipse.osee.ats.world.IWorldViewArtifact; +import org.eclipse.osee.framework.db.connection.exception.OseeArgumentException; import org.eclipse.osee.framework.db.connection.exception.OseeCoreException; import org.eclipse.osee.framework.jdk.core.util.Collections; import org.eclipse.osee.framework.logging.OseeLog; @@ -816,11 +817,11 @@ public class ActionArtifact extends ATSArtifact implements IWorldViewArtifact { } /** - * Set teamworkflowartifact attributes off given action artifact + * Set Team Workflow attributes off given action artifact * * @param fromAction * @param toTeam - * @throws IllegalStateException + * @throws OseeArgumentException */ public static void setArtifactIdentifyData(ActionArtifact fromAction, TeamWorkFlowArtifact toTeam) throws OseeCoreException { String priorityStr = fromAction.getSoleAttributeValue(ATSAttributes.PRIORITY_TYPE_ATTRIBUTE.getStoreName(), ""); @@ -830,7 +831,7 @@ public class ActionArtifact extends ATSArtifact implements IWorldViewArtifact { else if (!priorityStr.equals("")) priType = PriorityType.getPriority(priorityStr); else - throw new IllegalArgumentException("Invalid priority => " + priorityStr); + throw new OseeArgumentException("Invalid priority => " + priorityStr); setArtifactIdentifyData(toTeam, fromAction.getDescriptiveName(), fromAction.getSoleAttributeValue( ATSAttributes.DESCRIPTION_ATTRIBUTE.getStoreName(), ""), ChangeType.getChangeType(fromAction.getSoleAttributeValue( diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/DecisionReviewArtifact.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/DecisionReviewArtifact.java index e268c74786f..c0dcea3625e 100644 --- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/DecisionReviewArtifact.java +++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/DecisionReviewArtifact.java @@ -19,6 +19,7 @@ import org.eclipse.osee.ats.util.AtsRelation; import org.eclipse.osee.ats.util.widgets.XDecisionOptions; import org.eclipse.osee.ats.world.IWorldViewArtifact; import org.eclipse.osee.framework.db.connection.exception.OseeCoreException; +import org.eclipse.osee.framework.db.connection.exception.OseeStateException; import org.eclipse.osee.framework.skynet.core.User; import org.eclipse.osee.framework.skynet.core.UserManager; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; @@ -54,9 +55,9 @@ public class DecisionReviewArtifact extends ReviewSMArtifact implements IReviewA public TeamWorkFlowArtifact getParentTeamWorkflow() throws OseeCoreException { Collection<TeamWorkFlowArtifact> teamArts = getRelatedArtifacts(AtsRelation.TeamWorkflowToReview_Team, TeamWorkFlowArtifact.class); - if (teamArts.size() == 0) throw new IllegalStateException( + if (teamArts.size() == 0) throw new OseeStateException( "Decision Review " + getHumanReadableId() + " has no parent workflow"); - if (teamArts.size() > 1) throw new IllegalStateException( + if (teamArts.size() > 1) throw new OseeStateException( "Decision Review " + getHumanReadableId() + " has multiple parent workflows"); return teamArts.iterator().next(); } diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/TeamWorkFlowArtifact.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/TeamWorkFlowArtifact.java index db4a0ed1d02..e54326a9b34 100644 --- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/TeamWorkFlowArtifact.java +++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/TeamWorkFlowArtifact.java @@ -29,6 +29,7 @@ import org.eclipse.osee.ats.workflow.item.AtsWorkDefinitions.RuleWorkItemId; import org.eclipse.osee.ats.world.IWorldViewArtifact; import org.eclipse.osee.framework.db.connection.exception.ArtifactDoesNotExist; import org.eclipse.osee.framework.db.connection.exception.OseeCoreException; +import org.eclipse.osee.framework.db.connection.exception.OseeStateException; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.User; import org.eclipse.osee.framework.skynet.core.UserManager; @@ -275,9 +276,9 @@ public class TeamWorkFlowArtifact extends TaskableStateMachineArtifact implement public ActionArtifact getParentActionArtifact() throws OseeCoreException { Collection<ActionArtifact> arts = getRelatedArtifacts(AtsRelation.ActionToWorkflow_Action, ActionArtifact.class); if (arts.size() == 0) { - throw new IllegalStateException("Team " + getHumanReadableId() + " has no parent Action"); + throw new OseeStateException("Team " + getHumanReadableId() + " has no parent Action"); } else if (arts.size() > 1) { - throw new IllegalStateException("Team " + getHumanReadableId() + " has multiple parent Actions"); + throw new OseeStateException("Team " + getHumanReadableId() + " has multiple parent Actions"); } else return arts.iterator().next(); } diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/VersionArtifact.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/VersionArtifact.java index c880cea4ca8..956bd81a528 100644 --- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/VersionArtifact.java +++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/VersionArtifact.java @@ -107,11 +107,11 @@ public class VersionArtifact extends BasicArtifact { } } - public Date getEstimatedReleaseDate() throws IllegalStateException, OseeCoreException { + public Date getEstimatedReleaseDate() throws OseeCoreException { return getSoleAttributeValue(ATSAttributes.ESTIMATED_RELEASE_DATE_ATTRIBUTE.getStoreName(), null); } - public Date getReleaseDate() throws IllegalStateException, OseeCoreException { + public Date getReleaseDate() throws OseeCoreException { return getSoleAttributeValue(ATSAttributes.RELEASE_DATE_ATTRIBUTE.getStoreName(), null); } diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAManager.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAManager.java index 8cd5f608001..3badf967359 100644 --- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAManager.java +++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAManager.java @@ -48,6 +48,7 @@ import org.eclipse.osee.ats.workflow.item.AtsWorkDefinitions; import org.eclipse.osee.framework.core.data.SystemUser; import org.eclipse.osee.framework.db.connection.exception.OseeArgumentException; import org.eclipse.osee.framework.db.connection.exception.OseeCoreException; +import org.eclipse.osee.framework.db.connection.exception.OseeStateException; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.User; import org.eclipse.osee.framework.skynet.core.UserManager; @@ -506,7 +507,7 @@ public class SMAManager { return true; } } - } catch (IllegalStateException ex) { + } catch (OseeStateException ex) { OSEELog.logException(AtsPlugin.class, ex, true); } 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 90cefd5f965..932a4f89444 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 @@ -74,7 +74,7 @@ public class OpenInAtsWorldOperation extends WorkPageService { */ @Override public String getName() { - return "Open in ATS World"; + return "Open in ATS World Editor"; } } diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/stateItem/AtsDecisionReviewDecisionStateItem.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/stateItem/AtsDecisionReviewDecisionStateItem.java index d346f168c41..268c29b06b6 100644 --- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/stateItem/AtsDecisionReviewDecisionStateItem.java +++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/stateItem/AtsDecisionReviewDecisionStateItem.java @@ -22,6 +22,7 @@ import org.eclipse.osee.ats.util.widgets.DecisionOption; import org.eclipse.osee.ats.util.widgets.XDecisionOptions; import org.eclipse.osee.ats.workflow.AtsWorkPage; import org.eclipse.osee.framework.db.connection.exception.OseeCoreException; +import org.eclipse.osee.framework.db.connection.exception.OseeStateException; import org.eclipse.osee.framework.skynet.core.User; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.ui.plugin.util.Result; @@ -40,6 +41,7 @@ public class AtsDecisionReviewDecisionStateItem extends AtsStateItem { * * @see org.eclipse.osee.ats.editor.IAtsStateItem#getId() */ + @Override public String getId() { return "osee.ats.decisionReview.Decision"; } @@ -51,9 +53,10 @@ public class AtsDecisionReviewDecisionStateItem extends AtsStateItem { * org.eclipse.ui.forms.widgets.FormToolkit, org.eclipse.osee.ats.workflow.AtsWorkPage, * org.eclipse.osee.framework.skynet.core.artifact.Artifact, org.eclipse.osee.framework.ui.skynet.widgets.XModifiedListener, boolean) */ + @Override public Result xWidgetCreating(XWidget xWidget, FormToolkit toolkit, AtsWorkPage page, Artifact art, XModifiedListener xModListener, boolean isEditable) throws OseeCoreException { if (xWidget.getLabel().equals(ATSAttributes.DECISION_ATTRIBUTE.getDisplayName())) { - if (xWidget == null) throw new IllegalStateException("Can't retrieve decision review combo widget to set."); + if (xWidget == null) throw new OseeStateException("Can't retrieve decision review combo widget to set."); XComboDam decisionComboDam = (XComboDam) xWidget; List<String> options = new ArrayList<String>(); XDecisionOptions xDecOptions = new XDecisionOptions((StateMachineArtifact) art); @@ -64,6 +67,7 @@ public class AtsDecisionReviewDecisionStateItem extends AtsStateItem { return Result.TrueResult; } + @Override public String getOverrideTransitionToStateName(SMAWorkFlowSection section) throws OseeCoreException { DecisionOption decisionOption = getDecisionOption(section); if (decisionOption == null) return null; @@ -80,6 +84,7 @@ public class AtsDecisionReviewDecisionStateItem extends AtsStateItem { * * @see org.eclipse.osee.ats.editor.IAtsStateItem#getOverrideTransitionToAssignees(org.eclipse.osee.ats.editor.SMAWorkFlowSection) */ + @Override public Collection<User> getOverrideTransitionToAssignees(SMAWorkFlowSection section) throws OseeCoreException { DecisionOption decisionOption = getDecisionOption(section); if (decisionOption == null) return null; diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/AtsNavigateComposite.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/AtsNavigateComposite.java index 7ed8005b4a9..fc9faa6b6b2 100644 --- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/AtsNavigateComposite.java +++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/AtsNavigateComposite.java @@ -15,7 +15,6 @@ import org.eclipse.osee.ats.AtsPlugin; import org.eclipse.osee.ats.task.TaskEditor; import org.eclipse.osee.ats.task.TaskEditorParameterSearchItem; import org.eclipse.osee.ats.task.TaskEditorParameterSearchItemProvider; -import org.eclipse.osee.ats.task.TaskEditorSearchItemProvider; import org.eclipse.osee.ats.world.WorldEditor; import org.eclipse.osee.ats.world.WorldEditorParameterSearchItem; import org.eclipse.osee.ats.world.WorldEditorParameterSearchItemProvider; @@ -70,13 +69,15 @@ public class AtsNavigateComposite extends XNavigateComposite { } else if (worldSearchItem instanceof WorldEditorParameterSearchItem) { WorldEditor.open(new WorldEditorParameterSearchItemProvider( (WorldEditorParameterSearchItem) worldSearchItem.copy(), null, tableLoadOptions)); + } else { + AWorkbench.popup("ERROR", "Unhandled WorldEditor navigate item"); } } else if (worldSearchItem.getLoadView() == LoadView.TaskEditor) { - if (worldSearchItem instanceof WorldUISearchItem) { - TaskEditor.open(new TaskEditorSearchItemProvider(worldSearchItem.copy(), tableLoadOptions)); - } else if (worldSearchItem instanceof TaskEditorParameterSearchItem) { + if (worldSearchItem instanceof TaskEditorParameterSearchItem) { TaskEditor.open(new TaskEditorParameterSearchItemProvider( (TaskEditorParameterSearchItem) worldSearchItem.copy())); + } else { + AWorkbench.popup("ERROR", "Unhandled TaskEditor navigate item"); } } else { AWorkbench.popup("ERROR", "Unhandled navigate item"); 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 c279b9123f8..7e2764b4d3c 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,6 @@ 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.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; @@ -45,12 +44,11 @@ import org.eclipse.osee.ats.world.search.MyFavoritesSearchItem; import org.eclipse.osee.ats.world.search.MyOrigSearchItem; import org.eclipse.osee.ats.world.search.MyReviewWorkflowItem; import org.eclipse.osee.ats.world.search.MySubscribedSearchItem; -import org.eclipse.osee.ats.world.search.MyTaskSearchItem; -import org.eclipse.osee.ats.world.search.MyTeamWFSearchItem; import org.eclipse.osee.ats.world.search.MyWorldSearchItem; import org.eclipse.osee.ats.world.search.NextVersionSearchItem; import org.eclipse.osee.ats.world.search.ShowOpenWorkflowsByArtifactType; import org.eclipse.osee.ats.world.search.StateWorldSearchItem; +import org.eclipse.osee.ats.world.search.TaskSearchWorldSearchItem; import org.eclipse.osee.ats.world.search.UserCommunitySearchItem; import org.eclipse.osee.ats.world.search.UserRelatedToAtsObjectSearch; import org.eclipse.osee.ats.world.search.VersionTargetedForTeamSearchItem; @@ -105,8 +103,6 @@ public class AtsNavigateViewItems extends XNavigateViewItems { items.add(new SearchNavigateItem(null, new MyWorldSearchItem("User's World"))); XNavigateItem otherItems = new XNavigateItem(null, "Other My Searches"); - new SearchNavigateItem(otherItems, new MyTeamWFSearchItem("My Team Workflows", user)); - new SearchNavigateItem(otherItems, new MyTaskSearchItem("My Tasks", user, LoadView.TaskEditor)); new SearchNavigateItem(otherItems, new MySubscribedSearchItem("My Subscribed", user)); new SearchNavigateItem(otherItems, new MyOrigSearchItem("My Originator - InWork", user, MyOrigSearchItem.OriginatedState.InWork)); @@ -122,8 +118,6 @@ public class AtsNavigateViewItems extends XNavigateViewItems { MyOrigSearchItem.OriginatedState.InWork)); new SearchNavigateItem(otherItems, new MyOrigSearchItem("User's Originator - All", null, MyOrigSearchItem.OriginatedState.All)); - new SearchNavigateItem(otherItems, new MyTeamWFSearchItem("User's Team Workflows")); - new SearchNavigateItem(otherItems, new MyTaskSearchItem("User's Tasks", 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")); diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/NavigateView.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/NavigateView.java index ae27880ffe9..25dd49f9051 100644 --- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/NavigateView.java +++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/NavigateView.java @@ -20,6 +20,7 @@ import org.eclipse.osee.ats.actions.NewAction; import org.eclipse.osee.ats.config.BulkLoadAtsCache; import org.eclipse.osee.ats.world.search.MultipleHridSearchItem; import org.eclipse.osee.ats.world.search.MyWorldSearchItem; +import org.eclipse.osee.framework.core.client.ClientSessionManager; import org.eclipse.osee.framework.db.connection.exception.OseeCoreException; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.UserManager; @@ -32,7 +33,10 @@ import org.eclipse.osee.framework.ui.skynet.util.OSEELog; import org.eclipse.osee.framework.ui.skynet.widgets.xnavigate.XNavigateItem; import org.eclipse.osee.framework.ui.skynet.widgets.xnavigate.XNavigateComposite.TableLoadOption; import org.eclipse.swt.SWT; +import org.eclipse.swt.layout.GridData; import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Display; +import org.eclipse.swt.widgets.Label; import org.eclipse.ui.IMemento; import org.eclipse.ui.IViewSite; import org.eclipse.ui.IWorkbenchPage; @@ -81,6 +85,35 @@ public class NavigateView extends ViewPart implements IActionable { } xNavComp.refresh(); xNavComp.getFilteredTree().getFilterControl().setFocus(); + + Label label = new Label(xNavComp, SWT.None); + String str = getWhoAmI(); + if (AtsPlugin.isAtsAdmin()) str += " - Admin"; + if (AtsPlugin.isAtsDisableEmail()) str += " - Email Disabled"; + if (AtsPlugin.isAtsAlwaysEmailMe()) str += " - AtsAlwaysEmailMe"; + if (!str.equals("")) { + if (AtsPlugin.isAtsAdmin()) { + label.setForeground(Display.getCurrent().getSystemColor(SWT.COLOR_RED)); + } else { + label.setForeground(Display.getCurrent().getSystemColor(SWT.COLOR_BLUE)); + } + } + label.setText(str); + label.setToolTipText(str); + GridData gridData = new GridData(GridData.HORIZONTAL_ALIGN_CENTER | GridData.VERTICAL_ALIGN_CENTER); + gridData.heightHint = 15; + label.setLayoutData(gridData); + } + + private String getWhoAmI() { + try { + String userName = UserManager.getUser().getName(); + return String.format("%s - %s:%s", userName, ClientSessionManager.getDataStoreName(), + ClientSessionManager.getDataStoreLoginName()); + } catch (Exception ex) { + OseeLog.log(AtsPlugin.class, Level.SEVERE, ex); + return "Exception: " + ex.getLocalizedMessage(); + } } protected void createActions() { diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/report/CreateActionArtifactChangeReportJob.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/report/CreateActionArtifactChangeReportJob.java index 9a3b565fd52..52b94f669bf 100644 --- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/report/CreateActionArtifactChangeReportJob.java +++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/report/CreateActionArtifactChangeReportJob.java @@ -16,7 +16,6 @@ import java.util.Collection; import java.util.List; import java.util.Set; import java.util.logging.Level; - import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; @@ -27,6 +26,7 @@ import org.eclipse.osee.ats.artifact.TeamWorkFlowArtifact; import org.eclipse.osee.ats.artifact.VersionArtifact; import org.eclipse.osee.framework.core.enums.ModificationType; import org.eclipse.osee.framework.db.connection.exception.OseeCoreException; +import org.eclipse.osee.framework.db.connection.exception.OseeStateException; import org.eclipse.osee.framework.jdk.core.util.AHTML; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; @@ -62,7 +62,7 @@ public class CreateActionArtifactChangeReportJob extends Job { public static IStatus runIt(IProgressMonitor monitor, String jobName, Collection<TeamWorkFlowArtifact> teamArts, String byAttribute) { XResultData rd = new XResultData(); try { - if (teamArts.size() == 0) throw new IllegalStateException("No Actions/Workflows Specified"); + if (teamArts.size() == 0) throw new OseeStateException("No Actions/Workflows Specified"); retrieveData(monitor, teamArts, byAttribute, rd); if (rd.toString().equals("")) rd.log("No Problems Found"); final String html = rd.getReport(jobName).getManipulatedHtml(Arrays.asList(Manipulations.NONE)); diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/task/TaskEditor.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/task/TaskEditor.java index 10cd7c89036..72011e2ee0e 100644 --- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/task/TaskEditor.java +++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/task/TaskEditor.java @@ -29,12 +29,12 @@ import org.eclipse.osee.ats.world.IAtsMetricsProvider; import org.eclipse.osee.ats.world.WorldEditorParameterSearchItemProvider; import org.eclipse.osee.ats.world.search.WorldSearchItem.SearchType; import org.eclipse.osee.framework.db.connection.exception.OseeCoreException; -import org.eclipse.osee.framework.logging.OseeLevel; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction; 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.Result; import org.eclipse.osee.framework.ui.skynet.OseeContributionItem; import org.eclipse.osee.framework.ui.skynet.artifact.editor.AbstractArtifactEditor; import org.eclipse.osee.framework.ui.skynet.util.OSEELog; @@ -70,7 +70,7 @@ public class TaskEditor extends AbstractArtifactEditor implements IDirtiableEdit } transaction.execute(); } catch (Exception ex) { - OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex); + OSEELog.logException(AtsPlugin.class, ex, true); } onDirtied(); } @@ -179,18 +179,26 @@ public class TaskEditor extends AbstractArtifactEditor implements IDirtiableEdit if (provider instanceof TaskEditorParameterSearchItemProvider && ((TaskEditorParameterSearchItemProvider) provider).isFirstTime()) { setPartName(provider.getName()); setTableTitle(WorldEditorParameterSearchItemProvider.ENTER_OPTIONS_AND_SELECT_SEARCH, false); - } else { - LoadTableJob job = null; - job = new LoadTableJob(provider, SearchType.ReSearch, this); - job.setUser(false); - job.setPriority(Job.LONG); - job.schedule(); - if (provider.getTableLoadOptions().contains(TableLoadOption.ForcePend)) { - try { - job.join(); - } catch (InterruptedException ex) { - OseeLog.log(AtsPlugin.class, Level.SEVERE, ex); - } + return; + } + if (provider instanceof TaskEditorParameterSearchItemProvider) { + Result result = + ((TaskEditorParameterSearchItemProvider) provider).getWorldSearchItem().isParameterSelectionValid(); + if (result.isFalse()) { + result.popup(); + return; + } + } + LoadTableJob job = null; + job = new LoadTableJob(provider, SearchType.ReSearch, this); + job.setUser(false); + job.setPriority(Job.LONG); + job.schedule(); + if (provider.getTableLoadOptions().contains(TableLoadOption.ForcePend)) { + try { + job.join(); + } catch (InterruptedException ex) { + OseeLog.log(AtsPlugin.class, Level.SEVERE, ex); } } } diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsBranchManager.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsBranchManager.java index eebd7fccf10..0b533d6a3cf 100644 --- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsBranchManager.java +++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsBranchManager.java @@ -40,6 +40,7 @@ import org.eclipse.osee.framework.db.connection.exception.BranchDoesNotExist; import org.eclipse.osee.framework.db.connection.exception.MultipleAttributesExist;
import org.eclipse.osee.framework.db.connection.exception.MultipleBranchesExist;
import org.eclipse.osee.framework.db.connection.exception.OseeCoreException;
+import org.eclipse.osee.framework.db.connection.exception.OseeStateException;
import org.eclipse.osee.framework.db.connection.exception.TransactionDoesNotExist;
import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.skynet.core.User;
@@ -297,7 +298,7 @@ public class AtsBranchManager { private void createNecessaryBranchEventReviews(StateEventType stateEventType, SMAManager smaMgr, SkynetTransaction transaction) throws OseeCoreException {
if (stateEventType != StateEventType.CommitBranch && stateEventType != StateEventType.CreateBranch) {
- throw new IllegalStateException("Invalid stateEventType = " + stateEventType);
+ throw new OseeStateException("Invalid stateEventType = " + stateEventType);
}
// Create any decision and peerToPeer reviews for createBranch and commitBranch
for (String ruleId : Arrays.asList(AtsAddDecisionReviewRule.ID, AtsAddPeerToPeerReviewRule.ID)) {
@@ -419,8 +420,8 @@ public class AtsBranchManager { }
private final class AtsCommitJob extends Job {
- private boolean commitPopup;
- private boolean overrideStateValidation;
+ private final boolean commitPopup;
+ private final boolean overrideStateValidation;
/**
* @param name
diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsLib.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsLib.java index c0560e658a9..665dc1b682f 100644 --- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsLib.java +++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsLib.java @@ -27,6 +27,8 @@ import org.eclipse.osee.ats.artifact.VersionArtifact; import org.eclipse.osee.ats.config.AtsCache; import org.eclipse.osee.ats.config.BulkLoadAtsCache; import org.eclipse.osee.ats.editor.SMAEditor; +import org.eclipse.osee.ats.task.TaskEditor; +import org.eclipse.osee.ats.task.TaskEditorSimpleProvider; import org.eclipse.osee.ats.world.WorldEditor; import org.eclipse.osee.ats.world.WorldEditorSimpleProvider; import org.eclipse.osee.framework.db.connection.exception.ArtifactDoesNotExist; @@ -264,7 +266,16 @@ public class AtsLib implements IAtsLib { } @Override - public void openInAtsWorld(String name, Collection<Artifact> artifacts) throws OseeCoreException { + public void openInAtsWorldEditor(String name, Collection<Artifact> artifacts) throws OseeCoreException { WorldEditor.open(new WorldEditorSimpleProvider(name, artifacts)); } + + /* (non-Javadoc) + * @see org.eclipse.osee.framework.ui.skynet.ats.IAtsLib#openInAtsTaskEditor(java.lang.String, java.util.Collection) + */ + @Override + public void openInAtsTaskEditor(String name, Collection<Artifact> artifacts) throws OseeCoreException { + TaskEditor.open(new TaskEditorSimpleProvider(name, artifacts)); + } + } diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsPriority.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsPriority.java index a2899f9d6b1..2365a068202 100644 --- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsPriority.java +++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsPriority.java @@ -11,6 +11,8 @@ package org.eclipse.osee.ats.util; import org.eclipse.osee.ats.AtsPlugin; +import org.eclipse.osee.framework.db.connection.exception.OseeCoreException; +import org.eclipse.osee.framework.db.connection.exception.OseeStateException; /** * @author Donald G. Dunne @@ -48,16 +50,17 @@ public class AtsPriority { return priorities; } + @Override public String toString() { return shortName; } - public static PriorityType getPriority(String type) { + public static PriorityType getPriority(String type) throws OseeCoreException { if (type == null || type.equals("")) return PriorityType.None; for (PriorityType pri : PriorityType.values()) { if (type.equals(pri.getShortName())) return pri; } - throw new IllegalStateException("Invalid priority => " + type); + throw new OseeStateException("Invalid priority => " + type); } }; diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/SMAState.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/SMAState.java index 70d352d5406..00707ac0563 100644 --- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/SMAState.java +++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/SMAState.java @@ -86,7 +86,7 @@ public class SMAState { if (assignees.size() > 1 && assignees.contains(UserManager.getUser(SystemUser.UnAssigned))) { throw new OseeArgumentException("Can not assign to user and UnAssigned"); } - if (assignees.size() > 0 && (name.equals(DefaultTeamState.Completed.name()) || name.equals(DefaultTeamState.Cancelled.name()))) throw new IllegalStateException( + if (assignees.size() > 0 && (name.equals(DefaultTeamState.Completed.name()) || name.equals(DefaultTeamState.Cancelled.name()))) throw new OseeStateException( "Can't assign completed/cancelled states."); this.assignees.clear(); if (assignees != null) this.assignees.addAll(assignees); diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/defect/DefectXViewer.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/defect/DefectXViewer.java index 1f625f125cd..6132ac265ca 100644 --- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/defect/DefectXViewer.java +++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/defect/DefectXViewer.java @@ -21,6 +21,7 @@ import org.eclipse.osee.ats.AtsPlugin; import org.eclipse.osee.ats.util.widgets.defect.DefectItem.Disposition; import org.eclipse.osee.ats.util.widgets.defect.DefectItem.InjectionActivity; import org.eclipse.osee.ats.util.widgets.defect.DefectItem.Severity; +import org.eclipse.osee.framework.db.connection.exception.OseeStateException; import org.eclipse.osee.framework.skynet.core.User; import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction; import org.eclipse.osee.framework.ui.plugin.util.EnumStringSingleSelectionDialog; @@ -165,7 +166,8 @@ public class DefectXViewer extends XViewer { modified = handleAltLeftClick(treeColumn, treeItem); } if (modified) { - SkynetTransaction transaction = new SkynetTransaction(xDefectViewer.getReviewArt().getArtifact().getBranch()); + SkynetTransaction transaction = + new SkynetTransaction(xDefectViewer.getReviewArt().getArtifact().getBranch()); xDefectViewer.getReviewArt().getDefectManager().addOrUpdateDefectItem(defectItem, false, transaction); transaction.execute(); xDefectViewer.refresh(); @@ -270,10 +272,11 @@ public class DefectXViewer extends XViewer { } } } else - throw new IllegalStateException("Unhandled defect column"); + throw new OseeStateException("Unhandled defect column"); if (modified) { - SkynetTransaction transaction = new SkynetTransaction(xDefectViewer.getReviewArt().getArtifact().getBranch()); + SkynetTransaction transaction = + new SkynetTransaction(xDefectViewer.getReviewArt().getArtifact().getBranch()); xDefectViewer.getReviewArt().getDefectManager().addOrUpdateDefectItem(defectItem, false, transaction); transaction.execute(); xDefectViewer.notifyXModifiedListeners(); diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/role/UserRoleXViewer.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/role/UserRoleXViewer.java index c7aa7550a0a..8dbbdc7ec89 100644 --- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/role/UserRoleXViewer.java +++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/role/UserRoleXViewer.java @@ -17,6 +17,7 @@ import org.eclipse.jface.action.IMenuManager; import org.eclipse.jface.action.MenuManager; import org.eclipse.jface.action.Separator; import org.eclipse.osee.ats.util.widgets.role.UserRole.Role; +import org.eclipse.osee.framework.db.connection.exception.OseeStateException; import org.eclipse.osee.framework.skynet.core.User; import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction; import org.eclipse.osee.framework.ui.plugin.util.AWorkbench; @@ -181,10 +182,11 @@ public class UserRoleXViewer extends XViewer { } } } else - throw new IllegalStateException("Unhandled user role column"); + throw new OseeStateException("Unhandled user role column"); if (modified) { - SkynetTransaction transaction = new SkynetTransaction(xUserRoleViewer.getReviewArt().getArtifact().getBranch()); + SkynetTransaction transaction = + new SkynetTransaction(xUserRoleViewer.getReviewArt().getArtifact().getBranch()); xUserRoleViewer.getReviewArt().getUserRoleManager().addOrUpdateUserRole(userRole, false, transaction); transaction.execute(); xUserRoleViewer.refresh(); diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/flow/DecisionWorkflowDefinition.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/flow/DecisionWorkflowDefinition.java index 2728eeb9e46..2fe5aa279d7 100644 --- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/flow/DecisionWorkflowDefinition.java +++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/flow/DecisionWorkflowDefinition.java @@ -16,6 +16,7 @@ import org.eclipse.osee.ats.workflow.page.AtsDecisionDecisionWorkPageDefinition; import org.eclipse.osee.ats.workflow.page.AtsDecisionFollowupWorkPageDefinition;
import org.eclipse.osee.ats.workflow.page.AtsDecisionPrepareWorkPageDefinition;
import org.eclipse.osee.framework.db.connection.exception.OseeCoreException;
+import org.eclipse.osee.framework.db.connection.exception.OseeStateException;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkFlowDefinition;
import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkItemDefinition;
@@ -39,7 +40,7 @@ public class DecisionWorkflowDefinition extends WorkFlowDefinition { public DecisionWorkflowDefinition(Artifact artifact) throws OseeCoreException {
super(artifact);
- throw new IllegalStateException("This constructor should never be used.");
+ throw new OseeStateException("This constructor should never be used.");
}
public void config(WriteType writeType, XResultData xResultData) throws OseeCoreException {
diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/flow/PeerToPeerWorkflowDefinition.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/flow/PeerToPeerWorkflowDefinition.java index 0fe2e2ac947..16605ac83c4 100644 --- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/flow/PeerToPeerWorkflowDefinition.java +++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/flow/PeerToPeerWorkflowDefinition.java @@ -15,6 +15,7 @@ import org.eclipse.osee.ats.workflow.page.AtsCompletedWorkPageDefinition; import org.eclipse.osee.ats.workflow.page.AtsPeerPrepareWorkPageDefinition;
import org.eclipse.osee.ats.workflow.page.AtsPeerReviewWorkPageDefinition;
import org.eclipse.osee.framework.db.connection.exception.OseeCoreException;
+import org.eclipse.osee.framework.db.connection.exception.OseeStateException;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkFlowDefinition;
import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkItemDefinition;
@@ -39,7 +40,7 @@ public class PeerToPeerWorkflowDefinition extends WorkFlowDefinition { public PeerToPeerWorkflowDefinition(Artifact artifact) throws OseeCoreException {
super(artifact);
- throw new IllegalStateException("This constructor should never be used.");
+ throw new OseeStateException("This constructor should never be used.");
}
public void config(WriteType writeType, XResultData xResultData) throws OseeCoreException {
diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/flow/SimpleWorkflowDefinition.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/flow/SimpleWorkflowDefinition.java index 7c404fbc5d4..4b9e45a7196 100644 --- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/flow/SimpleWorkflowDefinition.java +++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/flow/SimpleWorkflowDefinition.java @@ -15,6 +15,7 @@ import org.eclipse.osee.ats.workflow.page.AtsCompletedWorkPageDefinition; import org.eclipse.osee.ats.workflow.page.AtsEndorseWorkPageDefinition;
import org.eclipse.osee.ats.workflow.page.AtsSimpleInWorkWorkPageDefinition;
import org.eclipse.osee.framework.db.connection.exception.OseeCoreException;
+import org.eclipse.osee.framework.db.connection.exception.OseeStateException;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkFlowDefinition;
import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkItemDefinition;
@@ -37,7 +38,7 @@ public class SimpleWorkflowDefinition extends WorkFlowDefinition { public SimpleWorkflowDefinition(Artifact artifact) throws OseeCoreException {
super(artifact);
- throw new IllegalStateException("This constructor should never be used.");
+ throw new OseeStateException("This constructor should never be used.");
}
public SimpleWorkflowDefinition() {
diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/flow/TaskWorkflowDefinition.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/flow/TaskWorkflowDefinition.java index 6a9d7707556..fdad93f2d70 100644 --- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/flow/TaskWorkflowDefinition.java +++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/flow/TaskWorkflowDefinition.java @@ -14,6 +14,7 @@ import org.eclipse.osee.ats.workflow.page.AtsCancelledWorkPageDefinition; import org.eclipse.osee.ats.workflow.page.AtsCompletedWorkPageDefinition;
import org.eclipse.osee.ats.workflow.page.AtsTaskInWorkPageDefinition;
import org.eclipse.osee.framework.db.connection.exception.OseeCoreException;
+import org.eclipse.osee.framework.db.connection.exception.OseeStateException;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkFlowDefinition;
import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkItemDefinition;
@@ -34,7 +35,7 @@ public class TaskWorkflowDefinition extends WorkFlowDefinition { public TaskWorkflowDefinition(Artifact artifact) throws OseeCoreException {
super(artifact);
- throw new IllegalStateException("This constructor should never be used.");
+ throw new OseeStateException("This constructor should never be used.");
}
public void config(WriteType writeType, XResultData xResultData) throws OseeCoreException {
diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/flow/TeamWorkflowDefinition.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/flow/TeamWorkflowDefinition.java index d15073310a3..4c03cb2ad88 100644 --- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/flow/TeamWorkflowDefinition.java +++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/flow/TeamWorkflowDefinition.java @@ -17,6 +17,7 @@ import org.eclipse.osee.ats.workflow.page.AtsCompletedWorkPageDefinition; import org.eclipse.osee.ats.workflow.page.AtsEndorseWorkPageDefinition;
import org.eclipse.osee.ats.workflow.page.AtsImplementWorkPageDefinition;
import org.eclipse.osee.framework.db.connection.exception.OseeCoreException;
+import org.eclipse.osee.framework.db.connection.exception.OseeStateException;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkFlowDefinition;
import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkItemDefinition;
@@ -37,7 +38,7 @@ public class TeamWorkflowDefinition extends WorkFlowDefinition { public TeamWorkflowDefinition(Artifact artifact) throws OseeCoreException {
super(artifact);
- throw new IllegalStateException("This constructor should never be used.");
+ throw new OseeStateException("This constructor should never be used.");
}
/**
diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/AtsMetricsComposite.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/AtsMetricsComposite.java index 9a82686ad8a..ad9524a0e82 100644 --- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/AtsMetricsComposite.java +++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/AtsMetricsComposite.java @@ -10,6 +10,7 @@ import java.util.Collection; import java.util.List;
import java.util.logging.Level;
import org.eclipse.osee.ats.AtsPlugin;
+import org.eclipse.osee.ats.artifact.ATSAttributes;
import org.eclipse.osee.ats.artifact.TeamWorkFlowArtifact;
import org.eclipse.osee.ats.util.SMAMetrics;
import org.eclipse.osee.framework.db.connection.exception.OseeCoreException;
@@ -189,13 +190,20 @@ public class AtsMetricsComposite extends ScrolledComposite { try {
if (iAtsMetricsProvider.getMetricsVersionArtifact() != null) {
+ lines.add(new XBarGraphLine("Targeted Version", 0,
+ iAtsMetricsProvider.getMetricsVersionArtifact().toString()));
+ lines.add(new XBarGraphLine("Estimated Release Date", 0,
+ iAtsMetricsProvider.getMetricsVersionArtifact().getSoleAttributeValueAsString(
+ ATSAttributes.ESTIMATED_RELEASE_DATE_ATTRIBUTE.getStoreName(), "Not Set")));
double hoursTillRelease = sMet.getHoursTillRel();
double hoursRemaining = sMet.getHrsRemain();
int percent = 0;
if (hoursTillRelease != 0) {
percent = (int) (hoursRemaining / hoursTillRelease);
}
- if (percent == 0 || hoursRemaining > hoursTillRelease) {
+ if (sMet.getEstRelDate() == null) {
+ lines.add(new XBarGraphLine("Release Effort Remaining", 0, "Estimated Release Date Not Set"));
+ } else if (percent == 0 || hoursRemaining > hoursTillRelease) {
lines.add(new XBarGraphLine("Release Effort Remaining", XBarGraphLine.DEFAULT_RED_FOREGROUND,
XBarGraphLine.DEFAULT_RED_BACKGROUND, 100, String.format(
"%5.2f hours exceeds remaining release hours %5.2f", hoursRemaining, hoursTillRelease)));
@@ -234,7 +242,8 @@ public class AtsMetricsComposite extends ScrolledComposite { }
lines.add(XBarGraphLine.getPercentLine(user.getName() + " (" + completed + "/" + total + ")", percentComplete));
}
- XBarGraphTable table = new XBarGraphTable("Completed by Assignee", "User", "Percent Complete", lines);
+ XBarGraphTable table =
+ new XBarGraphTable("Completed by Assignee per Assigned Workflow", "User", "Percent Complete", lines);
table.setFillHorizontally(true);
table.createWidgets(parent, 1);
adapt(table);
@@ -258,7 +267,9 @@ public class AtsMetricsComposite extends ScrolledComposite { }
}
}
- if (versionHoursRemain == null) {
+ if (sMet.getEstRelDate() == null) {
+ lines.add(new XBarGraphLine(user.getName(), 0, "Estimated Release Date Not Set"));
+ } else if (versionHoursRemain == null) {
lines.add(new XBarGraphLine(user.getName(), (int) userHoursRemain, String.format("%5.2f",
userHoursRemain)));
} else {
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 6d8fced8997..5b62ffa7c97 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 @@ -10,6 +10,10 @@ import java.util.Collection; import java.util.HashSet;
import java.util.Set;
import java.util.logging.Level;
+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.jface.action.Action;
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jface.viewers.ILabelProvider;
@@ -27,10 +31,8 @@ import org.eclipse.osee.ats.artifact.VersionArtifact; import org.eclipse.osee.ats.util.SMAMetrics;
import org.eclipse.osee.ats.world.search.WorldSearchItem;
import org.eclipse.osee.ats.world.search.WorldSearchItem.SearchType;
-import org.eclipse.osee.framework.core.client.ClientSessionManager;
import org.eclipse.osee.framework.db.connection.exception.OseeCoreException;
import org.eclipse.osee.framework.logging.OseeLog;
-import org.eclipse.osee.framework.skynet.core.UserManager;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
import org.eclipse.osee.framework.skynet.core.event.FrameworkTransactionData;
import org.eclipse.osee.framework.skynet.core.event.IFrameworkTransactionEventListener;
@@ -38,6 +40,7 @@ import org.eclipse.osee.framework.skynet.core.event.OseeEventManager; import org.eclipse.osee.framework.skynet.core.event.Sender;
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.Jobs;
import org.eclipse.osee.framework.ui.skynet.artifact.editor.ArtifactEditor;
import org.eclipse.osee.framework.ui.skynet.util.DbConnectionExceptionComposite;
import org.eclipse.osee.framework.ui.skynet.util.OSEELog;
@@ -65,7 +68,6 @@ import org.eclipse.swt.widgets.MenuItem; import org.eclipse.swt.widgets.ToolBar;
import org.eclipse.swt.widgets.ToolItem;
import org.eclipse.swt.widgets.Tree;
-import org.eclipse.swt.widgets.TreeItem;
/**
* @author Donald G. Dunne
@@ -282,34 +284,11 @@ public class WorldComposite extends ScrolledComposite implements IFrameworkTrans SMAMetrics sMet = new SMAMetrics(getXViewer().getSelectedSMAArtifacts(), null);
str = sMet.toString();
}
- if (str.equals("")) {
- str = getWhoAmI();
- if (AtsPlugin.isAtsAdmin()) str += " - Admin";
- if (AtsPlugin.isAtsDisableEmail()) str += " - Email Disabled";
- if (AtsPlugin.isAtsAlwaysEmailMe()) str += " - AtsAlwaysEmailMe";
- if (!str.equals("")) {
- if (AtsPlugin.isAtsAdmin()) {
- extraInfoLabel.setForeground(Display.getCurrent().getSystemColor(SWT.COLOR_RED));
- } else {
- extraInfoLabel.setForeground(Display.getCurrent().getSystemColor(SWT.COLOR_BLUE));
- }
- }
- }
+
extraInfoLabel.setText(str);
extraInfoLabel.getParent().layout();
}
- private String getWhoAmI() {
- try {
- String userName = UserManager.getUser().getName();
- return String.format("%s - %s:%s", userName, ClientSessionManager.getDataStoreName(),
- ClientSessionManager.getDataStoreLoginName());
- } catch (Exception ex) {
- OseeLog.log(AtsPlugin.class, Level.SEVERE, ex);
- return "Exception: " + ex.getLocalizedMessage();
- }
- }
-
protected void createActions() {
Action newWorldEditor = new Action("Open in ATS World Editor") {
@@ -528,72 +507,107 @@ public class WorldComposite extends ScrolledComposite implements IFrameworkTrans }
public void redisplayAsAction() {
- try {
- TreeItem treeItem[] = worldXViewer.getTree().getItems();
- Set<Artifact> arts = new HashSet<Artifact>();
- for (TreeItem item : treeItem) {
- Object obj = item.getData();
- if (obj instanceof Artifact) {
- Artifact art = (Artifact) obj;
- if (art instanceof ActionArtifact) {
- arts.add(art);
- } else if (art instanceof StateMachineArtifact) {
- Artifact parentArt = ((StateMachineArtifact) art).getParentActionArtifact();
- if (parentArt != null) {
- arts.add(parentArt);
+ final ArrayList<Artifact> artifacts = worldXViewer.getLoadedArtifacts();
+ Job job = new Job("Re-display as Actions") {
+ /* (non-Javadoc)
+ * @see org.eclipse.core.runtime.jobs.Job#run(org.eclipse.core.runtime.IProgressMonitor)
+ */
+ @Override
+ protected IStatus run(IProgressMonitor monitor) {
+ try {
+ final Set<Artifact> arts = new HashSet<Artifact>();
+ for (Artifact art : artifacts) {
+ if (art instanceof ActionArtifact) {
+ arts.add(art);
+ } else if (art instanceof StateMachineArtifact) {
+ Artifact parentArt = ((StateMachineArtifact) art).getParentActionArtifact();
+ if (parentArt != null) {
+ arts.add(parentArt);
+ }
}
}
+ Displays.ensureInDisplayThread(new Runnable() {
+ @Override
+ public void run() {
+ load(worldEditor.getCurrentTitleLabel(), arts);
+ }
+ });
+ } catch (OseeCoreException ex) {
+ OSEELog.logException(AtsPlugin.class, ex, true);
}
+ return Status.OK_STATUS;
}
- load(worldEditor.getCurrentTitleLabel(), arts);
- } catch (OseeCoreException ex) {
- OSEELog.logException(AtsPlugin.class, ex, true);
- }
+ };
+ Jobs.startJob(job, true);
}
public void redisplayAsWorkFlow() {
- try {
- TreeItem treeItem[] = worldXViewer.getTree().getItems();
- Set<Artifact> arts = new HashSet<Artifact>();
- for (TreeItem item : treeItem) {
- if (item.getData() instanceof Artifact) {
- Artifact art = (Artifact) item.getData();
- if (art instanceof ActionArtifact) {
- arts.addAll(((ActionArtifact) art).getTeamWorkFlowArtifacts());
- } else if (art instanceof StateMachineArtifact) {
- Artifact parentArt = ((StateMachineArtifact) art).getParentTeamWorkflow();
- if (parentArt != null) {
- arts.add(parentArt);
+ final ArrayList<Artifact> artifacts = worldXViewer.getLoadedArtifacts();
+ Job job = new Job("Re-display as Workflows") {
+ /* (non-Javadoc)
+ * @see org.eclipse.core.runtime.jobs.Job#run(org.eclipse.core.runtime.IProgressMonitor)
+ */
+ @Override
+ protected IStatus run(IProgressMonitor monitor) {
+ try {
+ final Set<Artifact> arts = new HashSet<Artifact>();
+ for (Artifact art : artifacts) {
+ if (art instanceof ActionArtifact) {
+ arts.addAll(((ActionArtifact) art).getTeamWorkFlowArtifacts());
+ } else if (art instanceof StateMachineArtifact) {
+ Artifact parentArt = ((StateMachineArtifact) art).getParentTeamWorkflow();
+ if (parentArt != null) {
+ arts.add(parentArt);
+ }
}
}
+ Displays.ensureInDisplayThread(new Runnable() {
+ @Override
+ public void run() {
+ load(worldEditor.getCurrentTitleLabel(), arts);
+ }
+ });
+ } catch (OseeCoreException ex) {
+ OSEELog.logException(AtsPlugin.class, ex, true);
}
+ return Status.OK_STATUS;
}
- load(worldEditor.getCurrentTitleLabel(), arts);
- } catch (OseeCoreException ex) {
- OSEELog.logException(AtsPlugin.class, ex, true);
- }
+ };
+ Jobs.startJob(job, true);
}
public void redisplayAsTask() {
- try {
- TreeItem treeItem[] = worldXViewer.getTree().getItems();
- Set<Artifact> arts = new HashSet<Artifact>();
- for (TreeItem item : treeItem) {
- if (item.getData() instanceof Artifact) {
- Artifact art = (Artifact) item.getData();
- if (art instanceof ActionArtifact) {
- for (TeamWorkFlowArtifact team : ((ActionArtifact) art).getTeamWorkFlowArtifacts()) {
- arts.addAll(team.getSmaMgr().getTaskMgr().getTaskArtifacts());
+ final ArrayList<Artifact> artifacts = worldXViewer.getLoadedArtifacts();
+ Job job = new Job("Re-display as Tasks") {
+ /* (non-Javadoc)
+ * @see org.eclipse.core.runtime.jobs.Job#run(org.eclipse.core.runtime.IProgressMonitor)
+ */
+ @Override
+ protected IStatus run(IProgressMonitor monitor) {
+ try {
+ final Set<Artifact> arts = new HashSet<Artifact>();
+ for (Artifact art : artifacts) {
+ if (art instanceof ActionArtifact) {
+ for (TeamWorkFlowArtifact team : ((ActionArtifact) art).getTeamWorkFlowArtifacts()) {
+ arts.addAll(team.getSmaMgr().getTaskMgr().getTaskArtifacts());
+ }
+ } else if (art instanceof StateMachineArtifact) {
+ arts.addAll(((StateMachineArtifact) art).getSmaMgr().getTaskMgr().getTaskArtifacts());
}
- } else if (art instanceof StateMachineArtifact) {
- arts.addAll(((StateMachineArtifact) art).getSmaMgr().getTaskMgr().getTaskArtifacts());
}
+ Displays.ensureInDisplayThread(new Runnable() {
+ @Override
+ public void run() {
+ load(worldEditor.getCurrentTitleLabel(), arts);
+ }
+ });
+ } catch (OseeCoreException ex) {
+ OSEELog.logException(AtsPlugin.class, ex, true);
}
+ return Status.OK_STATUS;
}
- load(worldEditor.getCurrentTitleLabel(), arts);
- } catch (OseeCoreException ex) {
- OSEELog.logException(AtsPlugin.class, ex, true);
- }
+ };
+ Jobs.startJob(job, true);
}
public void disposeComposite() {
diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldEditor.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldEditor.java index 66307a80b36..b6775d3d0b8 100644 --- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldEditor.java +++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldEditor.java @@ -31,6 +31,7 @@ import org.eclipse.swt.SWT; import org.eclipse.swt.widgets.Composite; import org.eclipse.ui.IEditorInput; import org.eclipse.ui.IWorkbenchPage; +import org.eclipse.ui.IWorkbenchPart; import org.eclipse.ui.PartInitException; /** @@ -77,6 +78,10 @@ public class WorldEditor extends AbstractArtifactEditor implements IDirtiableEdi return isDirty(); } + public void refreshTitle() { + firePropertyChange(IWorkbenchPart.PROP_TITLE); + } + @Override public void dispose() { if (actionPage != null && actionPage.getWorldComposite() != null) { @@ -132,6 +137,7 @@ public class WorldEditor extends AbstractArtifactEditor implements IDirtiableEdi public void setEditorTitle(String str) { setPartName(str); + firePropertyChange(IWorkbenchPart.PROP_TITLE); } public IWorldEditorProvider getWorldEditorProvider() { diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldEditorParameterSearchItemProvider.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldEditorParameterSearchItemProvider.java index 2b07e9ad7e5..eaf6473ed2c 100644 --- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldEditorParameterSearchItemProvider.java +++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldEditorParameterSearchItemProvider.java @@ -124,6 +124,7 @@ public class WorldEditorParameterSearchItemProvider extends WorldEditorProvider String selectedName = "";
try {
selectedName = worldParameterSearchItem.getSelectedName(searchType);
+ worldEditor.setEditorTitle(selectedName != null ? selectedName : worldParameterSearchItem.getName());
worldEditor.setTableTitle("Loading \"" + (selectedName != null ? selectedName : "") + "\"...", false);
cancel = false;
worldParameterSearchItem.setCancelled(cancel);
@@ -141,7 +142,6 @@ public class WorldEditorParameterSearchItemProvider extends WorldEditorProvider return Status.OK_STATUS;
}
}
- worldEditor.setEditorTitle(selectedName != null ? selectedName : worldParameterSearchItem.getName());
worldEditor.getWorldComposite().load(selectedName, artifacts, customizeData, tableLoadOptions);
} catch (final Exception ex) {
String str = "Exception occurred. Network may be down.";
diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldEditorUISearchItemProvider.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldEditorUISearchItemProvider.java index ff9df5525f7..41339ee31ea 100644 --- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldEditorUISearchItemProvider.java +++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldEditorUISearchItemProvider.java @@ -13,6 +13,7 @@ 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.VersionArtifact;
+import org.eclipse.osee.ats.world.search.NextVersionSearchItem;
import org.eclipse.osee.ats.world.search.VersionTargetedForTeamSearchItem;
import org.eclipse.osee.ats.world.search.WorldSearchItem;
import org.eclipse.osee.ats.world.search.WorldUISearchItem;
@@ -122,6 +123,7 @@ public class WorldEditorUISearchItemProvider extends WorldEditorProvider { String selectedName = "";
try {
selectedName = worldUISearchItem.getSelectedName(searchType);
+ worldEditor.setEditorTitle(selectedName != null ? selectedName : worldUISearchItem.getName());
worldEditor.setTableTitle("Loading \"" + (selectedName != null ? selectedName : "") + "\"...", false);
cancel = false;
worldUISearchItem.setCancelled(cancel);
@@ -137,7 +139,6 @@ public class WorldEditorUISearchItemProvider extends WorldEditorProvider { return Status.OK_STATUS;
}
}
- worldEditor.setEditorTitle(selectedName != null ? selectedName : worldUISearchItem.getName());
worldEditor.getWorldComposite().load((selectedName != null ? selectedName : ""), artifacts, customizeData);
} catch (final Exception ex) {
worldEditor.getWorldComposite().setTableTitle("Searching Error - " + selectedName, false);
@@ -158,6 +159,8 @@ public class WorldEditorUISearchItemProvider extends WorldEditorProvider { public VersionArtifact getTargetedVersionArtifact() throws OseeCoreException {
if (worldUISearchItem instanceof VersionTargetedForTeamSearchItem) {
return ((VersionTargetedForTeamSearchItem) worldUISearchItem).getSearchVersionArtifact();
+ } else if (worldUISearchItem instanceof NextVersionSearchItem) {
+ return ((NextVersionSearchItem) worldUISearchItem).getSelectedVersionArt();
}
return null;
}
diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/MyTaskSearchItem.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/MyTaskSearchItem.java deleted file mode 100644 index 40725dc0d25..00000000000 --- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/MyTaskSearchItem.java +++ /dev/null @@ -1,65 +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.world.search; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.List; -import java.util.Set; -import org.eclipse.osee.ats.artifact.TaskArtifact; -import org.eclipse.osee.framework.db.connection.exception.OseeCoreException; -import org.eclipse.osee.framework.skynet.core.User; -import org.eclipse.osee.framework.skynet.core.artifact.Artifact; -import org.eclipse.osee.framework.skynet.core.relation.CoreRelationEnumeration; -import org.eclipse.osee.framework.skynet.core.relation.RelationManager; - -/** - * @author Donald G. Dunne - */ -public class MyTaskSearchItem extends UserSearchItem { - - public MyTaskSearchItem(String name, LoadView loadView) { - this(name, null, loadView); - } - - public MyTaskSearchItem(String name, User user, LoadView loadView) { - super(name, user); - setLoadView(loadView); - } - - public MyTaskSearchItem(MyTaskSearchItem myTaskSearchItem) { - super(myTaskSearchItem); - } - - @Override - protected Collection<Artifact> searchIt(User user) throws OseeCoreException { - Set<Artifact> assigned = - RelationManager.getRelatedArtifacts(Arrays.asList(user), 1, CoreRelationEnumeration.Users_Artifact); - - List<Artifact> artifactsToReturn = new ArrayList<Artifact>(assigned.size()); - for (Artifact artifact : assigned) { - if (artifact instanceof TaskArtifact) { - artifactsToReturn.add(artifact); - } - } - return artifactsToReturn; - } - - /* (non-Javadoc) - * @see org.eclipse.osee.ats.world.search.WorldUISearchItem#copy() - */ - @Override - public WorldUISearchItem copy() { - return new MyTaskSearchItem(this); - } - -} diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/MyTeamWFSearchItem.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/MyTeamWFSearchItem.java deleted file mode 100644 index f2b70e8093f..00000000000 --- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/MyTeamWFSearchItem.java +++ /dev/null @@ -1,78 +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.world.search; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.List; -import java.util.Set; -import org.eclipse.osee.ats.artifact.TeamWorkFlowArtifact; -import org.eclipse.osee.ats.util.AtsRelation; -import org.eclipse.osee.framework.db.connection.exception.OseeCoreException; -import org.eclipse.osee.framework.skynet.core.User; -import org.eclipse.osee.framework.skynet.core.artifact.Artifact; -import org.eclipse.osee.framework.skynet.core.relation.CoreRelationEnumeration; -import org.eclipse.osee.framework.skynet.core.relation.RelationManager; - -/** - * @author Donald G. Dunne - */ -public class MyTeamWFSearchItem extends UserSearchItem { - - public MyTeamWFSearchItem(String name) { - this(name, null); - } - - public MyTeamWFSearchItem() { - super("My World", null); - } - - public MyTeamWFSearchItem(String name, User user) { - super(name, user); - } - - public MyTeamWFSearchItem(MyTeamWFSearchItem myTeamWFSearchItem) { - super(myTeamWFSearchItem); - } - - @Override - protected Collection<Artifact> searchIt(User user) throws OseeCoreException { - - Set<Artifact> assigned = - RelationManager.getRelatedArtifacts(Arrays.asList(user), 1, CoreRelationEnumeration.Users_Artifact); - - Set<Artifact> artifacts = - RelationManager.getRelatedArtifacts(assigned, 3, AtsRelation.SmaToTask_Sma, - AtsRelation.TeamWorkflowToReview_Team); - - // Because user can be assigned directly to workflow or through being assigned to task, add in - // all the original artifacts to search through also. - artifacts.addAll(assigned); - - List<Artifact> artifactsToReturn = new ArrayList<Artifact>(artifacts.size()); - for (Artifact artifact : artifacts) { - if (artifact instanceof TeamWorkFlowArtifact) { - artifactsToReturn.add(artifact); - } - } - return artifactsToReturn; - } - - /* (non-Javadoc) - * @see org.eclipse.osee.ats.world.search.WorldUISearchItem#copy() - */ - @Override - public WorldUISearchItem copy() { - return new MyTeamWFSearchItem(this); - } - -} diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/NextVersionSearchItem.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/NextVersionSearchItem.java index 4dc67fcb490..99506a278d4 100644 --- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/NextVersionSearchItem.java +++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/NextVersionSearchItem.java @@ -33,6 +33,7 @@ public class NextVersionSearchItem extends WorldUISearchItem { private final TeamDefinitionArtifact teamDefHoldingVersions; private TeamDefinitionArtifact selectedTeamDef; + private VersionArtifact selectedVersionArt; /** * @param name @@ -49,6 +50,7 @@ public class NextVersionSearchItem extends WorldUISearchItem { public NextVersionSearchItem(NextVersionSearchItem nextVersionSearchItem) { super(nextVersionSearchItem); this.teamDefHoldingVersions = nextVersionSearchItem.teamDefHoldingVersions; + this.selectedTeamDef = nextVersionSearchItem.selectedTeamDef; } @Override @@ -58,8 +60,8 @@ public class NextVersionSearchItem extends WorldUISearchItem { try { if (teamDef != null) { name += (teamDef != null ? " - " + teamDef.getDescriptiveName() : ""); - VersionArtifact verArt = teamDef.getNextReleaseVersion(); - name += (verArt != null ? " - " + verArt.getDescriptiveName() : ""); + selectedVersionArt = teamDef.getNextReleaseVersion(); + name += (selectedVersionArt != null ? " - " + selectedVersionArt.getDescriptiveName() : ""); } } catch (Exception ex) { OseeLog.log(AtsPlugin.class, Level.SEVERE, ex); @@ -127,4 +129,11 @@ public class NextVersionSearchItem extends WorldUISearchItem { return new NextVersionSearchItem(this); } + /** + * @return the selectedVersionArt + */ + public VersionArtifact getSelectedVersionArt() { + return selectedVersionArt; + } + } diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/TaskSearchWorldSearchItem.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/TaskSearchWorldSearchItem.java index 51c35ae8051..3633c3b4b25 100644 --- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/TaskSearchWorldSearchItem.java +++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/TaskSearchWorldSearchItem.java @@ -163,7 +163,7 @@ public class TaskSearchWorldSearchItem extends TaskEditorParameterSearchItem { continue;
}
// If include completed and task is such and user not implementer, skip this task
- if (isIncludeCompletedCancelledCheckbox() && taskArt.getSmaMgr().isCompleted() && getSelectedUser() != null && taskArt.getImplementers().contains(
+ if (isIncludeCompletedCancelledCheckbox() && taskArt.getSmaMgr().isCancelledOrCompleted() && getSelectedUser() != null && taskArt.getImplementers().contains(
getSelectedUser())) {
tasks.add(taskArt);
continue;
@@ -183,16 +183,16 @@ public class TaskSearchWorldSearchItem extends TaskEditorParameterSearchItem { */
@Override
public Result isParameterSelectionValid() throws OseeCoreException {
- // If only user selected, handle that case separately
- if (getSelectedVersionArtifact() == null && getSelectedTeamDefinitions().size() == 0 && getSelectedUser() != null) {
- return Result.TrueResult;
- }
-
if (getSelectedUser() != null && isIncludeCompletedCancelledCheckbox() && getSelectedVersionArtifact() == null && getSelectedTeamDefinitions().size() == 0) {
// This case is unsupported and should be filtered out prior to this point
throw new OseeArgumentException("Unsupported User and Include Completed selected.");
}
+ // If only user selected, handle that case separately
+ if (getSelectedVersionArtifact() == null && getSelectedTeamDefinitions().size() == 0 && getSelectedUser() != null) {
+ return Result.TrueResult;
+ }
+
if (getSelectedGroups().size() > 0 && (getSelectedVersionArtifact() != null || getSelectedTeamDefinitions().size() > 0)) {
// This case is unsupported and should be filtered out prior to this point
throw new OseeArgumentException("Unsupported Groups selection with Version or Team(s).");
|