diff options
| author | donald.g.dunne | 2016-07-12 22:35:42 +0000 |
|---|---|---|
| committer | donald.g.dunne | 2016-08-02 21:46:33 +0000 |
| commit | 387ec8532d1117327a426b35eab1727765348340 (patch) | |
| tree | 910a04bffe8ca10903825b07c517c0f81b14dd4d | |
| parent | 283227d735d730c52ac989cea11dcdf5769d076e (diff) | |
| download | org.eclipse.osee-387ec8532d1117327a426b35eab1727765348340.tar.gz org.eclipse.osee-387ec8532d1117327a426b35eab1727765348340.tar.xz org.eclipse.osee-387ec8532d1117327a426b35eab1727765348340.zip | |
refinement: Remove un-used classes and methods in osee.ats
Change-Id: Ic68c540b035d9cd2d9a09c78131213618b6a33e4
129 files changed, 268 insertions, 1913 deletions
diff --git a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/actions/OpenNewAtsTaskEditorActionTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/actions/OpenNewAtsTaskEditorActionTest.java index 1925e433158..642974c5625 100644 --- a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/actions/OpenNewAtsTaskEditorActionTest.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/actions/OpenNewAtsTaskEditorActionTest.java @@ -77,11 +77,6 @@ public class OpenNewAtsTaskEditorActionTest extends AbstractAtsActionRunTest { } @Override - public TableLoadOption[] getTableLoadOptions() throws OseeCoreException { - return null; - } - - @Override public Collection<? extends Artifact> getTaskEditorTaskArtifacts() throws OseeCoreException { return null; } diff --git a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/actions/OpenNewAtsWorldEditorActionTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/actions/OpenNewAtsWorldEditorActionTest.java index b6befc0b0c8..651eba130b5 100644 --- a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/actions/OpenNewAtsWorldEditorActionTest.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/actions/OpenNewAtsWorldEditorActionTest.java @@ -18,7 +18,6 @@ import org.eclipse.osee.ats.api.version.IAtsVersion; import org.eclipse.osee.ats.world.IWorldEditorProvider; import org.eclipse.osee.ats.world.WorldEditor; import org.eclipse.osee.ats.world.search.WorldSearchItem.SearchType; -import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateComposite.TableLoadOption; @@ -75,10 +74,6 @@ public class OpenNewAtsWorldEditorActionTest extends AbstractAtsActionRunTest { return null; } - @Override - public TableLoadOption[] getTableLoadOptions() throws OseeCoreException { - return null; - } }; } diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/NewAction.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/NewAction.java index 3edaea1057c..9f09d79c8fe 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/NewAction.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/NewAction.java @@ -26,7 +26,6 @@ import org.eclipse.ui.PlatformUI; public class NewAction extends AbstractAtsAction { private final String actionableItem; - private String initialDescription; public NewAction() { this(null); @@ -46,19 +45,9 @@ public class NewAction extends AbstractAtsAction { wizard.setInitialAias( ActionableItems.getActionableItems(Arrays.asList(actionableItem), AtsClientService.get())); } - if (initialDescription != null) { - wizard.setInitialDescription(initialDescription); - } WizardDialog dialog = new WizardDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), wizard); dialog.create(); dialog.open(); } - /** - * @param initialDescription the initialDescription to set - */ - public void setInitialDescription(String initialDescription) { - this.initialDescription = initialDescription; - } - }
\ No newline at end of file diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/OpenAtsPerspectiveHandler.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/OpenAtsPerspectiveHandler.java index 3b956f3eed4..47bd48214d7 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/OpenAtsPerspectiveHandler.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/OpenAtsPerspectiveHandler.java @@ -20,9 +20,6 @@ import org.eclipse.osee.framework.ui.plugin.util.AWorkbench; */ public class OpenAtsPerspectiveHandler extends AbstractHandler { - public OpenAtsPerspectiveHandler() { - } - @Override public Object execute(ExecutionEvent event) { AWorkbench.openPerspective(ATSPerspective.ID); diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/OpenReviewPerspectiveHandler.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/OpenReviewPerspectiveHandler.java index 1cd80393375..4c464360436 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/OpenReviewPerspectiveHandler.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/OpenReviewPerspectiveHandler.java @@ -20,9 +20,6 @@ import org.eclipse.osee.framework.ui.plugin.util.AWorkbench; */ public class OpenReviewPerspectiveHandler extends AbstractHandler { - public OpenReviewPerspectiveHandler() { - } - @Override public Object execute(ExecutionEvent event) { AWorkbench.openPerspective(ReviewPerspective.ID); diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/wizard/ActionableItemFilter.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/wizard/ActionableItemFilter.java deleted file mode 100644 index cbcc6756d5f..00000000000 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/wizard/ActionableItemFilter.java +++ /dev/null @@ -1,75 +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.actions.wizard; - -import java.util.Locale; -import org.eclipse.jface.viewers.Viewer; -import org.eclipse.jface.viewers.ViewerFilter; -import org.eclipse.osee.ats.api.ai.IAtsActionableItem; -import org.eclipse.osee.framework.ui.skynet.widgets.dialog.FilteredCheckboxTree; - -/** - * @author Donald G. Dunne - */ -public class ActionableItemFilter extends ViewerFilter { - private String contains = null; - private final FilteredCheckboxTree treeViewer; - - public ActionableItemFilter(FilteredCheckboxTree treeViewer) { - super(); - this.treeViewer = treeViewer; - } - - @Override - public boolean select(Viewer viewer, Object parentElement, Object element) { - if (!isFiltering()) { - return true; - } - return checkItemAndChildren((IAtsActionableItem) element); - } - - private boolean checkItemAndChildren(IAtsActionableItem item) { - boolean show = item.getName().toLowerCase().contains(contains.toLowerCase(Locale.US)); - if (show) { - return true; - } - for (IAtsActionableItem child : item.getChildrenActionableItems()) { - show = checkItemAndChildren(child); - if (show) { - return true; - } - } - return false; - } - - /** - * @param contains The contains to set. - */ - public void setContains(String contains) { - this.contains = contains; - if (contains.isEmpty()) { - treeViewer.getViewer().collapseAll(); - } else { - treeViewer.getViewer().expandAll(); - } - } - - /** - * @return Returns the contains. - */ - public String getContains() { - return contains; - } - - public boolean isFiltering() { - return contains != null && contains.length() > 0; - } -} diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/wizard/ArtifactSelectWizard.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/wizard/ArtifactSelectWizard.java index 3eca6572c2d..60f84d862ac 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/wizard/ArtifactSelectWizard.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/wizard/ArtifactSelectWizard.java @@ -11,7 +11,6 @@ package org.eclipse.osee.ats.actions.wizard; import org.eclipse.jface.wizard.Wizard; -import org.eclipse.osee.framework.skynet.core.artifact.Artifact; /** * @author Donald G. Dunne @@ -36,8 +35,4 @@ public class ArtifactSelectWizard extends Wizard { return wizardPage.isPageComplete(); } - public Artifact getSelectedArtifact() { - return wizardPage.getSelectedArtifact(); - } - } diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/wizard/NewActionJob.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/wizard/NewActionJob.java index e6db4d06122..b625f2d0f6e 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/wizard/NewActionJob.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/wizard/NewActionJob.java @@ -35,8 +35,6 @@ import org.eclipse.osee.framework.skynet.core.artifact.Artifact; * @author Donald G. Dunne */ public class NewActionJob extends Job { - private boolean saveIt = false; - private String identifyStateDescription = null; private String title; private final String desc; private final ChangeType changeType; @@ -99,22 +97,6 @@ public class NewActionJob extends Job { return Status.OK_STATUS; } - public String getIdentifyStateDescription() { - return identifyStateDescription; - } - - public void setIdentifyStateDescription(String identifyStateDescription) { - this.identifyStateDescription = identifyStateDescription; - } - - public boolean isSaveIt() { - return saveIt; - } - - public void setSaveIt(boolean saveIt) { - this.saveIt = saveIt; - } - public Artifact getActionArt() { return actionArt; } diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/wizard/NewNoteWizard.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/wizard/NewNoteWizard.java index e40ab514ad4..366a7e5af0d 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/wizard/NewNoteWizard.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/wizard/NewNoteWizard.java @@ -11,9 +11,7 @@ package org.eclipse.osee.ats.actions.wizard; import java.util.Collection; -import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.wizard.Wizard; -import org.eclipse.ui.IWorkbench; /** * @author Donald G. Dunne @@ -33,10 +31,6 @@ public class NewNoteWizard extends Wizard { return true; } - public void init(IWorkbench workbench, IStructuredSelection selection) { - // do nothing - } - @Override public void addPages() { mainPage = new NewNotePage(this); diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/agile/AgileFeatureGroupColumn.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/agile/AgileFeatureGroupColumn.java index 97acd95dbd7..3ddea93be9e 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/agile/AgileFeatureGroupColumn.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/agile/AgileFeatureGroupColumn.java @@ -105,14 +105,6 @@ public class AgileFeatureGroupColumn extends XViewerAtsColumn implements IXViewe return false; } - public static boolean promptChangeFeatureGroup(AbstractWorkflowArtifact sma) throws OseeCoreException { - if (AtsUtilClient.isAtsAdmin() && !sma.isTeamWorkflow()) { - AWorkbench.popup("ERROR ", "Cannot set Feature Group for: \n\n" + sma.getName()); - return false; - } - return promptChangeFeatureGroup(Arrays.asList((TeamWorkFlowArtifact) sma)); - } - public static boolean promptChangeFeatureGroup(final Collection<? extends AbstractWorkflowArtifact> awas) throws OseeCoreException { SprintItems items = new SprintItems(awas); diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/agile/BacklogXViewerFactory.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/agile/BacklogXViewerFactory.java index 7aaefdb4ad6..5aad04ff937 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/agile/BacklogXViewerFactory.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/agile/BacklogXViewerFactory.java @@ -38,11 +38,8 @@ import org.eclipse.osee.framework.ui.skynet.widgets.xviewer.skynet.SkynetXViewer */ public class BacklogXViewerFactory extends SkynetXViewerFactory { - private GoalArtifact soleBacklogArtifact; - public BacklogXViewerFactory(GoalArtifact soleBacklogArtifact, IOseeTreeReportProvider reportProvider) { super("org.eclipse.osee.ats.BacklogXViewer", reportProvider); - this.soleBacklogArtifact = soleBacklogArtifact; List<XViewerAtsAttributeValueColumn> configCols = WorldXViewerUtil.getConfigurationColumns(); List<XViewerColumn> backlogCols = new LinkedList<>(); @@ -106,12 +103,4 @@ public class BacklogXViewerFactory extends SkynetXViewerFactory { return customizeData; } - public GoalArtifact getSoleBacklogArtifact() { - return soleBacklogArtifact; - } - - public void setSoleBacklogArtifact(GoalArtifact soleBacklogArtifact) { - this.soleBacklogArtifact = soleBacklogArtifact; - } - } diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/agile/SprintItems.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/agile/SprintItems.java index 2457ec6ef5d..2708e1a8da8 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/agile/SprintItems.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/agile/SprintItems.java @@ -33,7 +33,6 @@ public class SprintItems { private boolean noBacklogDetected; private boolean multipleBacklogsDetected; private Artifact commonBacklog; - private Artifact commonSprint; private Set<Artifact> multipleSprints; public SprintItems(final Collection<? extends Artifact> awas) { @@ -98,10 +97,6 @@ public class SprintItems { return multipleBacklogsDetected; } - public Collection<? extends Artifact> getAwas() { - return awas; - } - public IAgileBacklog getCommonBacklog() { IAgileBacklog backlog = null; if (commonBacklog != null) { @@ -110,14 +105,6 @@ public class SprintItems { return backlog; } - public IAgileSprint getCommonSprint() { - IAgileSprint sprint = null; - if (isCommonSelectedSprint()) { - sprint = AtsClientService.get().getWorkItemFactory().getAgileSprint(commonSprint); - } - return sprint; - } - public Set<IAgileSprint> getMultipleSprints() { Set<IAgileSprint> sprints = new HashSet<>(); for (Artifact art : multipleSprints) { diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/agile/SprintMemberProvider.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/agile/SprintMemberProvider.java index 2aeeb7fb879..3534b0e2065 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/agile/SprintMemberProvider.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/agile/SprintMemberProvider.java @@ -14,12 +14,10 @@ import java.util.List; import org.eclipse.nebula.widgets.xviewer.IXViewerFactory; import org.eclipse.osee.ats.AtsImage; import org.eclipse.osee.ats.api.agile.IAgileSprint; -import org.eclipse.osee.ats.api.data.AtsArtifactTypes; import org.eclipse.osee.ats.api.data.AtsRelationTypes; import org.eclipse.osee.ats.core.client.artifact.SprintArtifact; import org.eclipse.osee.ats.goal.AbstractMemberProvider; import org.eclipse.osee.ats.internal.AtsClientService; -import org.eclipse.osee.framework.core.data.IArtifactType; import org.eclipse.osee.framework.core.data.IRelationTypeSide; import org.eclipse.osee.framework.core.util.Result; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; @@ -77,11 +75,6 @@ public class SprintMemberProvider extends AbstractMemberProvider { } @Override - public IArtifactType getArtifactType() { - return AtsArtifactTypes.AgileSprint; - } - - @Override public String getColumnName() { return "ats.column.sprintOrder"; } diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/agile/SprintXViewerFactory.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/agile/SprintXViewerFactory.java index 3047abab774..69110076d80 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/agile/SprintXViewerFactory.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/agile/SprintXViewerFactory.java @@ -103,8 +103,4 @@ public class SprintXViewerFactory extends SkynetXViewerFactory { return soleSprintArtifact; } - public void setSoleSprintArtifact(SprintArtifact soleSprintArtifact) { - this.soleSprintArtifact = soleSprintArtifact; - } - } diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/WorkflowManager.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/WorkflowManager.java index 7931bf7c000..2ed3e6e729e 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/WorkflowManager.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/WorkflowManager.java @@ -12,27 +12,18 @@ package org.eclipse.osee.ats.artifact; import java.util.ArrayList; import java.util.Collection; -import java.util.Date; import java.util.List; import java.util.logging.Level; import org.eclipse.osee.ats.api.IAtsWorkItem; -import org.eclipse.osee.ats.api.team.ChangeType; import org.eclipse.osee.ats.api.team.IAtsTeamDefinition; import org.eclipse.osee.ats.api.version.IAtsVersion; import org.eclipse.osee.ats.api.workdef.IAtsStateDefinition; import org.eclipse.osee.ats.api.workdef.IAtsWorkDefinition; import org.eclipse.osee.ats.api.workdef.RuleDefinitionOption; -import org.eclipse.osee.ats.api.workflow.log.IAtsLogItem; import org.eclipse.osee.ats.api.workflow.state.IAtsStateManager; -import org.eclipse.osee.ats.column.CancelledDateColumn; -import org.eclipse.osee.ats.column.CompletedDateColumn; import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; import org.eclipse.osee.ats.core.client.workflow.AbstractWorkflowArtifact; -import org.eclipse.osee.ats.core.client.workflow.ChangeTypeUtil; -import org.eclipse.osee.ats.core.client.workflow.PriorityUtil; -import org.eclipse.osee.ats.core.column.CreatedDateColumn; import org.eclipse.osee.ats.core.util.AtsUtilCore; -import org.eclipse.osee.ats.core.util.HoursSpentUtil; import org.eclipse.osee.ats.core.workflow.WorkflowManagerCore; import org.eclipse.osee.ats.internal.Activator; import org.eclipse.osee.ats.internal.AtsClientService; @@ -55,16 +46,16 @@ public class WorkflowManager { public static boolean isAssigneeEditable(AbstractWorkflowArtifact awa, boolean privilegedEditEnabled) throws OseeCoreException { return !awa.isCompletedOrCancelled() && !awa.isReadOnly() && // and access control writeable - awa.isAccessControlWrite() && // + awa.isAccessControlWrite() && // - (WorkflowManagerCore.isEditable(AtsClientService.get().getUserService().getCurrentUser(), awa, - awa.getStateDefinition(), privilegedEditEnabled, AtsClientService.get().getUserService()) || // - // page is define to allow anyone to edit - awa.getStateDefinition().hasRule(RuleDefinitionOption.AllowAssigneeToAll.name()) || - // awa is child of TeamWorkflow that has AllowAssigneeToAll rule - isParentTeamWorklfowCurrentStateAllowAssigneeToAll(awa) || - // team definition has allowed anyone to edit - awa.teamDefHasRule(RuleDefinitionOption.AllowAssigneeToAll)); + (WorkflowManagerCore.isEditable(AtsClientService.get().getUserService().getCurrentUser(), awa, + awa.getStateDefinition(), privilegedEditEnabled, AtsClientService.get().getUserService()) || // + // page is define to allow anyone to edit + awa.getStateDefinition().hasRule(RuleDefinitionOption.AllowAssigneeToAll.name()) || + // awa is child of TeamWorkflow that has AllowAssigneeToAll rule + isParentTeamWorklfowCurrentStateAllowAssigneeToAll(awa) || + // team definition has allowed anyone to edit + awa.teamDefHasRule(RuleDefinitionOption.AllowAssigneeToAll)); } private static boolean isParentTeamWorklfowCurrentStateAllowAssigneeToAll(AbstractWorkflowArtifact awa) throws OseeCoreException { @@ -83,26 +74,6 @@ public class WorkflowManager { return result; } - public static Collection<AbstractWorkflowArtifact> getCompletedCancelled(Collection<AbstractWorkflowArtifact> awas) throws OseeCoreException { - List<AbstractWorkflowArtifact> artifactsToReturn = new ArrayList<>(awas.size()); - for (AbstractWorkflowArtifact awa : awas) { - if (awa.isCompletedOrCancelled()) { - artifactsToReturn.add(awa); - } - } - return artifactsToReturn; - } - - public static Collection<AbstractWorkflowArtifact> getInWork(Collection<AbstractWorkflowArtifact> awas) throws OseeCoreException { - List<AbstractWorkflowArtifact> artifactsToReturn = new ArrayList<>(awas.size()); - for (AbstractWorkflowArtifact awa : awas) { - if (!awa.isCompletedOrCancelled()) { - artifactsToReturn.add(awa); - } - } - return artifactsToReturn; - } - public static Collection<AbstractWorkflowArtifact> filterOutState(Collection<AbstractWorkflowArtifact> awas, Collection<String> stateNames) { List<AbstractWorkflowArtifact> artifactsToReturn = new ArrayList<>(awas.size()); for (AbstractWorkflowArtifact awa : awas) { @@ -164,105 +135,6 @@ public class WorkflowManager { return artifactsToReturn; } - public static Collection<AbstractWorkflowArtifact> getOpenAtDate(Date date, Collection<AbstractWorkflowArtifact> artifacts) throws OseeCoreException { - List<AbstractWorkflowArtifact> awas = new ArrayList<>(); - for (AbstractWorkflowArtifact awa : artifacts) { - Date createDate = CreatedDateColumn.getDate(awa); - Date completedCancelDate = null; - if (awa.isCompletedOrCancelled()) { - if (awa.isCancelled()) { - completedCancelDate = CancelledDateColumn.getDate(awa); - } else { - completedCancelDate = CompletedDateColumn.getDate(awa); - } - } - if (createDate.before(date) && (completedCancelDate == null || completedCancelDate.after(date))) { - awas.add(awa); - } - } - return awas; - } - - public static Collection<AbstractWorkflowArtifact> getCompletedCancelledBetweenDate(Date startDate, Date endDate, Collection<AbstractWorkflowArtifact> artifacts) throws OseeCoreException { - List<AbstractWorkflowArtifact> awas = new ArrayList<>(); - for (AbstractWorkflowArtifact awa : artifacts) { - Date completedCancelDate = null; - if (awa.isCompletedOrCancelled()) { - if (awa.isCancelled()) { - completedCancelDate = CancelledDateColumn.getDate(awa); - } else { - completedCancelDate = CompletedDateColumn.getDate(awa); - } - } - if (completedCancelDate == null) { - continue; - } - if (completedCancelDate.after(startDate) && completedCancelDate.before(endDate)) { - awas.add(awa); - } - } - return awas; - } - - public static Double getHoursSpent(Collection<AbstractWorkflowArtifact> artifacts) throws OseeCoreException { - Double hoursSpent = 0.0; - for (AbstractWorkflowArtifact awa : artifacts) { - hoursSpent += HoursSpentUtil.getHoursSpentTotal(awa, AtsClientService.get().getServices()); - } - return hoursSpent; - } - - public static Collection<AbstractWorkflowArtifact> getStateAtDate(Date date, Collection<String> states, Collection<AbstractWorkflowArtifact> artifacts) throws OseeCoreException { - List<AbstractWorkflowArtifact> awas = new ArrayList<>(); - for (AbstractWorkflowArtifact awa : artifacts) { - Date createDate = CreatedDateColumn.getDate(awa); - if (createDate.after(date)) { - continue; - } - // Find state at date - String currentState = awa.getStateMgr().getCurrentStateName(); - for (IAtsLogItem item : awa.getLog().getLogItems()) { - if (item.getDate().before(date)) { - currentState = item.getState(); - } - } - if (states.contains(currentState)) { - awas.add(awa); - } - } - return awas; - } - - /** - * Returns awa if change type, or parent team workflow's change type is in specified set - */ - public static Collection<AbstractWorkflowArtifact> getChangeType(Collection<ChangeType> changeTypes, Collection<AbstractWorkflowArtifact> artifacts) throws OseeCoreException { - List<AbstractWorkflowArtifact> awas = new ArrayList<>(); - for (AbstractWorkflowArtifact awa : artifacts) { - TeamWorkFlowArtifact teamArt = awa.getParentTeamWorkflow(); - if (changeTypes.contains(ChangeTypeUtil.getChangeType(teamArt))) { - awas.add(awa); - } - } - return awas; - - } - - /** - * Returns awa if priority type, or parent team workflow's priority type is in specified set - */ - public static Collection<AbstractWorkflowArtifact> getPriorityType(Collection<String> priorityTypes, Collection<AbstractWorkflowArtifact> artifacts) throws OseeCoreException { - List<AbstractWorkflowArtifact> awas = new ArrayList<>(); - for (AbstractWorkflowArtifact awa : artifacts) { - TeamWorkFlowArtifact teamArt = awa.getParentTeamWorkflow(); - if (priorityTypes.contains(PriorityUtil.getPriorityStr(teamArt))) { - awas.add(awa); - } - } - return awas; - - } - public static Collection<AbstractWorkflowArtifact> getTeamDefinitionWorkflows(Collection<? extends Artifact> artifacts, Collection<IAtsTeamDefinition> teamDefs) throws OseeCoreException { List<AbstractWorkflowArtifact> returnawas = new ArrayList<>(); for (AbstractWorkflowArtifact awa : getAwas(artifacts)) { diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/AtsAttributeValueColumnFactory.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/AtsAttributeValueColumnFactory.java index a130b118130..9122e85742b 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/AtsAttributeValueColumnFactory.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/AtsAttributeValueColumnFactory.java @@ -10,12 +10,10 @@ *******************************************************************************/ package org.eclipse.osee.ats.column; -import org.eclipse.nebula.widgets.xviewer.core.model.XViewerAlign; import org.eclipse.osee.ats.api.config.AtsAttributeValueColumn; import org.eclipse.osee.ats.api.config.ColumnAlign; import org.eclipse.osee.ats.util.AtsUtil; import org.eclipse.osee.ats.util.xviewer.column.XViewerAtsAttributeValueColumn; -import org.eclipse.swt.SWT; public class AtsAttributeValueColumnFactory { @@ -39,14 +37,4 @@ public class AtsAttributeValueColumnFactory { return col; } - public static XViewerAlign getColumnAlign(int colNum) { - if (colNum == SWT.LEFT) { - return XViewerAlign.Left; - } else if (colNum == SWT.CENTER) { - return XViewerAlign.Center; - } else if (colNum == SWT.RIGHT) { - return XViewerAlign.Right; - } - return null; - } } diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/ChangeTypeColumnUI.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/ChangeTypeColumnUI.java index a05aed5162e..4e90b1a349a 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/ChangeTypeColumnUI.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/ChangeTypeColumnUI.java @@ -23,7 +23,6 @@ import org.eclipse.osee.ats.api.team.ChangeType; import org.eclipse.osee.ats.core.client.action.ActionManager; import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; import org.eclipse.osee.ats.core.client.util.AtsChangeSet; -import org.eclipse.osee.ats.core.client.workflow.AbstractWorkflowArtifact; import org.eclipse.osee.ats.core.client.workflow.ChangeTypeUtil; import org.eclipse.osee.ats.core.column.AtsColumnToken; import org.eclipse.osee.ats.internal.Activator; @@ -68,13 +67,6 @@ public class ChangeTypeColumnUI extends XViewerAtsAttributeValueColumn { return newXCol; } - public static boolean promptChangeType(AbstractWorkflowArtifact sma, boolean persist) { - if (sma.isTeamWorkflow()) { - return promptChangeType(Arrays.asList((TeamWorkFlowArtifact) sma), persist); - } - return false; - } - public static boolean promptChangeType(final Collection<? extends TeamWorkFlowArtifact> teams, boolean persist) { try { diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/EstimatedCompletionDateColumn.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/EstimatedCompletionDateColumn.java index 1c72a020305..0a079ce8ce4 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/EstimatedCompletionDateColumn.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/EstimatedCompletionDateColumn.java @@ -120,10 +120,6 @@ public class EstimatedCompletionDateColumn extends XViewerAtsAttributeValueColum return null; } - public static String getDateStr(AbstractWorkflowArtifact artifact) throws OseeCoreException { - return DateUtil.getMMDDYY(getDate(artifact)); - } - @Override public String getColumnText(Object element, XViewerColumn column, int columnIndex) { try { diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/EstimatedReleaseDateColumn.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/EstimatedReleaseDateColumn.java index 9a93ef9d9fb..e0896a680f6 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/EstimatedReleaseDateColumn.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/EstimatedReleaseDateColumn.java @@ -12,7 +12,6 @@ package org.eclipse.osee.ats.column; import java.util.Date; import org.eclipse.osee.ats.api.data.AtsAttributeTypes; -import org.eclipse.osee.ats.core.client.workflow.AbstractWorkflowArtifact; import org.eclipse.osee.ats.world.WorldXViewerFactory; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; @@ -51,16 +50,4 @@ public class EstimatedReleaseDateColumn extends AbstractWorkflowVersionDateColum object); } - public static String getDateStrFromWorkflow(AbstractWorkflowArtifact artifact) throws OseeCoreException { - return AbstractWorkflowVersionDateColumn.getDateStrFromWorkflow(AtsAttributeTypes.EstimatedReleaseDate, artifact); - } - - public static String getDateStrFromTargetedVersion(AbstractWorkflowArtifact artifact) throws OseeCoreException { - return AbstractWorkflowVersionDateColumn.getDateStrFromTargetedVersion(AtsAttributeTypes.EstimatedReleaseDate, - artifact); - } - - public static String getDateStr(AbstractWorkflowArtifact artifact) throws OseeCoreException { - return AbstractWorkflowVersionDateColumn.getDateStr(AtsAttributeTypes.EstimatedReleaseDate, artifact); - } } diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/GoalsColumn.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/GoalsColumn.java index 57e587a9a4c..71f68bc844a 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/GoalsColumn.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/GoalsColumn.java @@ -101,10 +101,6 @@ public class GoalsColumn extends XViewerAtsColumn implements IXViewerValueColumn return false; } - public static boolean promptChangeGoals(Artifact sma, boolean persist) throws OseeCoreException { - return promptChangeGoals(Arrays.asList(sma), persist); - } - public static boolean promptChangeGoals(final Collection<? extends Artifact> awas, boolean persist) throws OseeCoreException { Set<Artifact> selected = new HashSet<>(); for (Artifact awa : awas) { diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/GroupsColumn.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/GroupsColumn.java index 20e578491f2..aa5b0c90134 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/GroupsColumn.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/GroupsColumn.java @@ -100,10 +100,6 @@ public class GroupsColumn extends XViewerAtsColumn implements IXViewerValueColum return false; } - public static boolean promptChangeGroups(AbstractWorkflowArtifact sma, boolean persist) throws OseeCoreException { - return promptChangeGroups(Arrays.asList(sma), persist); - } - public static boolean promptChangeGroups(final Collection<? extends AbstractWorkflowArtifact> awas, boolean persist) throws OseeCoreException { Set<Artifact> selected = new HashSet<>(); for (AbstractWorkflowArtifact awa : awas) { diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/PointsColumn.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/PointsColumn.java index e3f4d342b95..0815cbe85da 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/PointsColumn.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/PointsColumn.java @@ -10,12 +10,10 @@ *******************************************************************************/ package org.eclipse.osee.ats.column; -import org.eclipse.nebula.widgets.xviewer.core.model.XViewerAlign; import org.eclipse.nebula.widgets.xviewer.core.model.SortDataType; +import org.eclipse.nebula.widgets.xviewer.core.model.XViewerAlign; import org.eclipse.osee.ats.api.data.AtsAttributeTypes; -import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; import org.eclipse.osee.ats.util.xviewer.column.XViewerAtsAttributeValueColumn; -import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; /** * @author Donald G. Dunne @@ -43,8 +41,4 @@ public class PointsColumn extends XViewerAtsAttributeValueColumn { return newXCol; } - public static String getPoints(TeamWorkFlowArtifact teamArt) throws OseeCoreException { - return teamArt.getSoleAttributeValue(AtsAttributeTypes.Points, ""); - } - } diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/RelatedToStateColumn.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/RelatedToStateColumn.java index b277e1b6e97..14ac019ab27 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/RelatedToStateColumn.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/RelatedToStateColumn.java @@ -128,13 +128,6 @@ public class RelatedToStateColumn extends XViewerAtsAttributeValueColumn { } } - public static List<String> getValidStates(TeamWorkFlowArtifact teamArt) throws OseeStateException { - List<String> names = new ArrayList<>(); - names.addAll(AtsClientService.get().getWorkDefinitionAdmin().getStateNames(teamArt.getWorkDefinition())); - Collections.sort(names); - return names; - } - public static List<String> getValidInWorkStates(TeamWorkFlowArtifact teamArt) throws OseeStateException { List<String> names = new ArrayList<>(); for (String state : AtsClientService.get().getWorkDefinitionAdmin().getStateNames(teamArt.getWorkDefinition())) { diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/ReleaseDateColumn.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/ReleaseDateColumn.java index 7d7e78b668c..8dfccf7d476 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/ReleaseDateColumn.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/ReleaseDateColumn.java @@ -10,11 +10,8 @@ *******************************************************************************/ package org.eclipse.osee.ats.column; -import java.util.Date; import org.eclipse.osee.ats.api.data.AtsAttributeTypes; -import org.eclipse.osee.ats.core.client.workflow.AbstractWorkflowArtifact; import org.eclipse.osee.ats.world.WorldXViewerFactory; -import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; /** * @author Donald G. Dunne @@ -42,23 +39,4 @@ public class ReleaseDateColumn extends AbstractWorkflowVersionDateColumn { return newXCol; } - public static Date getDateFromWorkflow(Object object) throws OseeCoreException { - return AbstractWorkflowVersionDateColumn.getDateFromWorkflow(AtsAttributeTypes.ReleaseDate, object); - } - - public static Date getDateFromTargetedVersion(Object object) throws OseeCoreException { - return AbstractWorkflowVersionDateColumn.getDateFromTargetedVersion(AtsAttributeTypes.ReleaseDate, object); - } - - public static String getDateStrFromWorkflow(AbstractWorkflowArtifact artifact) throws OseeCoreException { - return AbstractWorkflowVersionDateColumn.getDateStrFromWorkflow(AtsAttributeTypes.ReleaseDate, artifact); - } - - public static String getDateStrFromTargetedVersion(AbstractWorkflowArtifact artifact) throws OseeCoreException { - return AbstractWorkflowVersionDateColumn.getDateStrFromTargetedVersion(AtsAttributeTypes.ReleaseDate, artifact); - } - - public static String getDateStr(AbstractWorkflowArtifact artifact) throws OseeCoreException { - return AbstractWorkflowVersionDateColumn.getDateStr(AtsAttributeTypes.ReleaseDate, artifact); - } } diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/ReviewFormalTypeColumn.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/ReviewFormalTypeColumn.java index eaaacf412c2..3dc4d3123ed 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/ReviewFormalTypeColumn.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/ReviewFormalTypeColumn.java @@ -10,17 +10,10 @@ *******************************************************************************/ package org.eclipse.osee.ats.column; -import java.util.logging.Level; import org.eclipse.nebula.widgets.xviewer.core.model.SortDataType; import org.eclipse.nebula.widgets.xviewer.core.model.XViewerAlign; import org.eclipse.osee.ats.api.data.AtsAttributeTypes; -import org.eclipse.osee.ats.api.review.ReviewFormalType; -import org.eclipse.osee.ats.internal.Activator; import org.eclipse.osee.ats.util.xviewer.column.XViewerAtsAttributeValueColumn; -import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; -import org.eclipse.osee.framework.jdk.core.util.Strings; -import org.eclipse.osee.framework.logging.OseeLog; -import org.eclipse.osee.framework.skynet.core.artifact.Artifact; /** * @author Donald G. Dunne @@ -48,15 +41,4 @@ public class ReviewFormalTypeColumn extends XViewerAtsAttributeValueColumn { return newXCol; } - public static ReviewFormalType getReviewFormalType(Artifact artifact) throws OseeCoreException { - String value = artifact.getSoleAttributeValue(AtsAttributeTypes.ReviewFormalType, ""); - if (Strings.isValid(value)) { - try { - return ReviewFormalType.valueOf(value); - } catch (IllegalArgumentException ex) { - OseeLog.logf(Activator.class, Level.SEVERE, ex, "Unexpected formal type [%s]", value); - } - } - return null; - } } diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/editor/AtsConfigContentProvider.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/editor/AtsConfigContentProvider.java index fbfd8d3c689..11c90f4e236 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/editor/AtsConfigContentProvider.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/editor/AtsConfigContentProvider.java @@ -108,11 +108,4 @@ public class AtsConfigContentProvider implements ITreeContentProvider { // do nothing } - /** - * @return the rootSet - */ - public Collection<IResultsXViewerRow> getRootSet() { - return rootSet; - } - }
\ No newline at end of file diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/IMemberProvider.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/IMemberProvider.java index 934d98769f5..0738da1c2fb 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/IMemberProvider.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/IMemberProvider.java @@ -38,8 +38,6 @@ public interface IMemberProvider { IXViewerFactory getXViewerFactory(Artifact awa); - IArtifactType getArtifactType(); - String getColumnName(); IRelationTypeSide getMemberRelationTypeSide(); diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/WfeDefectsTab.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/WfeDefectsTab.java index 9328472921f..9c4a4c1c9a7 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/WfeDefectsTab.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/WfeDefectsTab.java @@ -109,7 +109,7 @@ public class WfeDefectsTab extends FormPage implements IRefreshActionHandler, De messageLabel.setForeground(Displays.getSystemColor(SWT.COLOR_RED)); managedForm.getToolkit().adapt(messageLabel, true, true); - xViewer = new DefectXViewer(mainComp, SWT.MULTI | SWT.BORDER | SWT.FULL_SELECTION, review); + xViewer = new DefectXViewer(mainComp, SWT.MULTI | SWT.BORDER | SWT.FULL_SELECTION, null, review); xViewer.setContentProvider(new DefectContentProvider(xViewer)); xViewer.setLabelProvider(new DefectLabelProvider(xViewer)); xViewer.getTree().setLayoutData(new GridData(GridData.FILL_BOTH)); diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/history/HistoryXViewer.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/history/HistoryXViewer.java index d35129300f3..df5e19b1a48 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/history/HistoryXViewer.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/history/HistoryXViewer.java @@ -32,8 +32,4 @@ public class HistoryXViewer extends XViewer { getLabelProvider().dispose(); } - public XHistoryViewer getXUserRoleViewer() { - return xUserRoleViewer; - } - } diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/log/LogXViewer.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/log/LogXViewer.java index 9ecc7f87566..cdc9a6ad8bf 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/log/LogXViewer.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/log/LogXViewer.java @@ -39,10 +39,6 @@ public class LogXViewer extends XViewer { getLabelProvider().dispose(); } - public XLogViewer getXUserRoleViewer() { - return xLogViewer; - } - public void reload() { try { xLogViewer.getXViewer().setInput(awa.getLog().getLogItems()); diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/stateItem/AtsLogWorkPage.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/stateItem/AtsLogWorkPage.java deleted file mode 100644 index 381b3294756..00000000000 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/stateItem/AtsLogWorkPage.java +++ /dev/null @@ -1,170 +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.editor.stateItem; - -import java.util.List; -import org.eclipse.osee.ats.api.workdef.IAtsDecisionReviewDefinition; -import org.eclipse.osee.ats.api.workdef.IAtsLayoutItem; -import org.eclipse.osee.ats.api.workdef.IAtsPeerReviewDefinition; -import org.eclipse.osee.ats.api.workdef.IAtsStateDefinition; -import org.eclipse.osee.ats.api.workdef.IAtsWorkDefinition; -import org.eclipse.osee.ats.api.workdef.StateColor; -import org.eclipse.osee.ats.api.workdef.StateType; -import org.eclipse.osee.ats.workdef.StateXWidgetPage; - -/** - * @author Donald G. Dunne - */ -public class AtsLogWorkPage extends StateXWidgetPage { - - public final static String PAGE_ID = "ats.Log"; - - public static class EmptyWorkFlowDefinition implements IAtsWorkDefinition { - - private final String name; - - public EmptyWorkFlowDefinition(String name) { - this.name = name; - } - - @Override - public String getName() { - return name; - } - - @Override - public IAtsStateDefinition getStateByName(String name) { - return null; - } - - @Override - public IAtsStateDefinition getStartState() { - return null; - } - - @Override - public String getId() { - return ""; - } - - @Override - public String getDescription() { - return this.name; - } - - @Override - public List<IAtsStateDefinition> getStates() { - return null; - } - - @Override - public String getGuid() { - return null; - } - - } - - public AtsLogWorkPage(String title) { - super(new EmptyWorkFlowDefinition(PAGE_ID), new IAtsStateDefinition() { - - @Override - public String getDescription() { - return null; - } - - @Override - public void setWorkDefinition(IAtsWorkDefinition workDefinition) { - // do nothing - } - - @Override - public boolean hasRule(String name) { - return false; - } - - @Override - public IAtsWorkDefinition getWorkDefinition() { - return null; - } - - @Override - public List<IAtsStateDefinition> getToStates() { - return null; - } - - @Override - public int getStateWeight() { - return 0; - } - - @Override - public StateType getStateType() { - return null; - } - - @Override - public List<String> getRules() { - return null; - } - - @Override - public Integer getRecommendedPercentComplete() { - return null; - } - - @Override - public List<IAtsPeerReviewDefinition> getPeerReviews() { - return null; - } - - @Override - public List<IAtsStateDefinition> getOverrideAttributeValidationStates() { - return null; - } - - @Override - public int getOrdinal() { - return 0; - } - - @Override - public String getName() { - return PAGE_ID; - } - - @Override - public List<IAtsLayoutItem> getLayoutItems() { - return null; - } - - @Override - public String getFullName() { - return null; - } - - @Override - public IAtsStateDefinition getDefaultToState() { - return null; - } - - @Override - public List<IAtsDecisionReviewDefinition> getDecisionReviews() { - return null; - } - - @Override - public StateColor getColor() { - return null; - } - }, (String) null, null); - } - -} diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/stateItem/AtsStateItem.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/stateItem/AtsStateItem.java index bb9576172d2..833197d806f 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/stateItem/AtsStateItem.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/stateItem/AtsStateItem.java @@ -19,6 +19,7 @@ import org.eclipse.osee.ats.api.user.IAtsUser; import org.eclipse.osee.ats.api.util.IAtsChangeSet; import org.eclipse.osee.ats.api.workdef.IAtsStateDefinition; import org.eclipse.osee.ats.api.workdef.IStateToken; +import org.eclipse.osee.ats.api.workflow.transition.TransitionResults; import org.eclipse.osee.ats.core.client.workflow.AbstractWorkflowArtifact; import org.eclipse.osee.ats.editor.WfeWorkflowSection; import org.eclipse.osee.framework.core.util.Result; @@ -117,4 +118,9 @@ public abstract class AtsStateItem implements IAtsStateItem { public void transitionPersisted(Collection<? extends IAtsWorkItem> workItems, Map<IAtsWorkItem, String> workItemFromStateMap, String toStateName) { // provided for subclass implementation } + + public void transitioning(TransitionResults results, IAtsWorkItem workItem, IStateToken fromState, IStateToken toState, Collection<? extends IAtsUser> toAssignees) throws OseeCoreException { + // provided for subclass implementation + } + }
\ No newline at end of file diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/stateItem/AtsStateItemManager.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/stateItem/AtsStateItemManager.java index a2bf6a884be..b7988a87e03 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/stateItem/AtsStateItemManager.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/stateItem/AtsStateItemManager.java @@ -73,7 +73,4 @@ public class AtsStateItemManager { } } - public static List<IAtsStateItem> getAllStateItems() { - return stateItems; - } } diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/widget/ReviewInfoXWidget.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/widget/ReviewInfoXWidget.java index ea28694be87..c111b2d313d 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/widget/ReviewInfoXWidget.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/widget/ReviewInfoXWidget.java @@ -253,10 +253,6 @@ public class ReviewInfoXWidget extends XLabelValueBase { return html.toString(); } - public String toHTML() throws OseeCoreException { - return ReviewInfoXWidget.toHTML(teamArt, forState); - } - private void createReviewHyperlink(Composite comp, IManagedForm managedForm, XFormToolkit toolkit, final AbstractReviewArtifact revArt, IStateToken forState) throws OseeCoreException { Composite workComp = toolkit.createContainer(comp, 1); diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/export/AtsExportAction.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/export/AtsExportAction.java index b0dc55e8460..472fe90bfb5 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/export/AtsExportAction.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/export/AtsExportAction.java @@ -136,10 +136,6 @@ public class AtsExportAction extends Action { } } - public boolean isPopup() { - return popup; - } - public void setPopup(boolean popup) { this.popup = popup; } diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/goal/GoalMemberProvider.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/goal/GoalMemberProvider.java index 886146502a4..8f78ce369f9 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/goal/GoalMemberProvider.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/goal/GoalMemberProvider.java @@ -91,11 +91,6 @@ public class GoalMemberProvider extends AbstractMemberProvider { } @Override - public IArtifactType getArtifactType() { - return AtsArtifactTypes.Goal; - } - - @Override public String getColumnName() { if (isBacklog()) { return "ats.column.backlogOrder"; diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/goal/GoalXViewerFactory.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/goal/GoalXViewerFactory.java index ec7918f5b83..8ff7c49bead 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/goal/GoalXViewerFactory.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/goal/GoalXViewerFactory.java @@ -110,8 +110,4 @@ public class GoalXViewerFactory extends SkynetXViewerFactory { return soleGoalArtifact; } - public void setSoleGoalArtifact(GoalArtifact soleGoalArtifact) { - this.soleGoalArtifact = soleGoalArtifact; - } - } diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/health/IAtsHealthCheck.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/health/IAtsHealthCheck.java index e16961989e0..792ac37a2c4 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/health/IAtsHealthCheck.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/health/IAtsHealthCheck.java @@ -26,7 +26,7 @@ public interface IAtsHealthCheck { /** * Check artifacts for problems. Log results in resultsMap indexed by test name as key (they will be organized by key * in report). Insert "Error: " at beginning of resultMap value if log item is an error. This will be highlighted. - * + * * @param results JavaTip */ public void validateAtsDatabase(Collection<Artifact> artifacts, ValidateResults results) throws OseeCoreException; diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/health/ValidateAtsDatabase.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/health/ValidateAtsDatabase.java index bc84e0b7fae..469099172e2 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/health/ValidateAtsDatabase.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/health/ValidateAtsDatabase.java @@ -115,14 +115,6 @@ public class ValidateAtsDatabase extends WorldXNavigateItemAction { Jobs.startJob(new Report(getName()), true); } - public void performTaskAndPend() throws InterruptedException { - Report job = new Report(getName()); - job.setUser(true); - job.setPriority(Job.LONG); - job.schedule(); - job.join(); - } - public class Report extends Job { public Report(String name) { diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/internal/AtsOseeCmService.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/internal/AtsOseeCmService.java index 466c396c38d..f56b81dee4b 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/internal/AtsOseeCmService.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/internal/AtsOseeCmService.java @@ -10,44 +10,22 @@ *******************************************************************************/ package org.eclipse.osee.ats.internal; -import java.util.ArrayList; import java.util.Collection; -import java.util.Collections; -import java.util.Date; -import java.util.List; -import java.util.Set; import java.util.logging.Level; import org.eclipse.osee.ats.AtsImage; -import org.eclipse.osee.ats.actions.wizard.NewActionJob; -import org.eclipse.osee.ats.api.ai.IAtsActionableItem; -import org.eclipse.osee.ats.api.data.AtsArtifactTypes; -import org.eclipse.osee.ats.api.task.JaxAtsTaskFactory; -import org.eclipse.osee.ats.api.task.NewTaskData; -import org.eclipse.osee.ats.api.task.NewTaskDataFactory; -import org.eclipse.osee.ats.api.task.NewTaskDatas; -import org.eclipse.osee.ats.api.team.ChangeType; -import org.eclipse.osee.ats.core.client.search.AtsArtifactQuery; import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; -import org.eclipse.osee.ats.core.client.util.AtsUtilClient; -import org.eclipse.osee.ats.core.client.workflow.AbstractWorkflowArtifact; -import org.eclipse.osee.ats.core.config.ActionableItems; -import org.eclipse.osee.ats.core.util.AtsUtilCore; import org.eclipse.osee.ats.util.AtsBranchManager; import org.eclipse.osee.ats.util.AtsUtil; import org.eclipse.osee.ats.world.WorldEditor; import org.eclipse.osee.ats.world.WorldEditorSimpleProvider; import org.eclipse.osee.framework.core.data.BranchId; -import org.eclipse.osee.framework.core.data.IArtifactType; import org.eclipse.osee.framework.core.data.IOseeBranch; import org.eclipse.osee.framework.core.operation.IOperation; import org.eclipse.osee.framework.core.operation.Operations; -import org.eclipse.osee.framework.jdk.core.type.OseeArgumentException; import org.eclipse.osee.framework.jdk.core.type.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.artifact.BranchManager; -import org.eclipse.osee.framework.ui.skynet.FrameworkImage; import org.eclipse.osee.framework.ui.skynet.cm.IOseeCmService; import org.eclipse.osee.framework.ui.skynet.cm.OseeCmEditor; import org.eclipse.osee.framework.ui.swt.KeyedImage; @@ -59,11 +37,6 @@ import org.eclipse.osee.framework.ui.swt.KeyedImage; public class AtsOseeCmService implements IOseeCmService { @Override - public boolean isCmAdmin() { - return AtsUtilClient.isAtsAdmin(); - } - - @Override public void openArtifact(String guid, OseeCmEditor oseeCmEditor) { AtsUtil.openArtifact(guid, oseeCmEditor); } @@ -77,93 +50,13 @@ public class AtsOseeCmService implements IOseeCmService { public void openArtifacts(String name, Collection<Artifact> artifacts, OseeCmEditor oseeCmEditor) { WorldEditor.open(new WorldEditorSimpleProvider(name, artifacts)); } - - @Override - public void openArtifactsByGuid(String name, List<String> guidOrAtsIds, OseeCmEditor oseeCmEditor) { - try { - List<Artifact> artifacts = AtsArtifactQuery.getArtifactListFromIds(guidOrAtsIds); - openArtifacts(name, artifacts, oseeCmEditor); - } catch (OseeCoreException ex) { - OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, "Error opening ATS artifacts by Id", ex); - } - } - - @Override - public KeyedImage getOpenImage(OseeCmEditor oseeCmEditor) { - if (oseeCmEditor == OseeCmEditor.CmPcrEditor) { - return AtsImage.TEAM_WORKFLOW; - } else if (oseeCmEditor == OseeCmEditor.CmMultiPcrEditor) { - return AtsImage.GLOBE; - } - return FrameworkImage.LASER; - } - + @Override public boolean isPcrArtifact(Artifact artifact) { return AtsUtil.isAtsArtifact(artifact); } @Override - public boolean isCompleted(Artifact artifact) { - boolean completed = false; - if (isPcrArtifact(artifact) && artifact instanceof AbstractWorkflowArtifact) { - completed = ((AbstractWorkflowArtifact) artifact).isCompletedOrCancelled(); - } - return completed; - } - - @Override - public List<Artifact> getTaskArtifacts(Artifact pcrArtifact) { - if (pcrArtifact instanceof TeamWorkFlowArtifact) { - try { - List<Artifact> arts = new ArrayList<>(); - arts.addAll(((TeamWorkFlowArtifact) pcrArtifact).getTaskArtifacts()); - return arts; - } catch (OseeCoreException ex) { - OseeLog.log(Activator.class, Level.SEVERE, ex); - } - } - return Collections.emptyList(); - } - - @Override - public Artifact createWorkTask(String name, String parentPcrGuid) { - try { - Artifact artifact = AtsArtifactQuery.getArtifactFromId(parentPcrGuid); - Date createdDate = new Date(); - NewTaskData newTaskData = NewTaskDataFactory.get(getClass().getSimpleName() + " - Create Work Task", - AtsClientService.get().getUserService().getCurrentUser().getUserId(), artifact.getUuid()); - JaxAtsTaskFactory.get(newTaskData, name, AtsClientService.get().getUserService().getCurrentUser(), - createdDate); - AtsClientService.getTaskEp().create(new NewTaskDatas(newTaskData)); - } catch (OseeCoreException ex) { - OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex); - } - return null; - } - - @Override - public Artifact createPcr(String title, String description, String changeType, String priority, Date needByDate, Collection<String> productNames) { - try { - ChangeType cType = ChangeType.getChangeType(changeType); - if (cType == null) { - cType = ChangeType.Improvement; - } - Set<IAtsActionableItem> aias = ActionableItems.getActionableItems(productNames, AtsClientService.get()); - if (aias.isEmpty()) { - throw new OseeArgumentException("Can not resolve productNames to Actionable Items"); - } - NewActionJob job = new NewActionJob(title, description, cType, priority, needByDate, false, aias, null, null); - job.schedule(); - job.join(); - return job.getActionArt(); - } catch (Exception ex) { - OseeLog.log(Activator.class, Level.SEVERE, ex); - } - return null; - } - - @Override public boolean isBranchesAllCommittedExcept(Artifact art, BranchId branch) { boolean toReturn = false; if (art instanceof TeamWorkFlowArtifact) { @@ -189,21 +82,6 @@ public class AtsOseeCmService implements IOseeCmService { } @Override - public IArtifactType getPcrArtifactType() { - return AtsArtifactTypes.TeamWorkflow; - } - - @Override - public IArtifactType getPcrTaskArtifactType() { - return AtsArtifactTypes.Task; - } - - @Override - public BranchId getCmBranchToken() { - return AtsUtilCore.getAtsBranch(); - } - - @Override public boolean isWorkFlowBranch(BranchId branch) { boolean toReturn = false; Artifact art; diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/report/PublishFullVersionReportItem.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/report/PublishFullVersionReportItem.java index d0eb0e50edd..877db8ec38f 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/report/PublishFullVersionReportItem.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/report/PublishFullVersionReportItem.java @@ -51,10 +51,6 @@ public class PublishFullVersionReportItem extends XNavigateItemAction { this.publishToFilename = publishToFilename; } - public PublishFullVersionReportItem(XNavigateItem parent) { - this(parent, "Publish Full Version Report", null, null); - } - @Override public void run(TableLoadOption... tableLoadOptions) { String usePublishToFilename = publishToFilename; diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/notify/EmailActionsData.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/notify/EmailActionsData.java index dbb91453d34..dc154b4636a 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/notify/EmailActionsData.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/notify/EmailActionsData.java @@ -48,10 +48,6 @@ public class EmailActionsData { this.body = body; } - public Set<Artifact> getGroups() { - return workflows; - } - public Result isValid() { if (!Strings.isValid(getSubject())) { return new Result("Must enter subject"); @@ -73,16 +69,6 @@ public class EmailActionsData { return Result.TrueResult; } - public String getHtmlResult() { - StringBuilder html = new StringBuilder(); - - html.append("<pre>"); - html.append(body); - html.append("</pre>"); - - return html.toString(); - } - public Set<Artifact> getWorkflows() { return workflows; } diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/operation/CreateActionFromTaskBlam.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/operation/CreateActionFromTaskBlam.java index 707c34b85de..2ab5f54132e 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/operation/CreateActionFromTaskBlam.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/operation/CreateActionFromTaskBlam.java @@ -167,19 +167,19 @@ public class CreateActionFromTaskBlam extends AbstractBlam { public String getXWidgetsXml() throws OseeCoreException { return "<xWidgets><XWidget xwidgetType=\"XListDropViewer\" displayName=\"" + TASKS + "\" />" + // - "<XWidget xwidgetType=\"XHyperlabelActionableItemSelection\" displayName=\"" + ACTIONABLE_ITEMS + "\" horizontalLabel=\"true\"/>" + - // - "<XWidget xwidgetType=\"XText\" displayName=\"" + TITLE + "\" horizontalLabel=\"true\" defaultValue=\"" + getDefaultTitle() + "\"/>" + - // - "<XWidget displayName=\"" + CHANGE_TYPE + "\" xwidgetType=\"XCombo(" + Collections.toString(",", - AttributeTypeManager.getEnumerationValues( - AtsAttributeTypes.ChangeType)) + ")\" required=\"true\" horizontalLabel=\"true\" toolTip=\"" + AtsAttributeTypes.ChangeType.getDescription() + "\"/>" + - // - "<XWidget displayName=\"" + PRIORITY + "\" xwidgetType=\"XCombo(" + Collections.toString(",", - AttributeTypeManager.getEnumerationValues( - AtsAttributeTypes.PriorityType)) + ")\" required=\"true\" horizontalLabel=\"true\"/>" + - // - "</xWidgets>"; + "<XWidget xwidgetType=\"XHyperlabelActionableItemSelection\" displayName=\"" + ACTIONABLE_ITEMS + "\" horizontalLabel=\"true\"/>" + + // + "<XWidget xwidgetType=\"XText\" displayName=\"" + TITLE + "\" horizontalLabel=\"true\" defaultValue=\"" + getDefaultTitle() + "\"/>" + + // + "<XWidget displayName=\"" + CHANGE_TYPE + "\" xwidgetType=\"XCombo(" + Collections.toString(",", + AttributeTypeManager.getEnumerationValues( + AtsAttributeTypes.ChangeType)) + ")\" required=\"true\" horizontalLabel=\"true\" toolTip=\"" + AtsAttributeTypes.ChangeType.getDescription() + "\"/>" + + // + "<XWidget displayName=\"" + PRIORITY + "\" xwidgetType=\"XCombo(" + Collections.toString(",", + AttributeTypeManager.getEnumerationValues( + AtsAttributeTypes.PriorityType)) + ")\" required=\"true\" horizontalLabel=\"true\"/>" + + // + "</xWidgets>"; } /** @@ -204,16 +204,6 @@ public class CreateActionFromTaskBlam extends AbstractBlam { return "Create Action from task and relate using supporting information relation."; } - /** - * @return the defaultTeamWorkflows - */ - public Collection<TaskArtifact> getDefaultTeamWorkflows() { - return taskArtifacts; - } - - /** - * @param taskArtifacts the defaultTeamWorkflows to set - */ public void setDefaultTeamWorkflows(Collection<? extends TaskArtifact> taskArtifacts) { this.taskArtifacts = new LinkedList<>(); this.taskArtifacts.addAll(taskArtifacts); diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/operation/ImportTasksFromSimpleList.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/operation/ImportTasksFromSimpleList.java index d3d000ecb86..783cabe3158 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/operation/ImportTasksFromSimpleList.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/operation/ImportTasksFromSimpleList.java @@ -174,16 +174,6 @@ public class ImportTasksFromSimpleList extends AbstractBlam { return "Import tasks from spreadsheet into given Team Workflow. Assignee for tasks will be current user unless otherwise specified."; } - /** - * @return the TaskableStateMachineArtifact - */ - public TeamWorkFlowArtifact getTaskableStateMachineArtifact() { - return taskableStateMachineArtifact; - } - - /** - * @param defaultTeamWorkflowArtifact the defaultTeamWorkflowArtifact to set - */ public void setTaskableStateMachineArtifact(TeamWorkFlowArtifact taskableStateMachineArtifact) { this.taskableStateMachineArtifact = taskableStateMachineArtifact; } diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/operation/ImportTasksFromSpreadsheet.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/operation/ImportTasksFromSpreadsheet.java index b61f867fa6a..febbca394ce 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/operation/ImportTasksFromSpreadsheet.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/operation/ImportTasksFromSpreadsheet.java @@ -80,16 +80,6 @@ public class ImportTasksFromSpreadsheet extends AbstractBlam { return "Import tasks from spreadsheet into given Team Workflow"; } - /** - * @return the TaskableStateMachineArtifact - */ - public TeamWorkFlowArtifact getTaskableStateMachineArtifact() { - return taskableStateMachineArtifact; - } - - /** - * @param taskableStateMachineArtifact the TaskableStateMachineArtifact to set - */ public void setTaskableStateMachineArtifact(TeamWorkFlowArtifact taskableStateMachineArtifact) { this.taskableStateMachineArtifact = taskableStateMachineArtifact; } diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/operation/TaskMetrics.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/operation/TaskMetrics.java index d7ba49acc5c..e117584ccd2 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/operation/TaskMetrics.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/operation/TaskMetrics.java @@ -57,17 +57,13 @@ import org.eclipse.ui.forms.widgets.FormToolkit; public class TaskMetrics extends AbstractBlam { private static final int IN_WORK_PERCENT = 5; private static final int COMPLETED_CANCELLED_PERCENT = 100; - private final CountingMap<IAtsUser> metrics; + private final CountingMap<IAtsUser> metrics = new CountingMap<>(); private CharBackedInputStream charBak; private ISheetWriter excelWriter; private XHyperlabelTeamDefinitionSelection teamCombo; private AtsObjectMultiChoiceSelect versionsWidget; - public TaskMetrics() { - metrics = new CountingMap<>(); - } - @Override public String getName() { return "Task Metrics"; diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/review/GenerateReviewParticipationReport.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/review/GenerateReviewParticipationReport.java index 24ae8749e6c..c401a6d9518 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/review/GenerateReviewParticipationReport.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/review/GenerateReviewParticipationReport.java @@ -167,10 +167,6 @@ public class GenerateReviewParticipationReport extends XNavigateItemAction { } - public IAtsUser getSelectedUser() { - return selectedUser; - } - public void setSelectedUser(IAtsUser selectedUser) { this.selectedUser = selectedUser; } diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/review/ReviewNavigateView.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/review/ReviewNavigateView.java index a10b1fe9182..63f22932dab 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/review/ReviewNavigateView.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/review/ReviewNavigateView.java @@ -23,7 +23,6 @@ import org.eclipse.core.runtime.jobs.IJobChangeEvent; import org.eclipse.core.runtime.jobs.Job; import org.eclipse.core.runtime.jobs.JobChangeAdapter; import org.eclipse.jface.action.IToolBarManager; -import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.osee.ats.actions.OpenWorkflowByIdAction; import org.eclipse.osee.ats.core.client.config.AtsBulkLoad; import org.eclipse.osee.ats.core.client.util.AtsUtilClient; @@ -51,9 +50,7 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Label; import org.eclipse.ui.IMemento; import org.eclipse.ui.IViewSite; -import org.eclipse.ui.IWorkbenchPage; import org.eclipse.ui.PartInitException; -import org.eclipse.ui.PlatformUI; import org.eclipse.ui.part.ViewPart; import org.eclipse.ui.progress.UIJob; @@ -208,17 +205,6 @@ public class ReviewNavigateView extends ViewPart implements IXNavigateEventListe toolbarManager.update(true); } - public static ReviewNavigateView getNavigateView() { - IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage(); - try { - return (ReviewNavigateView) page.showView(ReviewNavigateView.VIEW_ID); - } catch (PartInitException e1) { - MessageDialog.openInformation(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), "Launch Error", - "Couldn't Launch OSEE Review NavigateView " + e1.getMessage()); - } - return null; - } - @Override public void saveState(IMemento memento) { super.saveState(memento); diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/search/AtsQuickSearchData.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/search/AtsQuickSearchData.java index dc8c0e9db01..59739b55000 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/search/AtsQuickSearchData.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/search/AtsQuickSearchData.java @@ -28,10 +28,6 @@ class AtsQuickSearchData { return includeCompleteCancelled; } - public void setIncludeCompleteCancelled(boolean includeCompleteCancelled) { - this.includeCompleteCancelled = includeCompleteCancelled; - } - public String getSearchStr() { return searchStr; } diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/search/AtsQuickSearchOperation.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/search/AtsQuickSearchOperation.java index 9a9b769f9cc..aa94ab65562 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/search/AtsQuickSearchOperation.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/search/AtsQuickSearchOperation.java @@ -99,10 +99,6 @@ class AtsQuickSearchOperation extends AbstractOperation implements WorldEditorOp return data.toString(); } - public Set<Artifact> getAllArtifacts() { - return allArtifacts; - } - @Override public WorldEditor getWorldEditor() { return worldEditor; diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/search/widget/ActionableItemSearchWidget.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/search/widget/ActionableItemSearchWidget.java index fded34d8da5..0e5ff0feedc 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/search/widget/ActionableItemSearchWidget.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/search/widget/ActionableItemSearchWidget.java @@ -30,10 +30,6 @@ public class ActionableItemSearchWidget { this.searchItem = searchItem; } - public void addWidget() { - addWidget(0); - } - public void addWidget(int beginComposite) { searchItem.addWidgetXml(String.format( "<XWidget displayName=\"Actionable Item(s)\" xwidgetType=\"XHyperlabelActionableItemSelection\" horizontalLabel=\"true\" %s />", diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/search/widget/TeamDefinitionSearchWidget.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/search/widget/TeamDefinitionSearchWidget.java index e7ad59f0391..19d75a153d7 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/search/widget/TeamDefinitionSearchWidget.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/search/widget/TeamDefinitionSearchWidget.java @@ -31,10 +31,6 @@ public class TeamDefinitionSearchWidget { this.searchItem = searchItem; } - public void addWidget() { - addWidget(0); - } - public void addWidget(int beginComposite) { searchItem.addWidgetXml(String.format( "<XWidget displayName=\"%s\" xwidgetType=\"XHyperlabelTeamDefinitionSelection\" horizontalLabel=\"true\" %s />", diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/search/widget/WorkItemTypeSearchWidget.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/search/widget/WorkItemTypeSearchWidget.java index 8191e600b2b..afd47c5236a 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/search/widget/WorkItemTypeSearchWidget.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/search/widget/WorkItemTypeSearchWidget.java @@ -29,10 +29,6 @@ public class WorkItemTypeSearchWidget { this.searchItem = searchItem; } - public void addWidget() { - addWidget(0); - } - public void addWidget(int beginComposite) { searchItem.addWidgetXml(String.format( "<XWidget xwidgetType=\"XCheckBox\" displayName=\"Team Workflow\" defaultValue=\"true\" labelAfter=\"true\" horizontalLabel=\"true\" %s />", diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/task/TaskXViewer.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/task/TaskXViewer.java index 4438a2ad54e..2004a8f63f2 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/task/TaskXViewer.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/task/TaskXViewer.java @@ -119,10 +119,6 @@ public class TaskXViewer extends WorldXViewer { this.tasksEditable = tasksEditable; } - public boolean isNewTaskSelectionEnabled() { - return newTaskSelectionEnabled; - } - public void setNewTaskSelectionEnabled(boolean newTaskSelectionEnabled) { this.newTaskSelectionEnabled = newTaskSelectionEnabled; } diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsBranchManager.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsBranchManager.java index 68dd22ff8e0..02e898f255a 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsBranchManager.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsBranchManager.java @@ -52,7 +52,6 @@ import org.eclipse.osee.framework.ui.skynet.change.ChangeUiUtil; import org.eclipse.osee.framework.ui.skynet.util.TransactionIdLabelProvider; import org.eclipse.osee.framework.ui.skynet.widgets.dialog.FilteredTreeBranchDialog; import org.eclipse.osee.framework.ui.skynet.widgets.dialog.FilteredTreeDialog; -import org.eclipse.osee.framework.ui.skynet.widgets.xBranch.BranchView; import org.eclipse.osee.framework.ui.skynet.widgets.xmerge.MergeView; import org.eclipse.ui.PlatformUI; @@ -132,21 +131,6 @@ public final class AtsBranchManager { } /** - * Opens the branch currently associated with this state machine artifact. - */ - public static void showWorkingBranch(TeamWorkFlowArtifact teamArt) { - try { - if (!AtsClientService.get().getBranchService().isWorkingBranchInWork(teamArt)) { - AWorkbench.popup("ERROR", "No Current Working Branch"); - return; - } - BranchView.revealBranch(AtsClientService.get().getBranchService().getWorkingBranch(teamArt)); - } catch (Exception ex) { - OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex); - } - } - - /** * If working branch has no changes, allow for deletion. */ public static void deleteWorkingBranch(TeamWorkFlowArtifact teamArt, boolean promptUser) { diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsUtil.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsUtil.java index 8b305b0696a..67e36917121 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsUtil.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsUtil.java @@ -295,10 +295,6 @@ public final class AtsUtil { return null; } - public static void openInAtsWorldEditorItems(String name, Collection<IAtsWorkItem> items) { - openInAtsWorldEditor(name, AtsObjects.getArtifacts(items)); - } - public static void openInAtsWorldEditor(Collection<? extends IAtsWorkItem> workItems, String name) { openInAtsWorldEditor(name, AtsObjects.getArtifacts(workItems)); } diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/FavoritesManager.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/FavoritesManager.java index 449e9c83941..0342f775e2a 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/FavoritesManager.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/FavoritesManager.java @@ -10,10 +10,8 @@ *******************************************************************************/ package org.eclipse.osee.ats.util; -import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; -import java.util.List; import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.osee.ats.api.data.AtsRelationTypes; import org.eclipse.osee.ats.api.user.IAtsUser; @@ -24,8 +22,6 @@ import org.eclipse.osee.ats.internal.AtsClientService; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; import org.eclipse.osee.framework.logging.OseeLevel; import org.eclipse.osee.framework.logging.OseeLog; -import org.eclipse.osee.framework.skynet.core.User; -import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction; import org.eclipse.osee.framework.skynet.core.transaction.TransactionManager; import org.eclipse.ui.PlatformUI; @@ -46,10 +42,6 @@ public class FavoritesManager { this.awas = awas; } - public void toggleFavorite() { - toggleFavorite(true); - } - public void toggleFavorite(boolean prompt) { try { if (amIFavorite(awas.iterator().next())) { @@ -112,11 +104,4 @@ public class FavoritesManager { return workflow.getRelatedArtifactsUnSorted(AtsRelationTypes.FavoriteUser_User).contains(user); } - public static List<User> getFavorites(AbstractWorkflowArtifact workflow) throws OseeCoreException { - ArrayList<User> arts = new ArrayList<>(); - for (Artifact art : workflow.getRelatedArtifactsUnSorted(AtsRelationTypes.FavoriteUser_User)) { - arts.add((User) art); - } - return arts; - } } diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/Import/ExcelAtsActionArtifactExtractor.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/Import/ExcelAtsActionArtifactExtractor.java index 000d829056d..56261405b12 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/Import/ExcelAtsActionArtifactExtractor.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/Import/ExcelAtsActionArtifactExtractor.java @@ -10,7 +10,6 @@ *******************************************************************************/ package org.eclipse.osee.ats.util.Import; -import java.io.FileFilter; import java.io.InputStreamReader; import java.net.URI; import java.util.ArrayList; @@ -310,10 +309,6 @@ public class ExcelAtsActionArtifactExtractor { return actionArts; } - public FileFilter getFileFilter() { - return null; - } - public String getName() { return "Excel Ats Actions"; } diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/Import/ExcelAtsTaskArtifactExtractor.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/Import/ExcelAtsTaskArtifactExtractor.java index 250904a0a4f..7c7d3cf600b 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/Import/ExcelAtsTaskArtifactExtractor.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/Import/ExcelAtsTaskArtifactExtractor.java @@ -11,7 +11,6 @@ package org.eclipse.osee.ats.util.Import; -import java.io.FileFilter; import java.io.InputStreamReader; import java.net.URI; import java.util.Date; @@ -77,10 +76,6 @@ public class ExcelAtsTaskArtifactExtractor { this.monitor = monitor; } - public FileFilter getFileFilter() { - return null; - } - public String getName() { return "Excel Ats Tasks"; } diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/Overview.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/Overview.java index a0aa8d3eb5d..c3bc5ef6a61 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/Overview.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/Overview.java @@ -87,7 +87,7 @@ public class Overview { /** * Return label with value converted to show html reserved characters - * + * * @return string to embed into html */ public String getLabelValue(String label, String value) { @@ -95,23 +95,10 @@ public class Overview { return getLabel(label) + valueStr; } - /** - * Return label and value WITHOUT conversion to handle html reserved characters. Value will be as-is - * - * @return string to embed into html - */ - public String getLabelValueNoConvert(String label, String value) { - return getLabel(label) + value; - } - public static String getLabel(String label) { return AHTML.getLabelStr(labelFont, label + ": "); } - public void addHtml(String html) { - this.html.append(html); - } - public void addTable(String... strs) { addTable(strs, 100); } diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/PromptChangeUtil.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/PromptChangeUtil.java index 8183c0cc805..68bf9f09319 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/PromptChangeUtil.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/PromptChangeUtil.java @@ -17,7 +17,6 @@ import org.eclipse.osee.ats.internal.Activator; import org.eclipse.osee.framework.core.data.IAttributeType; 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.ui.skynet.artifact.ArtifactPromptChange; /** @@ -29,29 +28,10 @@ public final class PromptChangeUtil { // Utility class } - public static boolean promptChangePercentAttribute(AbstractWorkflowArtifact sma, IAttributeType attributeType, boolean persist) { - try { - return ArtifactPromptChange.promptChangeAttribute(attributeType, Arrays.asList(new Artifact[] {sma}), persist); - } catch (Exception ex) { - OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex); - } - return false; - } - public static boolean promptChangeAttribute(final Collection<? extends AbstractWorkflowArtifact> awas, IAttributeType attributeType, boolean persist, boolean multiLine) { return ArtifactPromptChange.promptChangeAttribute(attributeType, awas, persist, multiLine); } - public static boolean promptChangeAttribute(final Artifact sma, IAttributeType attributeType, boolean persist, boolean multiLine) { - try { - return ArtifactPromptChange.promptChangeAttribute(attributeType, Arrays.asList(new Artifact[] {sma}), persist, - multiLine); - } catch (Exception ex) { - OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex); - } - return false; - } - public static boolean promptChangeAttribute(AbstractWorkflowArtifact sma, IAttributeType attributeType, final boolean persist, boolean multiLine) { try { return ArtifactPromptChange.promptChangeAttribute(attributeType, Arrays.asList(sma), persist, multiLine); @@ -61,15 +41,4 @@ public final class PromptChangeUtil { return false; } - public static boolean promptChangeDate(AbstractWorkflowArtifact sma, IAttributeType attributeType, boolean persist) { - try { - return ArtifactPromptChange.promptChangeAttribute(attributeType, java.util.Collections.singleton(sma), - persist); - } catch (Exception ex) { - OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, - "Can't save " + attributeType.getUnqualifiedName() + " date to artifact " + sma.getAtsId(), ex); - } - return false; - } - }
\ No newline at end of file diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/SubscribeManagerUI.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/SubscribeManagerUI.java index 1b3b0dcb37a..2fffa807a99 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/SubscribeManagerUI.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/SubscribeManagerUI.java @@ -37,10 +37,6 @@ public class SubscribeManagerUI { this.awas = awas; } - public void toggleSubscribe() { - toggleSubscribe(true); - } - public void toggleSubscribe(boolean prompt) { try { if (SubscribeManager.amISubscribed(awas.iterator().next())) { diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/WorkflowMetrics.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/WorkflowMetrics.java index 422b71dc7c4..8f5c1a48998 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/WorkflowMetrics.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/WorkflowMetrics.java @@ -196,17 +196,6 @@ public class WorkflowMetrics { return completed; } - public double getPercentCompleteByTeamWorkflow() throws OseeCoreException { - if (getTeamArts().isEmpty()) { - return 0; - } - double completed = getCompletedTeamWorkflows().size(); - if (completed == 0) { - return 0; - } - return completed / getTeamArts().size() * 100; - } - public double getPercentCompleteByWorkflow() throws OseeCoreException { if (awas.isEmpty()) { return 0; @@ -228,17 +217,6 @@ public class WorkflowMetrics { return tasks; } - public double getPercentCompleteByTaskWorkflow() throws OseeCoreException { - if (getTaskArts().isEmpty()) { - return 0; - } - double completed = getCompletedTaskWorkflows().size(); - if (completed == 0) { - return 0; - } - return completed / getTaskArts().size() * 100; - } - @Override public String toString() { return str; @@ -258,27 +236,10 @@ public class WorkflowMetrics { getNumActions(), getNumTeamWfs(), getNumTasks(), getNumReviews(), getGoals()); } - public String toStringLong() { - return String.format( - "%s\nEstimated Hours: %5.2f Percent Complete: %5.2f Remaining Hours: %5.2f ManDaysNeeded: %5.2f \nHours Spent: %5.2f %s", - toStringObjectBreakout(), estHours, percentCompleteByWorkflowPercents, hrsRemainFromEstimates, manDaysNeeded, - hrsSpent, - version != null ? String.format("\nVersion: %s Estimated Release Date: %s Days Left: %d ", version.getName(), - estimatedReleaseDate == null ? "Not Set" : DateUtil.getMMDDYY(estimatedReleaseDate), daysTillRel) : ""); - } - public Date getEstRelDate() { return estimatedReleaseDate; } - public void setEstRelDate(Date estRelDate) { - this.estimatedReleaseDate = estRelDate; - } - - public long getDaysTillRel() { - return daysTillRel; - } - public double getHoursTillRel() { return daysTillRel * manHoursPerDay; } @@ -292,21 +253,6 @@ public class WorkflowMetrics { return String.format("%d workdays (M-F) till release", daysTillRel); } - /** - * @param daysTillRel the daysTillRel to set - */ - public void setDaysTillRel(int daysTillRel) { - this.daysTillRel = daysTillRel; - } - - public IAtsVersion getVersionArtifact() { - return version; - } - - public void setVersionArtifact(IAtsVersion versionArtifact) { - this.version = versionArtifact; - } - public int getNumTeamWfs() { return teamArts.size(); } @@ -345,10 +291,6 @@ public class WorkflowMetrics { return estHours; } - public void setEstHours(double estHours) { - this.estHours = estHours; - } - public double getHrsRemainFromEstimates() { return hrsRemainFromEstimates; } @@ -377,21 +319,10 @@ public class WorkflowMetrics { return teamArts; } - public Set<Artifact> getActionArts() { - return actionArts; - } - public Set<TaskArtifact> getTaskArts() { return taskArts; } - public Set<AbstractReviewArtifact> getReviewArts() { - return reviewArts; - } - - /** - * Return all SMAs including Review and Tasks - */ public HashCollection<IAtsUser, Artifact> getUserToAssignedSmas() { return userToAssignedSmas; } diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/validate/AttributeSetRule.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/validate/AttributeSetRule.java index ebc700a013e..4c16a6025b2 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/validate/AttributeSetRule.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/validate/AttributeSetRule.java @@ -41,18 +41,6 @@ public final class AttributeSetRule extends AbstractValidationRule { return artifactType.inheritsFrom(baseArtifactType); } - public IAttributeType getAttributeName() { - return attributeType; - } - - public Integer getMinimumValues() { - return minimumValues; - } - - public String getInvalidValue() { - return invalidValue; - } - @Override protected ValidationResult validate(Artifact artToValidate, IProgressMonitor monitor) throws OseeCoreException { Collection<String> errorMessages = new ArrayList<>(); diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/validate/ListAndBulletRule.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/validate/ListAndBulletRule.java index bd419ea16fc..ebd1f867b90 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/validate/ListAndBulletRule.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/validate/ListAndBulletRule.java @@ -17,7 +17,6 @@ import java.util.regex.Pattern; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.osee.framework.core.data.IArtifactType; import org.eclipse.osee.framework.core.enums.CoreAttributeTypes; -import org.eclipse.osee.framework.core.model.type.ArtifactType; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.ui.skynet.results.XResultDataUI; @@ -36,10 +35,6 @@ public class ListAndBulletRule extends AbstractValidationRule { this.artifactType = artifactType; } - public boolean hasArtifactType(ArtifactType artType) { - return artType.inheritsFrom(artifactType); - } - @Override protected ValidationResult validate(Artifact artToValidate, IProgressMonitor monitor) throws OseeCoreException { Collection<String> errorMessages = new ArrayList<>(); diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/validate/RelationSetRule.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/validate/RelationSetRule.java index f6a3c56966e..030bac4c5d3 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/validate/RelationSetRule.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/validate/RelationSetRule.java @@ -37,18 +37,10 @@ public final class RelationSetRule extends AbstractValidationRule { ignoreArtifactTypes.length == 0 ? new ArrayList<IArtifactType>() : Arrays.asList(ignoreArtifactTypes); } - public Integer getMinimumRelations() { - return minimumRelations; - } - public boolean hasArtifactType(ArtifactType artType) { return artType.inheritsFrom(artifactType); } - public IRelationTypeSide getRelationEnum() { - return relationEnum; - } - @Override protected ValidationResult validate(Artifact artToValidate, IProgressMonitor monitor) throws OseeCoreException { Collection<String> errorMessages = new ArrayList<>(); diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/validate/UniqueNameRule.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/validate/UniqueNameRule.java index 261d6b2d2e0..74fc94f602f 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/validate/UniqueNameRule.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/validate/UniqueNameRule.java @@ -40,10 +40,6 @@ public class UniqueNameRule extends AbstractValidationRule { return artType.inheritsFrom(artifactType); } - public IArtifactType getArtifactType() { - return artifactType; - } - @Override protected ValidationResult validate(Artifact artToValidate, IProgressMonitor monitor) throws OseeCoreException { Collection<String> errorMessages = new ArrayList<>(); @@ -86,8 +82,8 @@ public class UniqueNameRule extends AbstractValidationRule { private boolean isImplementationDetailsChild(Artifact childArtifact, Artifact parentArtifact) { return parentArtifact.getArtifactType().equals(CoreArtifactTypes.SoftwareRequirement) && // - (childArtifact.isOfType(CoreArtifactTypes.ImplementationDetails) && // - childArtifact.getParent().equals(parentArtifact)); + (childArtifact.isOfType(CoreArtifactTypes.ImplementationDetails) && // + childArtifact.getParent().equals(parentArtifact)); } private void addGuidPair(String guidA, String guidB) { diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/XAtsProgramComboWidget.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/XAtsProgramComboWidget.java index 03e86ae4823..6b7891819e1 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/XAtsProgramComboWidget.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/XAtsProgramComboWidget.java @@ -38,10 +38,6 @@ public class XAtsProgramComboWidget extends XComboViewer { setSorter(new StringNameSorter()); } - public XAtsProgramComboWidget(IAtsProgramManager atsProgramManager) throws OseeCoreException { - this(atsProgramManager.getName() + " Program", atsProgramManager.getPrograms()); - } - public XAtsProgramComboWidget(Collection<? extends IAtsProgram> atsPrograms) throws OseeCoreException { this("ATS Program", atsPrograms); } diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/XGoalCombo.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/XGoalCombo.java index 4948c2fa14b..91dd0fbb525 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/XGoalCombo.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/XGoalCombo.java @@ -70,8 +70,4 @@ public class XGoalCombo extends XComboViewer { } } - public Artifact getSelectedGoal() { - return selectedGoal; - } - } diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/XHyperlabelActionableItemSelection.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/XHyperlabelActionableItemSelection.java index ca658fbe11b..b790ee6b3b1 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/XHyperlabelActionableItemSelection.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/XHyperlabelActionableItemSelection.java @@ -89,13 +89,6 @@ public class XHyperlabelActionableItemSelection extends XHyperlinkLabelCmdValueS return false; } - public void setTeamDefs(Collection<IAtsActionableItem> teamDefs) { - this.teamDefs = teamDefs; - if (dialog != null) { - dialog.setInput(teamDefs); - } - } - @Override public boolean isEmpty() { return selectedAis.isEmpty(); diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/XStateCombo.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/XStateCombo.java index 77ccbcb65cd..0b550db1f32 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/XStateCombo.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/XStateCombo.java @@ -28,7 +28,7 @@ import org.eclipse.osee.framework.ui.skynet.widgets.XComboDam; /** * Provides combo of all valid states for a certain Task or Team Workflow. Valid states will be determined off * WorkDefinition of parent team workflow when Widget setArtifact is called. - * + * * @author Donald G. Dunne */ public class XStateCombo extends XComboDam { @@ -59,10 +59,6 @@ public class XStateCombo extends XComboDam { return validStates.toArray(new String[validStates.size()]); } - public String getSelectedState() { - return (String) getData(); - } - @Override public void setAttributeType(Artifact artifact, IAttributeType attributeType) throws OseeCoreException { super.setAttributeType(artifact, AtsAttributeTypes.RelatedToState); diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/XStateSearchCombo.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/XStateSearchCombo.java index 765988ec30a..09f068ae87d 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/XStateSearchCombo.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/XStateSearchCombo.java @@ -23,7 +23,7 @@ import org.eclipse.swt.widgets.Composite; /** * Provides combo box to choose from all valid states in ATS configured items. Used for generic searching windows where * set states are not known. - * + * * @author Donald G. Dunne */ public class XStateSearchCombo extends XComboViewer { @@ -66,10 +66,6 @@ public class XStateSearchCombo extends XComboViewer { }); } - public String getSelectedState() { - return selectedState; - } - @Override public void setSelected(List<Object> selected) { super.setSelected(selected); diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/XWorkingBranch.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/XWorkingBranch.java index 33ce7c52b42..02123e68a91 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/XWorkingBranch.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/XWorkingBranch.java @@ -42,8 +42,8 @@ import org.eclipse.osee.framework.skynet.core.event.OseeEventManager; import org.eclipse.osee.framework.skynet.core.event.filter.IEventFilter; import org.eclipse.osee.framework.skynet.core.event.listener.IArtifactEventListener; import org.eclipse.osee.framework.skynet.core.event.listener.IBranchEventListener; -import org.eclipse.osee.framework.skynet.core.event.model.AccessTopicEventPayload; import org.eclipse.osee.framework.skynet.core.event.model.AccessTopicEvent; +import org.eclipse.osee.framework.skynet.core.event.model.AccessTopicEventPayload; import org.eclipse.osee.framework.skynet.core.event.model.ArtifactEvent; import org.eclipse.osee.framework.skynet.core.event.model.BranchEvent; import org.eclipse.osee.framework.skynet.core.event.model.BranchEventType; @@ -380,10 +380,6 @@ public class XWorkingBranch extends GenericXWidget implements IArtifactWidget, I lockBranchButton.setEnabled(enablement.isDeleteBranchButtonEnabled()); } - public static boolean isPurgeBranchButtonEnabled(TeamWorkFlowArtifact teamArt) throws OseeCoreException { - return AtsClientService.get().getBranchService().isWorkingBranchInWork(teamArt); - } - @Override public void dispose() { OseeEventManager.removeListener(this); diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/commit/XCommitLabelProvider.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/commit/XCommitLabelProvider.java index ca0a3749bff..f98bd2e07d0 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/commit/XCommitLabelProvider.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/commit/XCommitLabelProvider.java @@ -259,8 +259,4 @@ public class XCommitLabelProvider extends XViewerLabelProvider { // do nothing } - public CommitXManager getTreeViewer() { - return commitXManager; - } - } diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/commit/XCommitManager.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/commit/XCommitManager.java index 7f8813786a4..1facb9e95e6 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/commit/XCommitManager.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/commit/XCommitManager.java @@ -15,14 +15,12 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; import java.util.HashMap; -import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.logging.Level; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.jface.dialogs.MessageDialog; -import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.osee.ats.api.data.AtsArtifactTypes; import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; import org.eclipse.osee.ats.core.client.util.AtsUtilClient; @@ -269,23 +267,6 @@ public class XCommitManager extends GenericXWidget implements IArtifactWidget, I } } - @SuppressWarnings("rawtypes") - public List<Branch> getSelectedBranches() { - List<Branch> items = new ArrayList<>(); - if (xCommitManager == null) { - return items; - } - if (xCommitManager.getSelection().isEmpty()) { - return items; - } - Iterator i = ((IStructuredSelection) xCommitManager.getSelection()).iterator(); - while (i.hasNext()) { - Object obj = i.next(); - items.add((Branch) obj); - } - return items; - } - @Override public Control getControl() { if (xCommitManager == null) { @@ -364,10 +345,6 @@ public class XCommitManager extends GenericXWidget implements IArtifactWidget, I return editor; } - public void setEditor(IDirtiableEditor editor) { - this.editor = editor; - } - @Override public void setArtifact(Artifact artifact) throws OseeCoreException { if (!artifact.isOfType(AtsArtifactTypes.TeamWorkflow)) { diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/defect/DefectLabelProvider.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/defect/DefectLabelProvider.java index 794f0b9bc6f..8d0185839c3 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/defect/DefectLabelProvider.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/defect/DefectLabelProvider.java @@ -115,7 +115,4 @@ public class DefectLabelProvider extends XViewerLabelProvider { // do nothing } - public DefectXViewer getTreeViewer() { - return xViewer; - } } diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/defect/DefectXViewer.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/defect/DefectXViewer.java index 030ce7d68f0..97d88c9c8ba 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/defect/DefectXViewer.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/defect/DefectXViewer.java @@ -133,10 +133,6 @@ public class DefectXViewer extends XViewer { mm.insertBefore(MENU_GROUP_PRE, new Separator()); } - public Collection<ReviewDefectItem> getLoadedDefectItems() { - return ((DefectContentProvider) getContentProvider()).getRootSet(); - } - public void add(Collection<ReviewDefectItem> defectItems) { if ((DefectContentProvider) getContentProvider() != null) { ((DefectContentProvider) getContentProvider()).add(defectItems); diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/defect/NewDefectDialog.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/defect/NewDefectDialog.java index 569c00ccbcc..af478ad40f7 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/defect/NewDefectDialog.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/defect/NewDefectDialog.java @@ -117,17 +117,6 @@ public class NewDefectDialog extends EntryDialog { return entryText2; } - public void setEntry2(String entry2) { - if (text2 != null) { - text2.set(entry2); - } - this.entryText2 = entry2; - } - - public void setOkListener(Listener okListener) { - this.okListener = okListener; - } - @Override protected void buttonPressed(int buttonId) { super.buttonPressed(buttonId); diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/AITreeContentProvider.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/AITreeContentProvider.java index f32aeee57ac..24be92f799e 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/AITreeContentProvider.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/AITreeContentProvider.java @@ -83,10 +83,6 @@ public class AITreeContentProvider implements ITreeContentProvider { // do nothing } - public boolean isShowChildren() { - return showChildren; - } - public void setShowChildren(boolean showChildren) { this.showChildren = showChildren; } diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/ActionActionableItemListDialog.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/ActionActionableItemListDialog.java index 2f8d4c3f7bc..a7154957c9f 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/ActionActionableItemListDialog.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/ActionActionableItemListDialog.java @@ -88,40 +88,4 @@ public class ActionActionableItemListDialog extends FilteredCheckboxTreeDialog { return container; } - public boolean isShowFinished() { - return showFinished; - } - - public boolean isShowAction() { - return showAction; - } - - /** - * @return the recurseChildren - */ - public boolean isRecurseChildren() { - return recurseChildren; - } - - /** - * @param recurseChildren the recurseChildren to set - */ - public void setRecurseChildren(boolean recurseChildren) { - this.recurseChildren = recurseChildren; - } - - /** - * @param showFinished the showFinished to set - */ - public void setShowFinished(boolean showFinished) { - this.showFinished = showFinished; - } - - /** - * @param showAction the showAction to set - */ - public void setShowAction(boolean showAction) { - this.showAction = showAction; - } - } diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/ActionableItemTreeWithChildrenDialog.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/ActionableItemTreeWithChildrenDialog.java index 7cddd894944..45a9fb343a9 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/ActionableItemTreeWithChildrenDialog.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/ActionableItemTreeWithChildrenDialog.java @@ -86,12 +86,4 @@ public class ActionableItemTreeWithChildrenDialog extends FilteredCheckboxTreeDi return container; } - public boolean isRecurseChildren() { - return recurseChildren; - } - - public void setRecurseChildren(boolean recurseChildren) { - this.recurseChildren = recurseChildren; - } - } diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/TeamDefinitionTreeContentProvider.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/TeamDefinitionTreeContentProvider.java index 3f36ddb75ad..d98a000461e 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/TeamDefinitionTreeContentProvider.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/TeamDefinitionTreeContentProvider.java @@ -25,11 +25,6 @@ public class TeamDefinitionTreeContentProvider implements ITreeContentProvider { private final Active active; - public TeamDefinitionTreeContentProvider() { - super(); - this.active = null; - } - public TeamDefinitionTreeContentProvider(Active active) { super(); this.active = active; diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/TeamDefinitionTreeDialog.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/TeamDefinitionTreeDialog.java deleted file mode 100644 index f68ffe475ce..00000000000 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/TeamDefinitionTreeDialog.java +++ /dev/null @@ -1,90 +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.util.widgets.dialog; - -import org.eclipse.osee.framework.core.enums.Active; -import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; -import org.eclipse.osee.framework.ui.skynet.widgets.XCheckBox; -import org.eclipse.swt.events.SelectionAdapter; -import org.eclipse.swt.events.SelectionEvent; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Control; - -/** - * @author Donald G. Dunne - */ -public class TeamDefinitionTreeDialog extends TeamDefinitionTreeWithChildrenDialog { - - XCheckBox showFinishedCheck = new XCheckBox("Show Completed and Cancelled Workflows"); - Boolean showFinished = false; - XCheckBox showActionCheck = new XCheckBox("Show Action instead of Workflows"); - Boolean showAction = false; - - public TeamDefinitionTreeDialog(Active active) throws OseeCoreException { - super(active); - } - - @Override - protected Control createDialogArea(Composite container) { - - Control control = super.createDialogArea(container); - - if (showFinished != null) { - showFinishedCheck.createWidgets(dialogComp, 2); - showFinishedCheck.set(showFinished); - showFinishedCheck.addSelectionListener(new SelectionAdapter() { - - @Override - public void widgetSelected(SelectionEvent e) { - showFinished = showFinishedCheck.isSelected(); - }; - }); - } - - if (showAction != null) { - showActionCheck.createWidgets(dialogComp, 2); - showActionCheck.set(showAction); - showActionCheck.addSelectionListener(new SelectionAdapter() { - - @Override - public void widgetSelected(SelectionEvent e) { - showAction = showActionCheck.isSelected(); - }; - }); - } - - return control; - } - - public Boolean isShowFinished() { - return showFinished; - } - - public Boolean isShowAction() { - return showAction; - } - - /** - * @param showFinished true/false default for showAction checkbox; null to not display showAction checkbox - */ - public void setShowFinished(Boolean showFinished) { - this.showFinished = showFinished; - } - - /** - * @param showAction true/false default for showAction checkbox; null to not display showAction checkbox - */ - public void setShowAction(Boolean showAction) { - this.showAction = showAction; - } - -} diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/TeamDefinitionTreeWithChildrenDialog.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/TeamDefinitionTreeWithChildrenDialog.java index 6a04c14ed07..da438e05e3e 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/TeamDefinitionTreeWithChildrenDialog.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/TeamDefinitionTreeWithChildrenDialog.java @@ -84,12 +84,4 @@ public class TeamDefinitionTreeWithChildrenDialog extends FilteredCheckboxTreeDi return container; } - public boolean isRecurseChildren() { - return recurseChildren; - } - - public void setRecurseChildren(boolean recurseChildren) { - this.recurseChildren = recurseChildren; - } - } diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/TeamVersionListDialog.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/TeamVersionListDialog.java index 4dc500b87cc..ca1ceb82216 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/TeamVersionListDialog.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/TeamVersionListDialog.java @@ -54,14 +54,6 @@ public class TeamVersionListDialog extends SelectionDialog { setMessage("Select Version"); } - public TeamVersionListDialog(IAtsTeamDefinition teamDef, Active active) { - super(Displays.getActiveShell()); - this.teamDef = teamDef; - this.active = active; - setTitle("Select Version"); - setMessage("Select Version"); - } - @Override protected Control createDialogArea(Composite container) { diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/role/UserRoleLabelProvider.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/role/UserRoleLabelProvider.java index 4ec4c84fe2f..7c1ad726e73 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/role/UserRoleLabelProvider.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/role/UserRoleLabelProvider.java @@ -116,8 +116,4 @@ public class UserRoleLabelProvider extends XViewerLabelProvider { // do nothing } - public UserRoleXViewer getTreeViewer() { - return xViewer; - } - } diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/role/UserRoleXViewer.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/role/UserRoleXViewer.java index a29c76e56e1..468d186d7fb 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/role/UserRoleXViewer.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/role/UserRoleXViewer.java @@ -90,10 +90,6 @@ public class UserRoleXViewer extends XViewer { mm.insertBefore(MENU_GROUP_PRE, new Separator()); } - public Collection<UserRole> getLoadedUserRoleItems() { - return ((UserRoleContentProvider) getContentProvider()).getRootSet(); - } - public void add(Collection<UserRole> userRoles) { ((UserRoleContentProvider) getContentProvider()).add(userRoles); } @@ -118,17 +114,6 @@ public class UserRoleXViewer extends XViewer { getLabelProvider().dispose(); } - public List<UserRole> getSelectedUserRoleItems() { - List<UserRole> arts = new ArrayList<>(); - TreeItem items[] = getTree().getSelection(); - if (items.length > 0) { - for (TreeItem item : items) { - arts.add((UserRole) item.getData()); - } - } - return arts; - } - @Override public void handleColumnMultiEdit(TreeColumn treeColumn, Collection<TreeItem> treeItems) { if (!xUserRoleViewer.isEditable()) { @@ -166,8 +151,8 @@ public class UserRoleXViewer extends XViewer { if (aCol.equals(UserRoleXViewerFactory.Completed_Col) || aCol.equals( UserRoleXViewerFactory.Hours_Spent_Col) || aCol.equals(UserRoleXViewerFactory.Num_Minor_Col) || aCol.equals( UserRoleXViewerFactory.Num_Major_Col) || aCol.equals( - UserRoleXViewerFactory.Num_Issues_Col) || aCol.equals(UserRoleXViewerFactory.User_Col) || aCol.equals( - UserRoleXViewerFactory.Role_Col)) { + UserRoleXViewerFactory.Num_Issues_Col) || aCol.equals( + UserRoleXViewerFactory.User_Col) || aCol.equals(UserRoleXViewerFactory.Role_Col)) { promptChangeDate(aCol, userRoles, false); } else { throw new OseeStateException("Unhandled user role column"); diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/role/XUserRoleViewer.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/role/XUserRoleViewer.java index ddc33be359a..ec25f39139c 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/role/XUserRoleViewer.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/role/XUserRoleViewer.java @@ -447,13 +447,6 @@ public class XUserRoleViewer extends GenericXWidget implements IArtifactWidget, return html.toString(); } - /** - * @return Returns the xViewer. - */ - public UserRoleXViewer getXViewer() { - return xViewer; - } - @Override public Object getData() { return xViewer.getInput(); @@ -463,10 +456,6 @@ public class XUserRoleViewer extends GenericXWidget implements IArtifactWidget, return editor; } - public void setEditor(IDirtiableEditor editor) { - this.editor = editor; - } - public PeerToPeerReviewArtifact getReviewArt() { return reviewArt; } diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/xviewer/column/AtsAttributeColumnUtility.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/xviewer/column/AtsAttributeColumnUtility.java index e10911aded0..f213d66390c 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/xviewer/column/AtsAttributeColumnUtility.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/xviewer/column/AtsAttributeColumnUtility.java @@ -24,7 +24,6 @@ import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.skynet.core.attribute.AttributeTypeManager; import org.eclipse.osee.framework.ui.skynet.widgets.xviewer.skynet.column.IAttributeColumn; -import org.eclipse.swt.widgets.TreeColumn; /** * @author Donald G. Dunne @@ -66,14 +65,10 @@ public class AtsAttributeColumnUtility { return false; } - public static boolean isPersistViewer(TreeColumn treeColumn) { - return isPersistViewer((XViewer) ((XViewerColumn) treeColumn.getData()).getXViewer()); - } - public static boolean isPersistViewer(XViewer xViewer) { return xViewer != null && // - xViewer instanceof IPersistAltLeftClickProvider // - && ((IPersistAltLeftClickProvider) xViewer).isAltLeftClickPersist(); + xViewer instanceof IPersistAltLeftClickProvider // + && ((IPersistAltLeftClickProvider) xViewer).isAltLeftClickPersist(); } } diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/xviewer/column/XViewerAtsAttributeColumn.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/xviewer/column/XViewerAtsAttributeColumn.java index 334bdf32f11..a0da88b2f78 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/xviewer/column/XViewerAtsAttributeColumn.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/xviewer/column/XViewerAtsAttributeColumn.java @@ -55,11 +55,6 @@ public class XViewerAtsAttributeColumn extends XViewerAtsColumn implements IAttr this.attributeType = attributeType; } - public XViewerAtsAttributeColumn(IAttributeType attributeType, int width, XViewerAlign align, boolean show, SortDataType sortDataType, boolean multiColumnEditable, String description) { - this(attributeType, generateId(attributeType.getUnqualifiedName()), attributeType.getUnqualifiedName(), width, - align, show, sortDataType, multiColumnEditable, description); - } - private static final String generateId(String unqualifiedName) { return WorldXViewerFactory.COLUMN_NAMESPACE + "." + unqualifiedName.replaceAll(" ", "").toLowerCase(); } diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/xviewer/column/XViewerIColumnAdapter.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/xviewer/column/XViewerIColumnAdapter.java deleted file mode 100644 index e36cdd63b76..00000000000 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/xviewer/column/XViewerIColumnAdapter.java +++ /dev/null @@ -1,27 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2013 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.util.xviewer.column; - -import org.eclipse.nebula.widgets.xviewer.core.model.XViewerAlign; -import org.eclipse.nebula.widgets.xviewer.core.model.SortDataType; -import org.eclipse.nebula.widgets.xviewer.core.model.XViewerColumn; -import org.eclipse.osee.ats.api.util.IColumn; - -/** - * @author Donald G. Dunne - */ -public class XViewerIColumnAdapter extends XViewerColumn { - - public XViewerIColumnAdapter(IColumn column) { - super(column.getId(), column.getName(), 80, XViewerAlign.Left, true, - SortDataType.valueOf(column.getDataType().name()), false, column.getDescription()); - } -} diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/xviewer/column/XViewerSmaCompletedDateColumn.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/xviewer/column/XViewerSmaCompletedDateColumn.java index c9f83f98f95..3346e6b106c 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/xviewer/column/XViewerSmaCompletedDateColumn.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/xviewer/column/XViewerSmaCompletedDateColumn.java @@ -11,8 +11,8 @@ package org.eclipse.osee.ats.util.xviewer.column; import org.eclipse.nebula.widgets.xviewer.XViewerValueColumn; -import org.eclipse.nebula.widgets.xviewer.core.model.XViewerAlign; import org.eclipse.nebula.widgets.xviewer.core.model.SortDataType; +import org.eclipse.nebula.widgets.xviewer.core.model.XViewerAlign; import org.eclipse.nebula.widgets.xviewer.core.model.XViewerColumn; import org.eclipse.nebula.widgets.xviewer.util.XViewerException; import org.eclipse.osee.ats.core.client.workflow.AbstractWorkflowArtifact; @@ -25,10 +25,6 @@ import org.eclipse.osee.framework.jdk.core.util.DateUtil; */ public class XViewerSmaCompletedDateColumn extends XViewerValueColumn { - public XViewerSmaCompletedDateColumn() { - this("Completed"); - } - public XViewerSmaCompletedDateColumn(String name) { super(WorldXViewerFactory.COLUMN_NAMESPACE + "completeDate", name, 80, XViewerAlign.Left, true, SortDataType.Date, false, "Date this workflow transitioned to the Completed state."); diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/version/GenerateFullVersionReportItem.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/version/GenerateFullVersionReportItem.java index 1e5aa27265c..e67c4585cb6 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/version/GenerateFullVersionReportItem.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/version/GenerateFullVersionReportItem.java @@ -48,11 +48,6 @@ public class GenerateFullVersionReportItem extends XNavigateItemAction { this.teamDef = null; } - public GenerateFullVersionReportItem(XNavigateItem parent, IAtsTeamDefinition teamDef) { - super(parent, "Generate Full Version Report", FrameworkImage.VERSION); - this.teamDef = teamDef; - } - @Override public void run(TableLoadOption... tableLoadOptions) { IAtsTeamDefinition teamDef = getTeamDefinition(); diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/version/VersionMetrics.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/version/VersionMetrics.java index e1ae1c75691..56602762753 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/version/VersionMetrics.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/version/VersionMetrics.java @@ -134,8 +134,4 @@ public class VersionMetrics { return verArt; } - public VersionTeamMetrics getVerTeamMet() { - return verTeamMet; - } - } diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/version/VersionTeamMetrics.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/version/VersionTeamMetrics.java index 9ad33f6c0a8..a08ce9c74d9 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/version/VersionTeamMetrics.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/version/VersionTeamMetrics.java @@ -95,31 +95,8 @@ public class VersionTeamMetrics { } } - /** - * @return the verTeamDef - */ - public IAtsTeamDefinition getVerTeamDef() { - return verTeamDef; - } - - /** - * @return the releasedOrderedVersions - */ public List<VersionMetrics> getReleasedOrderedVersions() { return releasedOrderedVersions; } - /** - * @return the verMets - */ - public Set<VersionMetrics> getVerMets() { - return verMets; - } - - /** - * @return the relDateToVerMet - */ - public Map<Date, VersionMetrics> getRelDateToVerMet() { - return relDateToVerMet; - } } diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/walker/ActionWalkerContentProvider.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/walker/ActionWalkerContentProvider.java index 9ee49804e87..74db639a873 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/walker/ActionWalkerContentProvider.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/walker/ActionWalkerContentProvider.java @@ -129,10 +129,6 @@ public class ActionWalkerContentProvider implements IGraphEntityContentProvider return new Object[] {}; } - public double getWeight(Object entity1, Object entity2) { - return 0; - } - @Override public void dispose() { // do nothing diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/walker/ActionWalkerView.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/walker/ActionWalkerView.java index 5cb4c2844bf..699799b629f 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/walker/ActionWalkerView.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/walker/ActionWalkerView.java @@ -246,10 +246,6 @@ public class ActionWalkerView extends GenericViewPart implements IPartListener, } } - public void processWindowDeActivated(IWorkbenchPart part) { - processWindowActivated(); - } - @Override public void partActivated(IWorkbenchPart part) { processWindowActivated(); @@ -309,7 +305,7 @@ public class ActionWalkerView extends GenericViewPart implements IPartListener, } if (artifactEvent.isModifiedReloaded(activeAwa) || // - artifactEvent.isRelAddedChangedDeleted(activeAwa)) { + artifactEvent.isRelAddedChangedDeleted(activeAwa)) { Displays.ensureInDisplayThread(new Runnable() { @Override public void run() { @@ -404,10 +400,6 @@ public class ActionWalkerView extends GenericViewPart implements IPartListener, this.activeGraphItem = activeGraphItem; } - public IActionWalkerItem getActiveGraphItem() { - return activeGraphItem; - } - public AbstractWorkflowArtifact getActiveAwa() { return activeAwa; } diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/walker/GoalMemberWrapper.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/walker/GoalMemberWrapper.java index 743c39bb442..ca557345c99 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/walker/GoalMemberWrapper.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/walker/GoalMemberWrapper.java @@ -92,8 +92,4 @@ public class GoalMemberWrapper implements IActionWalkerItem { } } - public GoalArtifact getGoal() { - return goal; - } - } diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/walker/ReviewWrapper.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/walker/ReviewWrapper.java index 9c7eae67ced..6dd1b61ed11 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/walker/ReviewWrapper.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/walker/ReviewWrapper.java @@ -93,8 +93,4 @@ public class ReviewWrapper implements IActionWalkerItem { } } - public TeamWorkFlowArtifact getTeamArt() { - return teamArt; - } - } diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/walker/TaskWrapper.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/walker/TaskWrapper.java index b221f26b358..8c52e973504 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/walker/TaskWrapper.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/walker/TaskWrapper.java @@ -91,8 +91,4 @@ public class TaskWrapper implements IActionWalkerItem { } } - public TeamWorkFlowArtifact getTeamArt() { - return teamArt; - } - } diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workdef/AtsWorkDefinitionSheetProviders.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workdef/AtsWorkDefinitionSheetProviders.java index 7b1354f1014..7f89de6adaa 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workdef/AtsWorkDefinitionSheetProviders.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workdef/AtsWorkDefinitionSheetProviders.java @@ -44,7 +44,6 @@ import org.eclipse.osee.framework.skynet.core.OseeSystemArtifacts; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.skynet.core.artifact.ArtifactTypeManager; import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery; -import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction; import org.osgi.framework.Bundle; /** @@ -57,7 +56,7 @@ public final class AtsWorkDefinitionSheetProviders { private static List<String> allValidStateNames = null; private AtsWorkDefinitionSheetProviders() { - // private constructor + // Utility Class } public static void initializeDatabase(XResultData resultData) throws OseeCoreException { @@ -110,22 +109,6 @@ public final class AtsWorkDefinitionSheetProviders { return allValidStateNames; } - public static void updateStateNameArtifact(Set<String> stateNames, Artifact folder, SkynetTransaction trans) throws OseeCoreException { - Artifact stateNameArt = ArtifactQuery.getArtifactFromToken( - org.eclipse.osee.ats.api.data.AtsArtifactToken.WorkDef_State_Names, AtsUtilCore.getAtsBranch()); - Collection<? extends String> currentStateNames = getAllValidStateNames(); - Set<String> newStateNames = new HashSet<>(); - newStateNames.addAll(currentStateNames); - for (String name : stateNames) { - if (!currentStateNames.contains(name)) { - newStateNames.add(name); - } - } - stateNameArt.setSoleAttributeValue(CoreAttributeTypes.GeneralStringData, - org.eclipse.osee.framework.jdk.core.util.Collections.toString(",", stateNames)); - trans.addArtifact(stateNameArt); - } - private static Artifact createStateNameArtifact(Set<String> stateNames, Artifact folder, IAtsChangeSet changes) throws OseeCoreException { Artifact stateNameArt = ArtifactTypeManager.addArtifact( org.eclipse.osee.ats.api.data.AtsArtifactToken.WorkDef_State_Names, AtsUtilCore.getAtsBranch()); diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workdef/StateXWidgetPage.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workdef/StateXWidgetPage.java index b07ec8b1415..f59f777cd57 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workdef/StateXWidgetPage.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workdef/StateXWidgetPage.java @@ -60,12 +60,11 @@ import org.eclipse.osee.framework.ui.skynet.widgets.util.XWidgetRendererItem; import org.eclipse.swt.widgets.Composite; import org.eclipse.ui.forms.IManagedForm; import org.eclipse.ui.forms.widgets.FormToolkit; -import org.w3c.dom.Element; /** * Instantiation of a StateXWidgetPage for a given StateDefinition to provide for automatic creation and management of * the XWidgets - * + * * @author Donald G. Dunne */ public class StateXWidgetPage implements IDynamicWidgetLayoutListener, IStateToken { @@ -109,22 +108,6 @@ public class StateXWidgetPage implements IDynamicWidgetLayoutListener, IStateTok dynamicXWidgetLayout.setLayoutDatas(datas); } - public StateXWidgetPage(List<XWidgetRendererItem> datas, IXWidgetOptionResolver optionResolver, IDynamicWidgetLayoutListener dynamicWidgetLayoutListener) { - this(null, null, datas, optionResolver, dynamicWidgetLayoutListener); - } - - public StateXWidgetPage(List<XWidgetRendererItem> datas, IXWidgetOptionResolver optionResolver) { - this(null, null, datas, optionResolver, null); - } - - public StateXWidgetPage(String xWidgetsXml, IXWidgetOptionResolver optionResolver) { - this(null, null, xWidgetsXml, optionResolver, null); - } - - public StateXWidgetPage(IXWidgetOptionResolver optionResolver) { - this(null, null, (String) null, optionResolver, null); - } - @Override public void widgetCreated(XWidget xWidget, FormToolkit toolkit, Artifact art, SwtXWidgetRenderer dynamicXWidgetLayout, XModifiedListener xModListener, boolean isEditable) throws OseeCoreException { widgetCreated(xWidget, toolkit, art, stateDefinition, xModListener, isEditable); @@ -158,28 +141,6 @@ public class StateXWidgetPage implements IDynamicWidgetLayoutListener, IStateTok return dynamicXWidgetLayout; } - public Pair<IStatus, XWidget> isPageComplete() { - try { - for (XWidgetRendererItem layoutData : dynamicXWidgetLayout.getLayoutDatas()) { - if (!layoutData.getXWidget().isValid().isOK()) { - // Check to see if widget is part of a completed OR or XOR group - if (!dynamicXWidgetLayout.isOrGroupFromAttrNameComplete( - layoutData.getStoreName()) && !dynamicXWidgetLayout.isXOrGroupFromAttrNameComplete( - layoutData.getStoreName())) { - return new Pair<IStatus, XWidget>(layoutData.getXWidget().isValid(), layoutData.getXWidget()); - } - } - } - } catch (OseeCoreException ex) { - OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex); - } - return OK_PAIR; - } - - public String getHtml(String backgroundColor) throws OseeCoreException { - return getHtml(backgroundColor, "", ""); - } - public String getHtml(String backgroundColor, String preHtml, String postHtml) throws OseeCoreException { StringBuffer sb = new StringBuffer(); sb.append(AHTML.startBorderTable(100, backgroundColor, getName())); @@ -232,10 +193,6 @@ public class StateXWidgetPage implements IDynamicWidgetLayoutListener, IStateTok dynamicXWidgetLayout.processlayoutDatas(xWidgetXml); } - protected void processLayoutDatas(Element element) throws OseeCoreException { - dynamicXWidgetLayout.processLayoutDatas(element); - } - @Override public String getName() { return stateDefinition.getName(); @@ -246,14 +203,6 @@ public class StateXWidgetPage implements IDynamicWidgetLayoutListener, IStateTok return stateDefinition.getStateType(); } - public String getFullName() { - return stateDefinition.getFullName(); - } - - public List<IAtsStateDefinition> getToPages() { - return stateDefinition.getToStates(); - } - public IAtsStateDefinition getDefaultToPage() { if (stateDefinition.getDefaultToState() != null) { return stateDefinition.getDefaultToState(); @@ -265,10 +214,6 @@ public class StateXWidgetPage implements IDynamicWidgetLayoutListener, IStateTok return stateDefinition; } - public IAtsWorkDefinition getWorkDefinition() { - return workDefinition; - } - public SwtXWidgetRenderer getDynamicXWidgetLayout() { return dynamicXWidgetLayout; } @@ -287,10 +232,6 @@ public class StateXWidgetPage implements IDynamicWidgetLayoutListener, IStateTok return sma; } - public void setsma(AbstractWorkflowArtifact sma) { - this.sma = sma; - } - public boolean isCurrentState(AbstractWorkflowArtifact sma) { return sma.isInState(this); } diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workdef/provider/AtsWorkDefinitionImporter.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workdef/provider/AtsWorkDefinitionImporter.java index f2d100dfb0c..7056e55653b 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workdef/provider/AtsWorkDefinitionImporter.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workdef/provider/AtsWorkDefinitionImporter.java @@ -27,7 +27,6 @@ import org.eclipse.osee.ats.dsl.atsDsl.WorkDef; import org.eclipse.osee.ats.internal.Activator; import org.eclipse.osee.ats.internal.AtsClientService; import org.eclipse.osee.ats.workdef.AtsDslUtil; -import org.eclipse.osee.ats.workdef.config.ImportAIsAndTeamDefinitionsToDb; import org.eclipse.osee.framework.core.data.IArtifactToken; import org.eclipse.osee.framework.core.exception.ArtifactDoesNotExist; import org.eclipse.osee.framework.core.exception.OseeWrappedException; @@ -58,13 +57,6 @@ public class AtsWorkDefinitionImporter { return provider; } - public void importAIsAndTeamsToDb(WorkDefinitionSheet sheet, IAtsChangeSet changes) throws OseeCoreException { - String modelName = sheet.getFile().getName(); - AtsDsl atsDsl = AtsDslUtil.getFromSheet(modelName, sheet); - ImportAIsAndTeamDefinitionsToDb importer = new ImportAIsAndTeamDefinitionsToDb(modelName, atsDsl, changes); - importer.execute(); - } - /** * If sheet has WorkDef defined, create artifact and import string. Return artifact, else return null. */ diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workdef/viewer/AtsWorkDefConfigEditorPaletteFactory.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workdef/viewer/AtsWorkDefConfigEditorPaletteFactory.java index 7f532a6b3d7..e94aecff56f 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workdef/viewer/AtsWorkDefConfigEditorPaletteFactory.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workdef/viewer/AtsWorkDefConfigEditorPaletteFactory.java @@ -19,7 +19,7 @@ import org.eclipse.gef.palette.ToolEntry; /** * Utility class that can create a GEF Palette. - * + * * @see #createPalette() * @author Donald G. Dunne */ @@ -28,7 +28,7 @@ final class AtsWorkDefConfigEditorPaletteFactory { /** * Creates the PaletteRoot and adds all palette elements. Use this factory method to create a new palette for your * graphical editor. - * + * * @return a new PaletteRoot */ static PaletteRoot createPalette(AtsWorkDefConfigEditor editor) { @@ -51,7 +51,6 @@ final class AtsWorkDefConfigEditorPaletteFactory { return toolbar; } - /** Utility class. */ private AtsWorkDefConfigEditorPaletteFactory() { // Utility class } diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/AtsXWidgetActionFormPage.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/AtsXWidgetActionFormPage.java new file mode 100644 index 00000000000..4d4de9ba923 --- /dev/null +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/AtsXWidgetActionFormPage.java @@ -0,0 +1,215 @@ +/******************************************************************************* + * 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; + +import java.util.List; +import org.eclipse.jface.action.IToolBarManager; +import org.eclipse.osee.ats.internal.Activator; +import org.eclipse.osee.framework.core.util.Result; +import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; +import org.eclipse.osee.framework.jdk.core.util.Strings; +import org.eclipse.osee.framework.logging.OseeLevel; +import org.eclipse.osee.framework.logging.OseeLog; +import org.eclipse.osee.framework.ui.skynet.XFormToolkit; +import org.eclipse.osee.framework.ui.skynet.XWidgetParser; +import org.eclipse.osee.framework.ui.skynet.artifact.editor.parts.AttributeFormPart; +import org.eclipse.osee.framework.ui.skynet.util.FormsUtil; +import org.eclipse.osee.framework.ui.skynet.widgets.util.DefaultXWidgetOptionResolver; +import org.eclipse.osee.framework.ui.skynet.widgets.util.IDynamicWidgetLayoutListener; +import org.eclipse.osee.framework.ui.skynet.widgets.util.IXWidgetOptionResolver; +import org.eclipse.osee.framework.ui.skynet.widgets.util.SwtXWidgetRenderer; +import org.eclipse.osee.framework.ui.skynet.widgets.util.XWidgetRendererItem; +import org.eclipse.osee.framework.ui.swt.ALayout; +import org.eclipse.osee.framework.ui.swt.Displays; +import org.eclipse.osee.framework.ui.swt.FontManager; +import org.eclipse.osee.framework.ui.swt.Widgets; +import org.eclipse.swt.SWT; +import org.eclipse.swt.events.SelectionAdapter; +import org.eclipse.swt.events.SelectionEvent; +import org.eclipse.swt.layout.GridData; +import org.eclipse.swt.widgets.Button; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.ui.forms.IManagedForm; +import org.eclipse.ui.forms.SectionPart; +import org.eclipse.ui.forms.editor.FormEditor; +import org.eclipse.ui.forms.editor.FormPage; +import org.eclipse.ui.forms.widgets.ExpandableComposite; +import org.eclipse.ui.forms.widgets.ScrolledForm; +import org.eclipse.ui.forms.widgets.Section; + +/** + * @author Donald G. Dunne + */ +public abstract class AtsXWidgetActionFormPage extends FormPage { + protected SwtXWidgetRenderer dynamicXWidgetLayout; + protected final XFormToolkit toolkit; + private Composite parametersContainer; + private Section parameterSection; + protected Composite resultsContainer; + protected Section resultsSection; + protected ScrolledForm scrolledForm; + private String title; + private String xWidgetXml; + + public AtsXWidgetActionFormPage(FormEditor editor, String id, String name) { + super(editor, id, name); + this.toolkit = new XFormToolkit(); + } + + public abstract Result isResearchSearchValid() throws OseeCoreException; + + public abstract String getXWidgetsXml() throws OseeCoreException; + + @Override + protected void createFormContent(IManagedForm managedForm) { + scrolledForm = managedForm.getForm(); + FormsUtil.addHeadingGradient(toolkit, scrolledForm, true); + + Composite body = scrolledForm.getBody(); + body.setLayout(ALayout.getZeroMarginLayout(1, true)); + body.setLayoutData(new GridData(SWT.LEFT, SWT.LEFT, false, false)); + + xWidgetXml = getXWidgetsXml(); + try { + if (Strings.isValid(xWidgetXml)) { + managedForm.addPart(new SectionPart(createParametersSection(managedForm, body))); + } + managedForm.addPart(new SectionPart(createResultsSection(body))); + } catch (OseeCoreException ex) { + OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex); + } + + AttributeFormPart.setLabelFonts(body, FontManager.getDefaultLabelFont()); + + createToolBar(); + managedForm.refresh(); + } + + protected void createToolBar(IToolBarManager toolBarManager) { + // provided for subclass implementation + } + + private void createToolBar() { + IToolBarManager toolBarManager = scrolledForm.getToolBarManager(); + createToolBar(toolBarManager); + scrolledForm.updateToolBar(); + } + + public void reflow() { + Displays.ensureInDisplayThread(new Runnable() { + @Override + public void run() { + IManagedForm manager = getManagedForm(); + if (manager != null && Widgets.isAccessible(manager.getForm())) { + getManagedForm().reflow(true); + } + } + }); + } + + private Section createParametersSection(IManagedForm managedForm, Composite body) throws OseeCoreException { + parameterSection = toolkit.createSection(body, ExpandableComposite.TWISTIE); + parameterSection.setText("Parameters"); + parameterSection.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); + + parametersContainer = toolkit.createClientContainer(parameterSection, 1); + parameterSection.setExpanded(true); + + Composite mainComp = toolkit.createComposite(parametersContainer, SWT.NONE); + mainComp.setLayout(ALayout.getZeroMarginLayout(3, false)); + mainComp.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true)); + + createButtonCompositeOnLeft(mainComp); + createSearchParametersOnRight(managedForm, mainComp); + createParametersSectionCompleted(managedForm, mainComp); + + return parameterSection; + } + + public void createSearchParametersOnRight(IManagedForm managedForm, Composite mainComp) throws OseeCoreException { + Composite paramComp = new Composite(mainComp, SWT.NONE); + paramComp.setLayout(ALayout.getZeroMarginLayout(1, false)); + paramComp.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true)); + + List<XWidgetRendererItem> layoutDatas = null; + dynamicXWidgetLayout = new SwtXWidgetRenderer(getDynamicWidgetLayoutListener(), getXWidgetOptionResolver()); + try { + layoutDatas = XWidgetParser.extractWorkAttributes(dynamicXWidgetLayout, xWidgetXml); + if (layoutDatas != null && !layoutDatas.isEmpty()) { + dynamicXWidgetLayout.addWorkLayoutDatas(layoutDatas); + dynamicXWidgetLayout.createBody(managedForm, paramComp, null, null, true); + parametersContainer.layout(); + parametersContainer.getParent().layout(); + } + parameterSection.setExpanded(true); + } catch (Exception ex) { + OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex); + } + } + + public void createButtonCompositeOnLeft(Composite mainComp) { + Composite buttonComp = toolkit.createComposite(mainComp, SWT.NONE); + buttonComp.setLayout(ALayout.getZeroMarginLayout(1, false)); + buttonComp.setLayoutData(new GridData(SWT.NONE, SWT.FILL, false, true)); + + Button runButton = toolkit.createButton(buttonComp, "Search", SWT.PUSH); + GridData gridData = new GridData(SWT.FILL, SWT.BOTTOM, true, true); + runButton.setLayoutData(gridData); + runButton.addSelectionListener(new SelectionAdapter() { + @Override + public void widgetSelected(SelectionEvent e) { + handleSearchButtonPressed(); + } + }); + + buttonComp.layout(); + } + + public IDynamicWidgetLayoutListener getDynamicWidgetLayoutListener() throws OseeCoreException { + return null; + } + + public IXWidgetOptionResolver getXWidgetOptionResolver() { + return new DefaultXWidgetOptionResolver(); + } + + public abstract void handleSearchButtonPressed(); + + /** + * Create extra controls and return title if it changed + */ + public void createParametersSectionCompleted(IManagedForm managedForm, Composite mainComp) { + // do nothing + } + + public void setTableTitle(final String title, final boolean warning) { + this.title = Strings.truncate(title, WorldEditor.TITLE_MAX_LENGTH); + Displays.ensureInDisplayThread(new Runnable() { + @Override + public void run() { + if (Widgets.isAccessible(scrolledForm)) { + scrolledForm.setText(title); + } + }; + }); + } + + public abstract Section createResultsSection(Composite body) throws OseeCoreException; + + public String getCurrentTitleLabel() { + String useTitle = "World Editor"; + if (title != null) { + useTitle = title; + } + return Strings.truncate(useTitle, WorldEditor.TITLE_MAX_LENGTH); + } + +}
\ No newline at end of file diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/IWorldEditorParameterProvider.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/IWorldEditorParameterProvider.java index b315868930c..8ad3ca711c2 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/IWorldEditorParameterProvider.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/IWorldEditorParameterProvider.java @@ -13,7 +13,6 @@ package org.eclipse.osee.ats.world; import org.eclipse.jface.action.IToolBarManager; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; import org.eclipse.osee.framework.ui.skynet.widgets.util.IDynamicWidgetLayoutListener; -import org.eclipse.osee.framework.ui.skynet.widgets.util.XWidgetRendererItem; import org.eclipse.swt.widgets.Composite; import org.eclipse.ui.forms.IManagedForm; @@ -26,8 +25,6 @@ public interface IWorldEditorParameterProvider extends IWorldEditorProvider { public IDynamicWidgetLayoutListener getDynamicWidgetLayoutListener(); - public String[] getWidgetOptions(XWidgetRendererItem xWidgetData); - /** * Create extra controls and return title if it changed */ diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/IWorldEditorProvider.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/IWorldEditorProvider.java index d08a20af017..a613ccdc5a0 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/IWorldEditorProvider.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/IWorldEditorProvider.java @@ -40,6 +40,4 @@ public interface IWorldEditorProvider { Collection<Artifact> performSearch(SearchType searchType); - public TableLoadOption[] getTableLoadOptions() throws OseeCoreException; - } diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldEditor.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldEditor.java index f5f6264dc0f..a4555f21897 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldEditor.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldEditor.java @@ -45,7 +45,6 @@ import org.eclipse.ui.IWorkbenchPage; import org.eclipse.ui.IWorkbenchPart; import org.eclipse.ui.PartInitException; import org.eclipse.ui.forms.editor.FormEditor; -import org.eclipse.ui.part.MultiPageEditorPart; /** * @author Donald G. Dunne @@ -74,16 +73,6 @@ public class WorldEditor extends FormEditor implements IWorldEditor, IDirtiableE }); } - public void closeEditor() { - final MultiPageEditorPart editor = this; - Displays.ensureInDisplayThread(new Runnable() { - @Override - public void run() { - AWorkbench.getActivePage().closeEditor(editor, false); - } - }); - } - public static Collection<WorldEditor> getEditors() { final List<WorldEditor> editors = new ArrayList<>(); Displays.pendInDisplayThread(new Runnable() { @@ -113,10 +102,6 @@ public class WorldEditor extends FormEditor implements IWorldEditor, IDirtiableE return isDirty(); } - public void refreshTitle() { - firePropertyChange(IWorkbenchPart.PROP_TITLE); - } - @Override public void dispose() { if (worldXWidgetActionPage != null && worldXWidgetActionPage.getWorldComposite() != null) { diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldEditorInputFactory.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldEditorInputFactory.java index 56889f2fe28..a1df6a2cc3a 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldEditorInputFactory.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldEditorInputFactory.java @@ -38,12 +38,6 @@ public class WorldEditorInputFactory implements IElementFactory { public final static String ATS_SEARCH_UUID = "org.eclipse.osee.ats.WorldEditorInputFactory.atsSearchUuid"; //$NON-NLS-1$ private static final String ATS_SEARCH_NAMESPACE = "org.eclipse.osee.ats.WorldEditorInputFactory.atsSearchNamespace"; //$NON-NLS-1$; - public WorldEditorInputFactory() { - } - - /* - * @see org.eclipse.ui.IElementFactory#createElement(org.eclipse.ui.IMemento) - */ @Override public IAdaptable createElement(IMemento memento) { long atsSearchUuid = 0L; diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldEditorParameterSearchItem.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldEditorParameterSearchItem.java index f96e40480c9..d6d39853bb6 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldEditorParameterSearchItem.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldEditorParameterSearchItem.java @@ -146,15 +146,6 @@ public abstract class WorldEditorParameterSearchItem extends WorldSearchItem imp this.tableLoadOptions = tableLoadOptions; } - public CustomizeData getCustomizeData() { - return customizeData; - } - - @Override - public TableLoadOption[] getTableLoadOptions() { - return tableLoadOptions; - } - /** * Called in the display thread to allow parameters to be retrieved or other setup prior to searching in background * thread. diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldEditorParameterSearchItemProvider.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldEditorParameterSearchItemProvider.java index da8f9676b36..4f2f36e981f 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldEditorParameterSearchItemProvider.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldEditorParameterSearchItemProvider.java @@ -25,7 +25,6 @@ import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.ui.plugin.util.AWorkbench; import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateComposite.TableLoadOption; import org.eclipse.osee.framework.ui.skynet.widgets.util.IDynamicWidgetLayoutListener; -import org.eclipse.osee.framework.ui.skynet.widgets.util.XWidgetRendererItem; import org.eclipse.swt.widgets.Composite; import org.eclipse.ui.forms.IManagedForm; @@ -115,11 +114,6 @@ public class WorldEditorParameterSearchItemProvider extends WorldEditorProvider return worldParameterSearchItem; } - @Override - public String[] getWidgetOptions(XWidgetRendererItem widgetData) { - return null; - } - /** * Available for actions needing to be done after controls are created */ diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldEditorProvider.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldEditorProvider.java index 2a37086b26e..b8dd75d9c6c 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldEditorProvider.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldEditorProvider.java @@ -59,15 +59,6 @@ public abstract class WorldEditorProvider implements IWorldEditorProvider { } @Override - public TableLoadOption[] getTableLoadOptions() { - return tableLoadOptions; - } - - public CustomizeData getCustomizeData() { - return customizeData; - } - - @Override public void setTableLoadOptions(TableLoadOption... tableLoadOptions) { this.tableLoadOptions = tableLoadOptions; } @@ -207,10 +198,6 @@ public abstract class WorldEditorProvider implements IWorldEditorProvider { } - public boolean isLoading() { - return loading; - } - public void setLoading(final boolean loading) { this.loading = loading; Displays.ensureInDisplayThread(new Runnable() { diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldEditorReloadProvider.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldEditorReloadProvider.java index 4750e58ffcd..8d4a20bc5eb 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldEditorReloadProvider.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldEditorReloadProvider.java @@ -58,10 +58,6 @@ public class WorldEditorReloadProvider extends WorldEditorProvider { return name; } - public Collection<Artifact> getArtifacts() { - return artifacts; - } - public boolean isReload() { return reload; } diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldEditorUISearchItemProvider.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldEditorUISearchItemProvider.java index 98edaa32f93..97022a70a00 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldEditorUISearchItemProvider.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldEditorUISearchItemProvider.java @@ -15,7 +15,6 @@ import org.eclipse.nebula.widgets.xviewer.core.model.CustomizeData; import org.eclipse.osee.ats.api.version.IAtsVersion; 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.WorldSearchItem.SearchType; import org.eclipse.osee.ats.world.search.WorldUISearchItem; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; @@ -31,10 +30,6 @@ public class WorldEditorUISearchItemProvider extends WorldEditorProvider { private final WorldUISearchItem worldUISearchItem; - public WorldEditorUISearchItemProvider(WorldUISearchItem worldUISearchItem) { - this(worldUISearchItem, null, TableLoadOption.None); - } - public WorldEditorUISearchItemProvider(WorldUISearchItem worldUISearchItem, CustomizeData customizeData, TableLoadOption... tableLoadOptions) { super(customizeData, tableLoadOptions); this.worldUISearchItem = worldUISearchItem; @@ -46,13 +41,6 @@ public class WorldEditorUISearchItemProvider extends WorldEditorProvider { tableLoadOptions); } - /** - * @return the worldSearchItem - */ - public WorldSearchItem getWorldSearchItem() { - return worldUISearchItem; - } - @Override public String getName() throws OseeCoreException { return worldUISearchItem.getName(); diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldLabelProvider.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldLabelProvider.java index c54c2f02504..63a1a9d1532 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldLabelProvider.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldLabelProvider.java @@ -147,8 +147,4 @@ public class WorldLabelProvider extends XViewerLabelProvider { // do nothing } - public WorldXViewer getWorldXViewer() { - return worldXViewer; - } - } diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldXViewer.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldXViewer.java index 34b23cf0fc6..3449c3b9520 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldXViewer.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldXViewer.java @@ -25,7 +25,6 @@ import org.eclipse.jface.action.IAction; import org.eclipse.jface.action.MenuManager; import org.eclipse.jface.action.Separator; import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.jface.wizard.WizardDialog; import org.eclipse.nebula.widgets.xviewer.IMultiColumnEditProvider; import org.eclipse.nebula.widgets.xviewer.IXViewerFactory; import org.eclipse.nebula.widgets.xviewer.XViewer; @@ -57,9 +56,7 @@ import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; import org.eclipse.osee.ats.core.client.util.AtsUtilClient; import org.eclipse.osee.ats.core.client.workflow.AbstractWorkflowArtifact; import org.eclipse.osee.ats.core.util.AtsUtilCore; -import org.eclipse.osee.ats.core.workflow.state.TeamState; import org.eclipse.osee.ats.internal.Activator; -import org.eclipse.osee.ats.notify.ArtifactEmailWizard; import org.eclipse.osee.ats.util.AtsUtil; import org.eclipse.osee.ats.util.widgets.XWorldTextFilter; import org.eclipse.osee.ats.util.xviewer.column.XViewerAtsAttributeColumn; @@ -82,7 +79,6 @@ import org.eclipse.osee.framework.ui.skynet.render.PresentationType; import org.eclipse.osee.framework.ui.skynet.render.RendererManager; import org.eclipse.osee.framework.ui.skynet.results.XResultDataUI; import org.eclipse.osee.framework.ui.skynet.widgets.xviewer.skynet.column.IAttributeColumn; -import org.eclipse.osee.framework.ui.swt.Displays; import org.eclipse.osee.framework.ui.swt.IDirtiableEditor; import org.eclipse.swt.SWT; import org.eclipse.swt.events.DisposeEvent; @@ -324,35 +320,6 @@ public class WorldXViewer extends XViewer implements ISelectedAtsArtifacts, IPer return true; } - public void handleEmailSelectedAtsObject() throws OseeCoreException { - Artifact art = getSelectedArtifacts().iterator().next(); - if (art.isOfType(AtsArtifactTypes.Action)) { - if (ActionManager.getTeams(art).size() > 1) { - art = AtsUtil.promptSelectTeamWorkflow(art); - if (art == null) { - return; - } - } else { - art = ActionManager.getFirstTeam(art); - } - } - if (art != null) { - ArtifactEmailWizard ew = new ArtifactEmailWizard((AbstractWorkflowArtifact) art); - WizardDialog dialog = new WizardDialog(Displays.getActiveShell(), ew); - dialog.create(); - dialog.open(); - } - } - - public AbstractWorkflowArtifact getSelectedSMA() { - Object obj = null; - if (getSelectedArtifactItems().isEmpty()) { - return null; - } - obj = getTree().getSelection()[0].getData(); - return obj != null && obj instanceof AbstractWorkflowArtifact ? (AbstractWorkflowArtifact) obj : null; - } - /** * Create Edit menu at top to make easier for users to see and eventually enable menu to get rid of all separate edit * items @@ -496,29 +463,6 @@ public class WorldXViewer extends XViewer implements ISelectedAtsArtifacts, IPer } /** - * @return true if all selected are Workflow OR are Actions with single workflow - */ - public boolean isSelectedTeamWorkflowArtifacts() { - TreeItem items[] = getTree().getSelection(); - if (items.length > 0) { - for (TreeItem item : items) { - if (Artifacts.isOfType(item.getData(), AtsArtifactTypes.Action)) { - try { - if (ActionManager.getTeams(item.getData()).size() != 1) { - return false; - } - } catch (OseeCoreException ex) { - // Do Nothing - } - } else if (!Artifacts.isOfType(item.getData(), AtsArtifactTypes.TeamWorkflow)) { - return false; - } - } - } - return true; - } - - /** * @return all selected Workflow and any workflow that have Actions with single workflow */ @Override @@ -579,28 +523,10 @@ public class WorldXViewer extends XViewer implements ISelectedAtsArtifacts, IPer return actionArts; } - public void setCancelledNotification() { - TreeItem item = getTree().getItem(0); - if (item.getData() instanceof String) { - item.setData(TeamState.Cancelled.getName()); - } - refresh(item.getData()); - } - - /** - * @param title string to be used in reporting - */ public void setReportingTitle(String title) { this.title = title; } - /** - * @return Returns the title. - */ - public String getTitle() { - return title; - } - public List<Artifact> getSelectedArtifactItems() { List<Artifact> arts = new ArrayList<>(); TreeItem items[] = getTree().getSelection(); @@ -617,10 +543,6 @@ public class WorldXViewer extends XViewer implements ISelectedAtsArtifacts, IPer return extendedStatusString; } - public String getExtendedStatusString() { - return extendedStatusString; - } - public void setExtendedStatusString(String extendedStatusString) { this.extendedStatusString = extendedStatusString; updateStatusLabel(); diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldXViewerEventManager.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldXViewerEventManager.java index ebf3e36c62c..5ecfcd77bc7 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldXViewerEventManager.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldXViewerEventManager.java @@ -49,7 +49,7 @@ public class WorldXViewerEventManager { private static final NotificationHandler notificationHandler = new NotificationHandler(); private WorldXViewerEventManager() { - // Static API Class + // Utility Class } public static void add(IWorldViewerEventHandler iWorldEventHandler) { diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/LegacyPCRActionsWorldSearchItem.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/LegacyPCRActionsWorldSearchItem.java index 175b777676c..3f33207446c 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/LegacyPCRActionsWorldSearchItem.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/LegacyPCRActionsWorldSearchItem.java @@ -40,10 +40,6 @@ public class LegacyPCRActionsWorldSearchItem extends WorldUISearchItem { this.returnActions = returnActions; } - public LegacyPCRActionsWorldSearchItem(Collection<IAtsTeamDefinition> teamDefs, boolean returnActions) { - this(null, teamDefs, returnActions); - } - public LegacyPCRActionsWorldSearchItem(LegacyPCRActionsWorldSearchItem legacyPCRActionsWorldSearchItem) { super(legacyPCRActionsWorldSearchItem); this.returnActions = legacyPCRActionsWorldSearchItem.returnActions; diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/MultipleIdSearchData.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/MultipleIdSearchData.java index 44f53bf619c..1faf43cea2b 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/MultipleIdSearchData.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/MultipleIdSearchData.java @@ -23,12 +23,12 @@ import org.eclipse.osee.framework.jdk.core.util.Strings; */ public class MultipleIdSearchData implements IWorldEditorConsumer { private String enteredIds = ""; - private List<String> ids = new ArrayList<>(); + private final List<String> ids = new ArrayList<>(); private boolean includeArtIds; private BranchId branch; private String name; private WorldEditor worldEditor; - private AtsEditor atsEditor; + private final AtsEditor atsEditor; public MultipleIdSearchData(String name, AtsEditor atsEditor) { this.name = name; @@ -90,10 +90,6 @@ public class MultipleIdSearchData implements IWorldEditorConsumer { this.enteredIds = enteredIds; } - public void setIds(List<String> ids) { - this.ids = ids; - } - public void setIncludeArtIds(boolean includeArtIds) { this.includeArtIds = includeArtIds; } @@ -110,8 +106,4 @@ public class MultipleIdSearchData implements IWorldEditorConsumer { return atsEditor; } - public void setAtsEditor(AtsEditor atsEditor) { - this.atsEditor = atsEditor; - } - } diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/MyFavoritesSearchItem.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/MyFavoritesSearchItem.java index b17f27a24d9..aceed84d183 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/MyFavoritesSearchItem.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/MyFavoritesSearchItem.java @@ -23,14 +23,6 @@ import org.eclipse.osee.framework.skynet.core.artifact.Artifact; */ public class MyFavoritesSearchItem extends UserSearchItem { - public MyFavoritesSearchItem(String name) { - this(name, null); - } - - public MyFavoritesSearchItem() { - this("My Favorites", null); - } - public MyFavoritesSearchItem(String name, IAtsUser user) { super(name, user, AtsImage.FAVORITE); } diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/MySubscribedSearchItem.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/MySubscribedSearchItem.java index 08ff9351a1c..1079d7759f3 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/MySubscribedSearchItem.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/MySubscribedSearchItem.java @@ -23,14 +23,6 @@ import org.eclipse.osee.framework.skynet.core.artifact.Artifact; */ public class MySubscribedSearchItem extends UserSearchItem { - public MySubscribedSearchItem(String name) { - this(name, null); - } - - public MySubscribedSearchItem() { - this("My Subscribed", null); - } - public MySubscribedSearchItem(String name, IAtsUser user) { super(name, user, AtsImage.SUBSCRIBED); } diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/MyWorldSearchItem.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/MyWorldSearchItem.java index 1d63bc8b3f9..746ef1d04be 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/MyWorldSearchItem.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/MyWorldSearchItem.java @@ -31,10 +31,6 @@ public class MyWorldSearchItem extends UserSearchItem { this(name, null); } - public MyWorldSearchItem() { - this("My World", null); - } - public MyWorldSearchItem(String name, IAtsUser user) { super(name, user, AtsImage.GLOBE); } diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/NextVersionSearchItem.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/NextVersionSearchItem.java index 0bf38832178..85c53433374 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/NextVersionSearchItem.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/NextVersionSearchItem.java @@ -124,21 +124,11 @@ public class NextVersionSearchItem extends WorldUISearchItem { cancelled = true; } - /** - * @param selectedTeamDef the selectedTeamDef to set - */ - public void setSelectedTeamDef(IAtsTeamDefinition selectedTeamDef) { - this.selectedTeamDef = selectedTeamDef; - } - @Override public WorldUISearchItem copy() { return new NextVersionSearchItem(this); } - /** - * @return the selectedVersionArt - */ public IAtsVersion getSelectedVersionArt() { return selectedVersionArt; } diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/UserSearchItem.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/UserSearchItem.java index b4163473d55..28a9f5a0f68 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/UserSearchItem.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/UserSearchItem.java @@ -66,13 +66,6 @@ public abstract class UserSearchItem extends WorldUISearchItem { return ""; } - public IAtsUser getSearchUser() { - if (user != null) { - return user; - } - return selectedUser; - } - @Override public Collection<Artifact> performSearch(SearchType searchType) throws OseeCoreException { if (isCancelled()) { @@ -118,16 +111,10 @@ public abstract class UserSearchItem extends WorldUISearchItem { cancelled = true; } - /** - * @param selectedUser the selectedUser to set - */ public void setSelectedUser(IAtsUser selectedUser) { this.selectedUser = selectedUser; } - /** - * @return the user - */ public IAtsUser getDefaultUser() { return user; } @@ -176,10 +163,6 @@ public abstract class UserSearchItem extends WorldUISearchItem { return ImageManager.getImage(FrameworkImage.USER); } - public Active getActive() { - return active; - } - public void setActive(Active active) { this.active = active; } diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/UserWorldSearchItem.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/UserWorldSearchItem.java deleted file mode 100644 index a6ed6348c19..00000000000 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/UserWorldSearchItem.java +++ /dev/null @@ -1,144 +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.Collection; -import java.util.HashSet; -import java.util.Set; -import org.eclipse.osee.ats.api.data.AtsAttributeTypes; -import org.eclipse.osee.ats.api.data.AtsRelationTypes; -import org.eclipse.osee.ats.api.team.IAtsTeamDefinition; -import org.eclipse.osee.ats.api.user.IAtsUser; -import org.eclipse.osee.ats.api.version.IAtsVersion; -import org.eclipse.osee.ats.artifact.WorkflowManager; -import org.eclipse.osee.ats.core.client.review.AbstractReviewArtifact; -import org.eclipse.osee.ats.core.client.task.TaskArtifact; -import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; -import org.eclipse.osee.ats.core.client.workflow.AbstractWorkflowArtifact; -import org.eclipse.osee.ats.core.util.AtsUtilCore; -import org.eclipse.osee.ats.internal.AtsClientService; -import org.eclipse.osee.ats.util.AtsUtil; -import org.eclipse.osee.framework.core.enums.QueryOption; -import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; -import org.eclipse.osee.framework.jdk.core.util.Collections; -import org.eclipse.osee.framework.jdk.core.util.Strings; -import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery; - -/** - * @author Donald G. Dunne - */ -public class UserWorldSearchItem { - - private final Collection<IAtsTeamDefinition> teamDefs; - private final Collection<IAtsVersion> versions; - private final Collection<UserSearchOption> options; - private final IAtsUser user; - private final String selectedState; - - public static enum UserSearchOption { - None, - Assignee, - Favorites, - Subscribed, - Originator, - IncludeCompleted, - IncludeCancelled, - IncludeTeamWorkflows, - IncludeReviews, - IncludeTasks - }; - - public UserWorldSearchItem(IAtsUser user, Collection<IAtsTeamDefinition> teamDefs, Collection<IAtsVersion> versions, String selectedState, UserSearchOption... userSearchOption) { - this.user = user; - this.teamDefs = teamDefs; - this.versions = versions; - this.selectedState = selectedState; - this.options = Collections.getAggregate(userSearchOption); - } - - public Collection<AbstractWorkflowArtifact> performSearch() throws OseeCoreException { - Set<AbstractWorkflowArtifact> searchArts = new HashSet<>(); - if (options.contains(UserSearchOption.Originator)) { - searchArts.addAll(getOriginatorArtifacts()); - } else if (options.contains(UserSearchOption.Subscribed)) { - searchArts.addAll(getSubscribedArtifacts()); - } else if (options.contains(UserSearchOption.Favorites)) { - searchArts.addAll(getFavoritesArtifacts()); - } else if (options.contains(UserSearchOption.Assignee)) { - searchArts.addAll(Collections.castMatching(AbstractWorkflowArtifact.class, AtsUtil.getAssigned(user))); - // If include cancelled or completed, need to perform extra search - // Note: Don't need to do this for Originator, Subscribed or Favorites, cause it does completed canceled in it's own searches - if (options.contains(UserSearchOption.IncludeCancelled) || options.contains( - UserSearchOption.IncludeCompleted)) { - searchArts.addAll( - WorkflowManager.getAwas(ArtifactQuery.getArtifactListFromAttribute(AtsAttributeTypes.State, - "<" + user.getUserId() + ">", AtsUtilCore.getAtsBranch(), QueryOption.CONTAINS_MATCH_OPTIONS))); - } - } - - Collection<Class<?>> filterClasses = new ArrayList<>(); - if (!options.contains(UserSearchOption.IncludeReviews)) { - filterClasses.add(AbstractReviewArtifact.class); - } - if (!options.contains(UserSearchOption.IncludeTeamWorkflows)) { - filterClasses.add(TeamWorkFlowArtifact.class); - } - if (!options.contains(UserSearchOption.IncludeTasks)) { - filterClasses.add(TaskArtifact.class); - } - - Collection<AbstractWorkflowArtifact> filteredArts = WorkflowManager.filterOutTypes(searchArts, filterClasses); - - if (teamDefs != null && teamDefs.size() > 0) { - filteredArts = WorkflowManager.getTeamDefinitionWorkflows(filteredArts, teamDefs); - } - - if (versions != null && versions.size() > 0) { - filteredArts = WorkflowManager.getVersionWorkflows(filteredArts, versions); - } - - if (Strings.isValid(selectedState)) { - filteredArts = WorkflowManager.getAwas(WorkflowManager.filterState(selectedState, filteredArts)); - } - - // Handle include completed/cancelled option - if (options.contains(UserSearchOption.IncludeCompleted) && options.contains(UserSearchOption.IncludeCancelled)) { - return filteredArts; - } - - if (!options.contains(UserSearchOption.IncludeCancelled)) { - filteredArts = WorkflowManager.filterOutCancelled(filteredArts); - } - - if (!options.contains(UserSearchOption.IncludeCompleted)) { - filteredArts = WorkflowManager.filterOutCompleted(filteredArts); - } - - return filteredArts; - } - - private Collection<AbstractWorkflowArtifact> getOriginatorArtifacts() throws OseeCoreException { - return Collections.castAll(ArtifactQuery.getArtifactListFromAttribute(AtsAttributeTypes.CreatedBy, - user.getUserId(), AtsUtilCore.getAtsBranch())); - } - - private Collection<AbstractWorkflowArtifact> getSubscribedArtifacts() throws OseeCoreException { - return AtsClientService.get().getUserServiceClient().getOseeUser(user).getRelatedArtifactsOfType( - AtsRelationTypes.SubscribedUser_Artifact, AbstractWorkflowArtifact.class); - } - - private Collection<AbstractWorkflowArtifact> getFavoritesArtifacts() throws OseeCoreException { - return AtsClientService.get().getUserServiceClient().getOseeUser(user).getRelatedArtifactsOfType( - AtsRelationTypes.FavoriteUser_Artifact, AbstractWorkflowArtifact.class); - } - -} diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/VersionTargetedForTeamSearchItem.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/VersionTargetedForTeamSearchItem.java index 65b9678e28b..15e11ea9bf6 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/VersionTargetedForTeamSearchItem.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/VersionTargetedForTeamSearchItem.java @@ -137,13 +137,6 @@ public class VersionTargetedForTeamSearchItem extends WorldUISearchItem { cancelled = true; } - /** - * @param selectedVersionArt the selectedVersionArt to set - */ - public void setSelectedVersionArt(IAtsVersion selectedVersionArt) { - this.selectedVersionArt = selectedVersionArt; - } - @Override public WorldUISearchItem copy() { return new VersionTargetedForTeamSearchItem(this); diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/WorldSearchItem.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/WorldSearchItem.java index 983635b2b22..5ba9a2c42c6 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/WorldSearchItem.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/WorldSearchItem.java @@ -31,7 +31,7 @@ public abstract class WorldSearchItem { protected static final Set<Artifact> EMPTY_SET = new HashSet<>(); protected boolean cancelled = false; private LoadView loadView; - private KeyedImage oseeImage; + private final KeyedImage oseeImage; public static enum LoadView { TaskEditor, WorldEditor, @@ -42,10 +42,6 @@ public abstract class WorldSearchItem { ReSearch }; - public WorldSearchItem(String name, LoadView loadView) { - this(name, loadView, null); - } - public WorldSearchItem(String name, LoadView loadView, boolean cancelled, KeyedImage oseeImage) { super(); this.name = name; @@ -80,10 +76,6 @@ public abstract class WorldSearchItem { return cancelled; } - public void setCancelled(boolean cancelled) { - this.cancelled = cancelled; - } - public LoadView getLoadView() { return loadView; } @@ -110,8 +102,4 @@ public abstract class WorldSearchItem { return oseeImage; } - public void setOseeImage(KeyedImage oseeImage) { - this.oseeImage = oseeImage; - } - } diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/WorldUISearchItem.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/WorldUISearchItem.java index 6daf86fc2b7..0c841432f1d 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/WorldUISearchItem.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/WorldUISearchItem.java @@ -33,10 +33,6 @@ public abstract class WorldUISearchItem extends WorldSearchItem { this(name, LoadView.WorldEditor, oseeImage); } - public WorldUISearchItem(String name, LoadView loadView) { - this(name, loadView, null); - } - public WorldUISearchItem(String name, LoadView loadView, KeyedImage oseeImage) { super(name, loadView, oseeImage); } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/cm/IOseeCmService.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/cm/IOseeCmService.java index ac72fb1dd30..435f9c88ff7 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/cm/IOseeCmService.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/cm/IOseeCmService.java @@ -11,10 +11,7 @@ package org.eclipse.osee.framework.ui.skynet.cm; import java.util.Collection; -import java.util.Date; -import java.util.List; import org.eclipse.osee.framework.core.data.BranchId; -import org.eclipse.osee.framework.core.data.IArtifactType; import org.eclipse.osee.framework.core.data.IOseeBranch; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.ui.swt.KeyedImage; @@ -32,36 +29,16 @@ public interface IOseeCmService { KeyedImage getImage(ImageType imageType); - boolean isCmAdmin(); - - public BranchId getCmBranchToken(); - void openArtifact(Artifact artifact, OseeCmEditor oseeCmEditor); void openArtifact(String guid, OseeCmEditor oseeCmEditor); void openArtifacts(String name, Collection<Artifact> artifacts, OseeCmEditor oseeCmEditor); - void openArtifactsByGuid(String name, List<String> guids, OseeCmEditor oseeCmEditor); - boolean isPcrArtifact(Artifact artifact); - boolean isCompleted(Artifact artifact); - - List<Artifact> getTaskArtifacts(Artifact pcrArtifact); - - KeyedImage getOpenImage(OseeCmEditor oseeCmEditor); - - Artifact createWorkTask(String name, String parentPcrGuid); - - Artifact createPcr(String title, String description, String changeType, String priority, Date needByDate, Collection<String> productNames); - - IArtifactType getPcrArtifactType(); - boolean isBranchesAllCommittedExcept(Artifact art, BranchId branch); - IArtifactType getPcrTaskArtifactType(); - boolean isWorkFlowBranch(BranchId branch); void commitBranch(Artifact art, IOseeBranch branch, boolean isArchiveSource); |