diff options
author | rbrooks | 2010-07-18 04:34:38 +0000 |
---|---|---|
committer | rbrooks | 2010-07-18 04:34:38 +0000 |
commit | 2542a5abd641b895001319a3452d5be72e602d5c (patch) | |
tree | ccd2d3eeaba054df16cb526d2e49d0a5754a1ec5 /plugins/org.eclipse.osee.ats | |
parent | b470062e0d803c38e3443b26c7e9c9240fc5cc9d (diff) | |
download | org.eclipse.osee-2542a5abd641b895001319a3452d5be72e602d5c.tar.gz org.eclipse.osee-2542a5abd641b895001319a3452d5be72e602d5c.tar.xz org.eclipse.osee-2542a5abd641b895001319a3452d5be72e602d5c.zip |
streamline use of renderers to remove redundant code
Diffstat (limited to 'plugins/org.eclipse.osee.ats')
83 files changed, 357 insertions, 357 deletions
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/NewDecisionReviewJob.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/NewDecisionReviewJob.java index 532cb0c3729..9cafffd8812 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/NewDecisionReviewJob.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/NewDecisionReviewJob.java @@ -18,8 +18,8 @@ import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.jobs.Job; import org.eclipse.osee.ats.AtsOpenOption; import org.eclipse.osee.ats.artifact.DecisionReviewArtifact; -import org.eclipse.osee.ats.artifact.TeamWorkFlowArtifact; import org.eclipse.osee.ats.artifact.ReviewSMArtifact.ReviewBlockType; +import org.eclipse.osee.ats.artifact.TeamWorkFlowArtifact; import org.eclipse.osee.ats.internal.AtsPlugin; import org.eclipse.osee.ats.util.AtsUtil; import org.eclipse.osee.ats.util.widgets.ReviewManager; diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/OpenInArtifactEditorAction.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/OpenInArtifactEditorAction.java index 74b931d5ef1..f6d89cb148f 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/OpenInArtifactEditorAction.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/OpenInArtifactEditorAction.java @@ -18,7 +18,8 @@ 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.FrameworkImage; -import org.eclipse.osee.framework.ui.skynet.artifact.editor.ArtifactEditor; +import org.eclipse.osee.framework.ui.skynet.render.PresentationType; +import org.eclipse.osee.framework.ui.skynet.render.RendererManager; import org.eclipse.osee.framework.ui.swt.ImageManager; /** @@ -38,7 +39,7 @@ public class OpenInArtifactEditorAction extends Action { public void run() { try { for (Artifact art : selectedAtsArtifacts.getSelectedSMAArtifacts()) { - ArtifactEditor.editArtifact(art); + RendererManager.open(art, PresentationType.GENERALIZED_EDIT); } } catch (OseeCoreException ex) { OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex); diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/OpenVersionArtifactAction.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/OpenVersionArtifactAction.java index f2aa1727d2e..3da1323b73b 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/OpenVersionArtifactAction.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/OpenVersionArtifactAction.java @@ -18,7 +18,8 @@ import org.eclipse.osee.ats.internal.AtsPlugin; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.ui.skynet.FrameworkImage; -import org.eclipse.osee.framework.ui.skynet.artifact.editor.ArtifactEditor; +import org.eclipse.osee.framework.ui.skynet.render.PresentationType; +import org.eclipse.osee.framework.ui.skynet.render.RendererManager; import org.eclipse.osee.framework.ui.swt.ImageManager; /** @@ -38,7 +39,7 @@ public class OpenVersionArtifactAction extends Action { private void performOpen() { try { if (sma.getWorldViewTargetedVersion() != null) { - ArtifactEditor.editArtifact(sma.getWorldViewTargetedVersion()); + RendererManager.open(sma.getWorldViewTargetedVersion(), PresentationType.GENERALIZED_EDIT); } } catch (OseeCoreException ex) { OseeLog.log(AtsPlugin.class, Level.SEVERE, ex); 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 b55f4b9ee16..918ce6c6db8 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 @@ -23,8 +23,8 @@ import org.eclipse.osee.ats.artifact.ActionArtifact; import org.eclipse.osee.ats.artifact.ActionableItemArtifact; import org.eclipse.osee.ats.internal.AtsPlugin; import org.eclipse.osee.ats.util.ActionManager; -import org.eclipse.osee.ats.util.AtsUtil; import org.eclipse.osee.ats.util.AtsPriority.PriorityType; +import org.eclipse.osee.ats.util.AtsUtil; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction; import org.eclipse.osee.framework.ui.skynet.notify.OseeNotificationManager; diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/ActionArtifact.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/ActionArtifact.java index fe64ff9bcb2..2f6bf420ff9 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/ActionArtifact.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/ActionArtifact.java @@ -26,9 +26,9 @@ import org.eclipse.osee.ats.actions.wizard.IAtsTeamWorkflow; import org.eclipse.osee.ats.artifact.ATSLog.LogType;
import org.eclipse.osee.ats.internal.AtsPlugin;
import org.eclipse.osee.ats.util.AtsArtifactTypes;
+import org.eclipse.osee.ats.util.AtsPriority.PriorityType; import org.eclipse.osee.ats.util.AtsRelationTypes;
import org.eclipse.osee.ats.util.AtsUtil;
-import org.eclipse.osee.ats.util.AtsPriority.PriorityType;
import org.eclipse.osee.ats.util.widgets.dialog.AICheckTreeDialog;
import org.eclipse.osee.ats.world.IWorldViewArtifact;
import org.eclipse.osee.framework.core.data.IArtifactType;
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/ActionableItemArtifact.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/ActionableItemArtifact.java index d22d6b513bd..753546b3afd 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/ActionableItemArtifact.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/ActionableItemArtifact.java @@ -19,9 +19,9 @@ import java.util.Set; import org.eclipse.osee.ats.config.AtsCacheManager;
import org.eclipse.osee.ats.util.AtsArtifactTypes;
import org.eclipse.osee.ats.util.AtsFolderUtil;
+import org.eclipse.osee.ats.util.AtsFolderUtil.AtsFolder; import org.eclipse.osee.ats.util.AtsRelationTypes;
import org.eclipse.osee.ats.util.AtsUtil;
-import org.eclipse.osee.ats.util.AtsFolderUtil.AtsFolder;
import org.eclipse.osee.framework.core.enums.Active;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.core.exception.OseeDataStoreException;
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/TeamDefinitionArtifact.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/TeamDefinitionArtifact.java index 98dd36db92e..bda62c5f56d 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/TeamDefinitionArtifact.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/TeamDefinitionArtifact.java @@ -22,9 +22,9 @@ import org.eclipse.osee.ats.config.AtsCacheManager; import org.eclipse.osee.ats.internal.AtsPlugin;
import org.eclipse.osee.ats.util.AtsArtifactTypes;
import org.eclipse.osee.ats.util.AtsFolderUtil;
+import org.eclipse.osee.ats.util.AtsFolderUtil.AtsFolder; import org.eclipse.osee.ats.util.AtsRelationTypes;
import org.eclipse.osee.ats.util.AtsUtil;
-import org.eclipse.osee.ats.util.AtsFolderUtil.AtsFolder;
import org.eclipse.osee.ats.util.widgets.commit.ICommitConfigArtifact;
import org.eclipse.osee.ats.workflow.item.AtsWorkDefinitions.RuleWorkItemId;
import org.eclipse.osee.framework.core.enums.Active;
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/AtsConfigManager.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/AtsConfigManager.java index 4a304eaa7db..a72015f7608 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/AtsConfigManager.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/AtsConfigManager.java @@ -22,15 +22,14 @@ import org.eclipse.osee.ats.AtsOpenOption; import org.eclipse.osee.ats.artifact.ATSAttributes; import org.eclipse.osee.ats.artifact.ActionableItemArtifact; import org.eclipse.osee.ats.artifact.TeamDefinitionArtifact; -import org.eclipse.osee.ats.artifact.VersionArtifact; import org.eclipse.osee.ats.artifact.TeamWorkFlowArtifact.DefaultTeamState; +import org.eclipse.osee.ats.artifact.VersionArtifact; import org.eclipse.osee.ats.internal.AtsPlugin; import org.eclipse.osee.ats.util.AtsArtifactTypes; import org.eclipse.osee.ats.util.AtsFolderUtil; +import org.eclipse.osee.ats.util.AtsFolderUtil.AtsFolder; import org.eclipse.osee.ats.util.AtsRelationTypes; import org.eclipse.osee.ats.util.AtsUtil; -import org.eclipse.osee.ats.util.AtsFolderUtil.AtsFolder; -import org.eclipse.osee.ats.workflow.editor.AtsWorkflowConfigEditor; import org.eclipse.osee.ats.workflow.editor.wizard.AtsWorkflowConfigCreationWizard.WorkflowData; import org.eclipse.osee.ats.workflow.item.AtsWorkDefinitions; import org.eclipse.osee.framework.core.enums.CoreArtifactTypes; @@ -39,6 +38,8 @@ import org.eclipse.osee.framework.core.exception.OseeArgumentException; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.operation.AbstractOperation; import org.eclipse.osee.framework.core.operation.IOperation; +import org.eclipse.osee.framework.logging.OseeLevel; +import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.plugin.core.util.Jobs; import org.eclipse.osee.framework.skynet.core.UserManager; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; @@ -47,6 +48,9 @@ import org.eclipse.osee.framework.skynet.core.artifact.Attribute; import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery; import org.eclipse.osee.framework.skynet.core.attribute.StringAttribute; import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction; +import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +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.widgets.workflow.WorkFlowDefinition; import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkItemAttributes; import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkItemDefinition; @@ -106,7 +110,7 @@ public class AtsConfigManager extends AbstractOperation { TeamDefinitionArtifact teamDefinition = createTeamDefinition(monitor, 0.10, transaction); Collection<ActionableItemArtifact> actionableItems = - createActionableItems(monitor, 0.10, transaction, teamDefinition); + createActionableItems(monitor, 0.10, transaction, teamDefinition); createVersions(monitor, 0.10, transaction, teamDefinition); @@ -121,8 +125,8 @@ public class AtsConfigManager extends AbstractOperation { private TeamDefinitionArtifact createTeamDefinition(IProgressMonitor monitor, double workAmount, SkynetTransaction transaction) throws OseeCoreException { TeamDefinitionArtifact teamDefinition = - (TeamDefinitionArtifact) ArtifactTypeManager.addArtifact(AtsArtifactTypes.TeamDefinition, - AtsUtil.getAtsBranch(), teamDefName); + (TeamDefinitionArtifact) ArtifactTypeManager.addArtifact(AtsArtifactTypes.TeamDefinition, + AtsUtil.getAtsBranch(), teamDefName); if (versionNames == null || versionNames.size() > 0) { teamDefinition.setSoleAttributeValue(ATSAttributes.TEAM_USES_VERSIONS_ATTRIBUTE.getStoreName(), true); } @@ -138,8 +142,8 @@ public class AtsConfigManager extends AbstractOperation { // Create top actionable item ActionableItemArtifact topAia = - (ActionableItemArtifact) ArtifactTypeManager.addArtifact(AtsArtifactTypes.ActionableItem, - AtsUtil.getAtsBranch(), teamDefName); + (ActionableItemArtifact) ArtifactTypeManager.addArtifact(AtsArtifactTypes.ActionableItem, + AtsUtil.getAtsBranch(), teamDefName); topAia.setSoleAttributeValue(ATSAttributes.ACTIONABLE_ATTRIBUTE.getStoreName(), false); topAia.persist(transaction); @@ -152,8 +156,8 @@ public class AtsConfigManager extends AbstractOperation { // Create children actionable item for (String name : actionableItems) { ActionableItemArtifact aia = - (ActionableItemArtifact) ArtifactTypeManager.addArtifact(AtsArtifactTypes.ActionableItem, - AtsUtil.getAtsBranch(), name); + (ActionableItemArtifact) ArtifactTypeManager.addArtifact(AtsArtifactTypes.ActionableItem, + AtsUtil.getAtsBranch(), name); aia.setSoleAttributeValue(ATSAttributes.ACTIONABLE_ATTRIBUTE.getStoreName(), true); topAia.addChild(aia); aia.persist(transaction); @@ -167,8 +171,7 @@ public class AtsConfigManager extends AbstractOperation { if (versionNames != null) { for (String name : versionNames) { VersionArtifact version = - (VersionArtifact) ArtifactTypeManager.addArtifact(AtsArtifactTypes.Version, AtsUtil.getAtsBranch(), - name); + (VersionArtifact) ArtifactTypeManager.addArtifact(AtsArtifactTypes.Version, AtsUtil.getAtsBranch(), name); teamDefinition.addRelation(AtsRelationTypes.TeamDefinitionToVersion_Version, version); versions.add(version); version.persist(transaction); @@ -178,8 +181,8 @@ public class AtsConfigManager extends AbstractOperation { private WorkFlowDefinition createWorkflow(IProgressMonitor monitor, double workAmount, SkynetTransaction transaction, TeamDefinitionArtifact teamDefinition) throws OseeCoreException { Artifact workflowArt = - ArtifactQuery.checkArtifactFromTypeAndName(CoreArtifactTypes.WorkFlowDefinition, workflowId, - AtsUtil.getAtsBranch()); + ArtifactQuery.checkArtifactFromTypeAndName(CoreArtifactTypes.WorkFlowDefinition, workflowId, + AtsUtil.getAtsBranch()); WorkFlowDefinition workFlowDefinition; // If can't be found, create a new one if (workflowArt == null) { @@ -214,7 +217,7 @@ public class AtsConfigManager extends AbstractOperation { // Duplicate work pages w/ namespace changes for (DefaultTeamState state : DefaultTeamState.values()) { Artifact defaultStateArt = - WorkItemDefinitionFactory.getWorkItemDefinitionArtifact("osee.ats.teamWorkflow." + state.name()); + WorkItemDefinitionFactory.getWorkItemDefinitionArtifact("osee.ats.teamWorkflow." + state.name()); Artifact newStateArt = defaultStateArt.duplicate(AtsUtil.getAtsBranch()); for (Attribute<?> attr : newStateArt.getAttributes()) { if (attr instanceof StringAttribute) { @@ -223,7 +226,7 @@ public class AtsConfigManager extends AbstractOperation { } if (state == DefaultTeamState.Completed || state == DefaultTeamState.Cancelled) { newStateArt.setSoleAttributeFromString(WorkItemAttributes.WORK_PARENT_ID.getAttributeTypeName(), - "osee.ats.teamWorkflow." + state.name()); + "osee.ats.teamWorkflow." + state.name()); } // Add same relations as default work pages to new work pages (widgets and rules) @@ -249,7 +252,11 @@ public class AtsConfigManager extends AbstractOperation { for (ActionableItemArtifact aia : aias) { AtsUtil.openATSAction(aia, AtsOpenOption.OpenAll); } - AtsWorkflowConfigEditor.editWorkflow(workFlowDefinition); + try { + RendererManager.open(workFlowDefinition.getArtifact(), PresentationType.SPECIALIZED_EDIT, monitor); + } catch (OseeCoreException ex) { + OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); + } return Status.OK_STATUS; } }; @@ -259,6 +266,6 @@ public class AtsConfigManager extends AbstractOperation { public static IOperation createAtsConfigOperation(String namespace, String teamDefName, Collection<String> versionNames, Collection<String> actionableItems, String workflowId) { return new AtsConfigManager(new OpenAtsConfigEditors(), namespace, teamDefName, versionNames, actionableItems, - workflowId); + workflowId); } } diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/AtsLoadConfigArtifactsOperation.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/AtsLoadConfigArtifactsOperation.java index 411711e6f16..1cec2fcf87d 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/AtsLoadConfigArtifactsOperation.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/AtsLoadConfigArtifactsOperation.java @@ -10,8 +10,8 @@ import java.util.logging.Level; import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.osee.ats.internal.AtsPlugin;
import org.eclipse.osee.ats.util.AtsFolderUtil;
-import org.eclipse.osee.ats.util.AtsRelationTypes;
import org.eclipse.osee.ats.util.AtsFolderUtil.AtsFolder;
+import org.eclipse.osee.ats.util.AtsRelationTypes; import org.eclipse.osee.framework.core.enums.CoreRelationTypes;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.core.operation.AbstractOperation;
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/AtsTaskEditorRenderer.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/AtsTaskEditorRenderer.java index b0ab7ff83ae..3f0bc8b36fc 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/AtsTaskEditorRenderer.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/AtsTaskEditorRenderer.java @@ -29,16 +29,6 @@ public class AtsTaskEditorRenderer extends DefaultArtifactRenderer { private static final String COMMAND_ID = "org.eclipse.osee.framework.ui.skynet.atstaskeditor.command";
@Override
- public void open(List<Artifact> artifacts) throws OseeCoreException {
- AtsUtil.openInAtsTaskEditor("Tasks", artifacts);
- }
-
- @Override
- public void preview(List<Artifact> artifacts) throws OseeCoreException {
- open(artifacts);
- }
-
- @Override
public Image getImage(Artifact artifact) throws OseeCoreException {
return ImageManager.getImage(AtsImage.TASK);
}
@@ -72,4 +62,8 @@ public class AtsTaskEditorRenderer extends DefaultArtifactRenderer { return new AtsTaskEditorRenderer();
}
-}
+ @Override + public void open(List<Artifact> artifacts, PresentationType presentationType) throws OseeCoreException { + AtsUtil.openInAtsTaskEditor("Tasks", artifacts); + } +}
\ No newline at end of file diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/AtsWorkflowRenderer.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/AtsWorkflowRenderer.java index d623e5c35bf..ec171ea11c3 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/AtsWorkflowRenderer.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/AtsWorkflowRenderer.java @@ -52,13 +52,6 @@ public class AtsWorkflowRenderer extends DefaultArtifactRenderer { } @Override - public void open(List<Artifact> artifacts) throws OseeCoreException { - for (Artifact artifact : artifacts) { - AtsUtil.openATSAction(artifact, AtsOpenOption.OpenOneOrPopupSelect); - } - } - - @Override public AtsWorkflowRenderer newInstance() throws OseeCoreException { return new AtsWorkflowRenderer(); } @@ -72,11 +65,6 @@ public class AtsWorkflowRenderer extends DefaultArtifactRenderer { } @Override - public void preview(List<Artifact> artifacts) throws OseeCoreException { - open(artifacts); - } - - @Override public int minimumRanking() throws OseeCoreException { if (AccessControlManager.isOseeAdmin()) { return NO_MATCH; @@ -84,4 +72,11 @@ public class AtsWorkflowRenderer extends DefaultArtifactRenderer { return PRESENTATION_TYPE; } } -} + + @Override + public void open(List<Artifact> artifacts, PresentationType presentationType) throws OseeCoreException { + for (Artifact artifact : artifacts) { + AtsUtil.openATSAction(artifact, AtsOpenOption.OpenOneOrPopupSelect); + } + } +}
\ No newline at end of file diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/AtsWorldEditorRenderer.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/AtsWorldEditorRenderer.java index 2b68cd699b3..f6873902617 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/AtsWorldEditorRenderer.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/AtsWorldEditorRenderer.java @@ -78,13 +78,7 @@ public class AtsWorldEditorRenderer extends DefaultArtifactRenderer { }
@Override
- public void open(List<Artifact> artifacts) throws OseeCoreException {
+ public void open(List<Artifact> artifacts, PresentationType presentationType) throws OseeCoreException { AtsUtil.openInAtsWorldEditor("ATS", artifacts);
}
-
- @Override
- public void preview(List<Artifact> artifacts) throws OseeCoreException {
- open(artifacts);
- }
-
-}
+}
\ No newline at end of file diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAEditor.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAEditor.java index 45bea98d201..bee04632538 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAEditor.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAEditor.java @@ -72,8 +72,9 @@ import org.eclipse.osee.framework.ui.skynet.FrameworkImage; import org.eclipse.osee.framework.ui.skynet.OseeContributionItem;
import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin;
import org.eclipse.osee.framework.ui.skynet.artifact.editor.AbstractArtifactEditor;
-import org.eclipse.osee.framework.ui.skynet.artifact.editor.ArtifactEditor;
import org.eclipse.osee.framework.ui.skynet.notify.OseeNotificationManager;
+import org.eclipse.osee.framework.ui.skynet.render.PresentationType; +import org.eclipse.osee.framework.ui.skynet.render.RendererManager; import org.eclipse.osee.framework.ui.swt.IDirtiableEditor;
import org.eclipse.osee.framework.ui.swt.ImageManager;
import org.eclipse.swt.SWT;
@@ -139,7 +140,7 @@ public class SMAEditor extends AbstractArtifactEditor implements ISMAEditorEvent if (sma == null) {
MessageDialog.openError(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), "Open Error",
- "Can't Find Action in DB");
+ "Can't Find Action in DB"); return;
}
try {
@@ -195,10 +196,10 @@ public class SMAEditor extends AbstractArtifactEditor implements ISMAEditorEvent try {
if (sma.isHistoricalVersion()) {
AWorkbench.popup("Historical Error",
- "You can not change a historical version of " + sma.getArtifactTypeName() + ":\n\n" + sma);
+ "You can not change a historical version of " + sma.getArtifactTypeName() + ":\n\n" + sma); } else if (!sma.isAccessControlWrite()) {
AWorkbench.popup("Authentication Error",
- "You do not have permissions to save " + sma.getArtifactTypeName() + ":" + sma);
+ "You do not have permissions to save " + sma.getArtifactTypeName() + ":" + sma); } else {
try {
SkynetTransaction transaction = new SkynetTransaction(AtsUtil.getAtsBranch(), "Workflow Editor - Save");
@@ -402,7 +403,7 @@ public class SMAEditor extends AbstractArtifactEditor implements ISMAEditorEvent }
}
- public static void editArtifact(Artifact artifact) {
+ public static void editArtifact(Artifact artifact) throws OseeCoreException { if (artifact == null) {
return;
}
@@ -413,7 +414,7 @@ public class SMAEditor extends AbstractArtifactEditor implements ISMAEditorEvent if (artifact instanceof StateMachineArtifact) {
editArtifact((StateMachineArtifact) artifact);
} else {
- ArtifactEditor.editArtifact(artifact);
+ RendererManager.open(artifact, PresentationType.GENERALIZED_EDIT); }
}
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAHistorySection.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAHistorySection.java index 7158a523e60..018485f40ca 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAHistorySection.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAHistorySection.java @@ -15,7 +15,8 @@ import org.eclipse.osee.ats.internal.AtsPlugin; import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.logging.OseeLevel;
import org.eclipse.osee.framework.logging.OseeLog;
-import org.eclipse.osee.framework.ui.skynet.artifact.editor.ArtifactEditor;
+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.html.XResultsComposite;
import org.eclipse.swt.SWT;
import org.eclipse.swt.layout.GridData;
@@ -60,7 +61,9 @@ public class SMAHistorySection extends SectionPart { }
private synchronized void createSection() {
- if (sectionCreated) return;
+ if (sectionCreated) { + return; + } StateMachineArtifact sma = editor.getSma();
final FormToolkit toolkit = getManagedForm().getToolkit();
@@ -85,7 +88,11 @@ public class SMAHistorySection extends SectionPart { button.addListener(SWT.MouseDoubleClick, new Listener() {
@Override
public void handleEvent(Event event) {
- ArtifactEditor.editArtifact(fSma);
+ try { + RendererManager.open(fSma, PresentationType.GENERALIZED_EDIT); + } catch (OseeCoreException ex) { + OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE, ex); + } }
});
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/stateItem/AtsHandleAddReviewRuleStateItem.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/stateItem/AtsHandleAddReviewRuleStateItem.java index 3d2418020b8..5377b547840 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/stateItem/AtsHandleAddReviewRuleStateItem.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/stateItem/AtsHandleAddReviewRuleStateItem.java @@ -17,10 +17,10 @@ import org.eclipse.osee.ats.artifact.PeerToPeerReviewArtifact; import org.eclipse.osee.ats.artifact.StateMachineArtifact; import org.eclipse.osee.ats.artifact.TeamWorkFlowArtifact; import org.eclipse.osee.ats.workflow.item.AtsAddDecisionReviewRule; -import org.eclipse.osee.ats.workflow.item.AtsAddPeerToPeerReviewRule; -import org.eclipse.osee.ats.workflow.item.StateEventType; import org.eclipse.osee.ats.workflow.item.AtsAddDecisionReviewRule.DecisionParameter; import org.eclipse.osee.ats.workflow.item.AtsAddDecisionReviewRule.DecisionRuleOption; +import org.eclipse.osee.ats.workflow.item.AtsAddPeerToPeerReviewRule; +import org.eclipse.osee.ats.workflow.item.StateEventType; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.skynet.core.User; import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction; diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/export/AtsExportPage.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/export/AtsExportPage.java index e5625224665..aa9b00dd08c 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/export/AtsExportPage.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/export/AtsExportPage.java @@ -23,9 +23,9 @@ import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.ui.plugin.util.Result;
import org.eclipse.osee.framework.ui.skynet.widgets.XCheckBox;
import org.eclipse.osee.framework.ui.skynet.widgets.XFileTextWithSelectionDialog;
+import org.eclipse.osee.framework.ui.skynet.widgets.XFileTextWithSelectionDialog.Type; import org.eclipse.osee.framework.ui.skynet.widgets.XModifiedListener;
import org.eclipse.osee.framework.ui.skynet.widgets.XWidget;
-import org.eclipse.osee.framework.ui.skynet.widgets.XFileTextWithSelectionDialog.Type;
import org.eclipse.swt.SWT;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/export/AtsExportRenderer.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/export/AtsExportRenderer.java index 2a3f51dab34..53c52a10566 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/export/AtsExportRenderer.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/export/AtsExportRenderer.java @@ -50,11 +50,6 @@ public class AtsExportRenderer extends DefaultArtifactRenderer { } @Override - public void open(List<Artifact> artifacts) throws OseeCoreException { - AtsExportManager.export(artifacts, ExportOption.POPUP_DIALOG); - } - - @Override public AtsExportRenderer newInstance() throws OseeCoreException { return new AtsExportRenderer(); } @@ -68,12 +63,12 @@ public class AtsExportRenderer extends DefaultArtifactRenderer { } @Override - public void preview(List<Artifact> artifacts) throws OseeCoreException { - open(artifacts); + public int minimumRanking() throws OseeCoreException { + return NO_MATCH; } @Override - public int minimumRanking() throws OseeCoreException { - return NO_MATCH; + public void open(List<Artifact> artifacts, PresentationType presentationType) throws OseeCoreException { + AtsExportManager.export(artifacts, ExportOption.POPUP_DIALOG); } -} +}
\ No newline at end of file diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/handlers/AtsEditorHandler.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/handlers/AtsEditorHandler.java index 8fec57a2491..8eae7b1d42a 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/handlers/AtsEditorHandler.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/handlers/AtsEditorHandler.java @@ -12,11 +12,11 @@ package org.eclipse.osee.ats.handlers; import java.util.logging.Level;
import org.eclipse.core.commands.ExecutionEvent;
-import org.eclipse.core.commands.ExecutionException;
import org.eclipse.osee.ats.editor.AtsWorkflowRenderer;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.ui.skynet.commandHandlers.renderer.handlers.AbstractEditorHandler;
+import org.eclipse.osee.framework.ui.skynet.render.PresentationType; /**
* @author Jeff C. Phillips
@@ -24,11 +24,11 @@ import org.eclipse.osee.framework.ui.skynet.commandHandlers.renderer.handlers.Ab public class AtsEditorHandler extends AbstractEditorHandler {
@Override
- public Object execute(ExecutionEvent event) throws ExecutionException {
+ public Object execute(ExecutionEvent event) { if (!artifacts.isEmpty()) {
AtsWorkflowRenderer renderer = new AtsWorkflowRenderer();
try {
- renderer.open(artifacts);
+ renderer.open(artifacts, PresentationType.SPECIALIZED_EDIT); } catch (OseeCoreException ex) {
OseeLog.log(AtsEditorHandler.class, Level.SEVERE, ex);
}
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/handlers/AtsExportHandler.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/handlers/AtsExportHandler.java index 1106686ff0b..7b1bc03de0d 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/handlers/AtsExportHandler.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/handlers/AtsExportHandler.java @@ -12,11 +12,11 @@ package org.eclipse.osee.ats.handlers; import java.util.logging.Level;
import org.eclipse.core.commands.ExecutionEvent;
-import org.eclipse.core.commands.ExecutionException;
import org.eclipse.osee.ats.export.AtsExportRenderer;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.ui.skynet.commandHandlers.renderer.handlers.AbstractEditorHandler;
+import org.eclipse.osee.framework.ui.skynet.render.PresentationType; /**
* @author Jeff C. Phillips
@@ -24,11 +24,11 @@ import org.eclipse.osee.framework.ui.skynet.commandHandlers.renderer.handlers.Ab public class AtsExportHandler extends AbstractEditorHandler {
@Override
- public Object execute(ExecutionEvent event) throws ExecutionException {
+ public Object execute(ExecutionEvent event) { if (!artifacts.isEmpty()) {
AtsExportRenderer renderer = new AtsExportRenderer();
try {
- renderer.open(artifacts);
+ renderer.open(artifacts, PresentationType.SPECIALIZED_EDIT); } catch (OseeCoreException ex) {
OseeLog.log(AtsEditorHandler.class, Level.SEVERE, ex);
}
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/handlers/AtsTaskEditorHandler.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/handlers/AtsTaskEditorHandler.java index 1fe34aceb6f..5de525141cf 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/handlers/AtsTaskEditorHandler.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/handlers/AtsTaskEditorHandler.java @@ -12,11 +12,11 @@ package org.eclipse.osee.ats.handlers; import java.util.logging.Level;
import org.eclipse.core.commands.ExecutionEvent;
-import org.eclipse.core.commands.ExecutionException;
import org.eclipse.osee.ats.editor.AtsTaskEditorRenderer;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.ui.skynet.commandHandlers.renderer.handlers.AbstractEditorHandler;
+import org.eclipse.osee.framework.ui.skynet.render.PresentationType; /**
* @author Jeff C. Phillips
@@ -24,11 +24,11 @@ import org.eclipse.osee.framework.ui.skynet.commandHandlers.renderer.handlers.Ab public class AtsTaskEditorHandler extends AbstractEditorHandler {
@Override
- public Object execute(ExecutionEvent event) throws ExecutionException {
+ public Object execute(ExecutionEvent event) { if (!artifacts.isEmpty()) {
AtsTaskEditorRenderer renderer = new AtsTaskEditorRenderer();
try {
- renderer.open(artifacts);
+ renderer.open(artifacts, PresentationType.SPECIALIZED_EDIT); } catch (OseeCoreException ex) {
OseeLog.log(AtsEditorHandler.class, Level.SEVERE, ex);
}
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/handlers/AtsWorkflowConfigEditorHandler.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/handlers/AtsWorkflowConfigEditorHandler.java index 44dca7254cd..4f39b5f5d87 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/handlers/AtsWorkflowConfigEditorHandler.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/handlers/AtsWorkflowConfigEditorHandler.java @@ -12,11 +12,11 @@ package org.eclipse.osee.ats.handlers; import java.util.logging.Level;
import org.eclipse.core.commands.ExecutionEvent;
-import org.eclipse.core.commands.ExecutionException;
import org.eclipse.osee.ats.editor.AtsWorkflowRenderer;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.ui.skynet.commandHandlers.renderer.handlers.AbstractEditorHandler;
+import org.eclipse.osee.framework.ui.skynet.render.PresentationType; /**
* @author Donald G. Dunne
@@ -24,11 +24,11 @@ import org.eclipse.osee.framework.ui.skynet.commandHandlers.renderer.handlers.Ab public class AtsWorkflowConfigEditorHandler extends AbstractEditorHandler {
@Override
- public Object execute(ExecutionEvent event) throws ExecutionException {
+ public Object execute(ExecutionEvent event) { if (!artifacts.isEmpty()) {
AtsWorkflowRenderer renderer = new AtsWorkflowRenderer();
try {
- renderer.open(artifacts);
+ renderer.open(artifacts, PresentationType.SPECIALIZED_EDIT); } catch (OseeCoreException ex) {
OseeLog.log(AtsWorkflowConfigEditorHandler.class, Level.SEVERE, ex);
}
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/handlers/AtsWorldEditorHandler.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/handlers/AtsWorldEditorHandler.java index 668872033fa..7f0300082ea 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/handlers/AtsWorldEditorHandler.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/handlers/AtsWorldEditorHandler.java @@ -12,11 +12,11 @@ package org.eclipse.osee.ats.handlers; import java.util.logging.Level;
import org.eclipse.core.commands.ExecutionEvent;
-import org.eclipse.core.commands.ExecutionException;
import org.eclipse.osee.ats.editor.AtsWorldEditorRenderer;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.ui.skynet.commandHandlers.renderer.handlers.AbstractEditorHandler;
+import org.eclipse.osee.framework.ui.skynet.render.PresentationType; /**
* @author Jeff C. Phillips
@@ -24,11 +24,11 @@ import org.eclipse.osee.framework.ui.skynet.commandHandlers.renderer.handlers.Ab public class AtsWorldEditorHandler extends AbstractEditorHandler {
@Override
- public Object execute(ExecutionEvent event) throws ExecutionException {
+ public Object execute(ExecutionEvent event) { if (!artifacts.isEmpty()) {
AtsWorldEditorRenderer renderer = new AtsWorldEditorRenderer();
try {
- renderer.open(artifacts);
+ renderer.open(artifacts, PresentationType.SPECIALIZED_EDIT); } catch (OseeCoreException ex) {
OseeLog.log(AtsEditorHandler.class, Level.SEVERE, ex);
}
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/health/ChangeReportComparer.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/health/ChangeReportComparer.java index 9585e58ef89..8dc11dd4359 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/health/ChangeReportComparer.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/health/ChangeReportComparer.java @@ -12,7 +12,6 @@ package org.eclipse.osee.ats.health; import java.util.ArrayList;
import java.util.logging.Level;
-
import org.eclipse.osee.ats.health.change.DataChangeReportComparer;
import org.eclipse.osee.ats.health.change.ValidateChangeReportParser;
import org.eclipse.osee.ats.internal.AtsPlugin;
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/health/ValidateChangeReportByHrid.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/health/ValidateChangeReportByHrid.java index fde68dcc0b7..7ced8542884 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/health/ValidateChangeReportByHrid.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/health/ValidateChangeReportByHrid.java @@ -24,9 +24,9 @@ import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.plugin.core.util.Jobs;
import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery;
import org.eclipse.osee.framework.ui.plugin.PluginUiImage;
+import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateComposite.TableLoadOption; import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateItem;
import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateItemAction;
-import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateComposite.TableLoadOption;
import org.eclipse.osee.framework.ui.skynet.results.XResultData;
import org.eclipse.osee.framework.ui.skynet.widgets.dialog.EntryCheckDialog;
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/health/ValidateChangeReports.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/health/ValidateChangeReports.java index de63948b42c..89bbd45a340 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/health/ValidateChangeReports.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/health/ValidateChangeReports.java @@ -54,9 +54,9 @@ import org.eclipse.osee.framework.skynet.core.revision.ChangeData.KindType; import org.eclipse.osee.framework.ui.plugin.PluginUiImage;
import org.eclipse.osee.framework.ui.plugin.util.Displays;
import org.eclipse.osee.framework.ui.plugin.util.Result;
+import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateComposite.TableLoadOption; import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateItem;
import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateItemAction;
-import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateComposite.TableLoadOption;
import org.eclipse.osee.framework.ui.skynet.compare.CompareHandler;
import org.eclipse.osee.framework.ui.skynet.results.XResultData;
import org.eclipse.swt.widgets.Display;
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/hyper/HyperView.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/hyper/HyperView.java index 94d85fa7578..5aac45d054a 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/hyper/HyperView.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/hyper/HyperView.java @@ -48,7 +48,8 @@ import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
import org.eclipse.osee.framework.ui.plugin.PluginUiImage;
import org.eclipse.osee.framework.ui.skynet.OseeContributionItem;
-import org.eclipse.osee.framework.ui.skynet.artifact.editor.ArtifactEditor;
+import org.eclipse.osee.framework.ui.skynet.render.PresentationType; +import org.eclipse.osee.framework.ui.skynet.render.RendererManager; import org.eclipse.osee.framework.ui.swt.ImageManager;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.SelectionAdapter;
@@ -142,7 +143,11 @@ public class HyperView extends ViewPart implements IPartListener { }
enum RelationEnum {
- TOP, BOTTOM, BOTTOM2, LEFT, RIGHT
+ TOP, + BOTTOM, + BOTTOM2, + LEFT, + RIGHT };
public boolean provideBackForwardActions() {
@@ -201,8 +206,7 @@ public class HyperView extends ViewPart implements IPartListener { System.out.println("gridLoad");
}
/*
- * If grid already loaded and it was a collection, remove old home and all links associated
- * with it.
+ * If grid already loaded and it was a collection, remove old home and all links associated with it. */
if (homeSearchItem != null) {
for (HyperViewItem hyperItem : homeSearchItem.getBottom()) {
@@ -401,8 +405,8 @@ public class HyperView extends ViewPart implements IPartListener { // drawQuadrant(leftQuadrantStart, quadrant);
// drawQuadrant(rightQuadrantStart, quadrant);
/*
- * Bottomren draw from right to left Tops draw from left to right Left draws from low to
- * high Usedby draws from high to low
+ * Bottomren draw from right to left Tops draw from left to right Left draws from low to high Usedby draws from + * high to low */
// Draw other nodes
drawNodes(RelationEnum.TOP, hvi.getTop(), cPoint, sourceAnchor);
@@ -575,7 +579,7 @@ public class HyperView extends ViewPart implements IPartListener { }
if (hvi.getBottom().size() > 0) {
drawNodes(RelationEnum.BOTTOM, hvi.getBottom(), new Point((nwPoint.x + dim.width / 2),
- (nwPoint.y + dim.height / 2)), thisAnchor);
+ (nwPoint.y + dim.height / 2)), thisAnchor); }
if (hvi.getLeft().size() > 0) {
drawNodes(RelationEnum.LEFT, hvi.getLeft(), cPoint, thisAnchor);
@@ -653,7 +657,7 @@ public class HyperView extends ViewPart implements IPartListener { public void widgetSelected(SelectionEvent e) {
try {
if (MessageDialog.openQuestion(Display.getCurrent().getActiveShell(), "Delete Link",
- "Delete Link\n\n" + hvi.getLink().toString() + "\n\nAre you sure?")) {
+ "Delete Link\n\n" + hvi.getLink().toString() + "\n\nAre you sure?")) { Artifact artA = hvi.getLink().getArtifactA();
hvi.getLink().delete(true);
artA.persist();
@@ -830,7 +834,11 @@ public class HyperView extends ViewPart implements IPartListener { a = ((ActionHyperItem) fHvi).getArtifact();
}
if (a != null) {
- ArtifactEditor.editArtifact(a);
+ try { + RendererManager.open(a, PresentationType.GENERALIZED_EDIT); + } catch (OseeCoreException ex) { + OseeLog.log(AtsPlugin.class, Level.SEVERE, ex); + } }
popupMenu.dispose();
popupMenu = null;
@@ -853,7 +861,7 @@ public class HyperView extends ViewPart implements IPartListener { dialogText.append("\"" + art.getName() + "\"\nguid: " + art.getGuid());
dialogText.append("\n\n Are you sure you want to delete this artifact and its default-hierarchy children?");
if (MessageDialog.openQuestion(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(),
- dialogTitle, dialogText.toString())) {
+ dialogTitle, dialogText.toString())) { if (art instanceof StateMachineArtifact) {
SMAEditor.close(Collections.singleton((StateMachineArtifact) art), false);
}
@@ -941,7 +949,7 @@ public class HyperView extends ViewPart implements IPartListener { backAction.setText("Back");
backAction.setToolTipText("Back");
backAction.setImageDescriptor(PlatformUI.getWorkbench().getSharedImages().getImageDescriptor(
- ISharedImages.IMG_TOOL_BACK));
+ ISharedImages.IMG_TOOL_BACK)); // Forward Action
forwardAction = new Action() {
@@ -958,7 +966,7 @@ public class HyperView extends ViewPart implements IPartListener { forwardAction.setText("Forward");
forwardAction.setToolTipText("Forward");
forwardAction.setImageDescriptor(PlatformUI.getWorkbench().getSharedImages().getImageDescriptor(
- ISharedImages.IMG_TOOL_FORWARD));
+ ISharedImages.IMG_TOOL_FORWARD)); }
// // Home
// Action homeAction = new Action() {
@@ -1042,7 +1050,7 @@ public class HyperView extends ViewPart implements IPartListener { public void run() {
if (homeSearchItem == null) {
MessageDialog.openInformation(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(),
- "Refresh Error", "Viewer not loaded, nothing to refresh.");
+ "Refresh Error", "Viewer not loaded, nothing to refresh."); return;
}
handleRefreshButton();
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/ArtifactImpactToActionSearchItem.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/ArtifactImpactToActionSearchItem.java index e2a3d09a7b2..745d322d02e 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/ArtifactImpactToActionSearchItem.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/ArtifactImpactToActionSearchItem.java @@ -59,7 +59,7 @@ public class ArtifactImpactToActionSearchItem extends XNavigateItemAction { @Override
public void run(TableLoadOption... tableLoadOptions) {
EntryDialogWithBranchSelect ed =
- new EntryDialogWithBranchSelect(getName(), "Enter Artifact Name (or string) to search (no wildcards)");
+ new EntryDialogWithBranchSelect(getName(), "Enter Artifact Name (or string) to search (no wildcards)"); if (ed.open() == 0) {
ActionToArtifactImpactJob job = new ActionToArtifactImpactJob(ed.getEntry(), ed.getBranch());
job.setUser(true);
@@ -95,7 +95,7 @@ public class ArtifactImpactToActionSearchItem extends XNavigateItemAction { private void getMatrixItems() throws OseeCoreException {
final Collection<Artifact> srchArts =
- ArtifactQuery.getArtifactListFromName("%" + artifactName + "%", branch, INCLUDE_DELETED);
+ ArtifactQuery.getArtifactListFromName("%" + artifactName + "%", branch, INCLUDE_DELETED); final Set<Artifact> processArts = new HashSet<Artifact>();
if (srchArts.isEmpty()) {
return;
@@ -120,7 +120,7 @@ public class ArtifactImpactToActionSearchItem extends XNavigateItemAction { rd.log("Artifact Impact to Action for artifact(s) on branch \"" + branch.getShortName() + "\"");
HashCollection<Artifact, TransactionRecord> transactionMap =
- ChangeManager.getModifingTransactions(processArts);
+ ChangeManager.getModifingTransactions(processArts); HashCollection<Artifact, Branch> branchMap = ChangeManager.getModifingBranches(processArts);
for (Artifact srchArt : processArts) {
String str = String.format("Processing %d/%d - %s ", x++, processArts.size(), srchArt.getName());
@@ -140,7 +140,7 @@ public class ArtifactImpactToActionSearchItem extends XNavigateItemAction { Artifact assocArt = BranchManager.getAssociatedArtifact(branch);
if (assocArt != null && !assocArt.equals(UserManager.getUser(SystemUser.OseeSystem))) {
rd.addRaw(AHTML.addRowMultiColumnTable(new String[] {assocArt.getArtifactTypeName(), "Working",
- XResultData.getHyperlink(assocArt), assocArt.getName()}));
+ XResultData.getHyperlink(assocArt), assocArt.getName()})); } else {
rd.addRaw(AHTML.addRowMultiColumnTable(new String[] {"Branch", "", branch.getName()}));
}
@@ -160,10 +160,10 @@ public class ArtifactImpactToActionSearchItem extends XNavigateItemAction { monitor.subTask(transStr);
if (transactionId.getCommit() > 0) {
Artifact assocArt =
- ArtifactQuery.getArtifactFromId(transactionId.getCommit(), BranchManager.getCommonBranch());
+ ArtifactQuery.getArtifactFromId(transactionId.getCommit(), BranchManager.getCommonBranch()); if (assocArt instanceof TeamWorkFlowArtifact) {
rd.addRaw(AHTML.addRowMultiColumnTable(new String[] {assocArt.getArtifactTypeName(),
- "Committed", assocArt.getHumanReadableId(), assocArt.getName()}));
+ "Committed", assocArt.getHumanReadableId(), assocArt.getName()})); committedChanges = true;
}
}
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/AtsNavigateViewItems.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/AtsNavigateViewItems.java index f3a2c3d9c2e..635c76b8695 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/AtsNavigateViewItems.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/AtsNavigateViewItems.java @@ -45,7 +45,9 @@ import org.eclipse.osee.ats.world.search.MultipleHridSearchOperation; import org.eclipse.osee.ats.world.search.MyFavoritesGoalsSearchItem;
import org.eclipse.osee.ats.world.search.MyFavoritesSearchItem;
import org.eclipse.osee.ats.world.search.MyGoalWorkflowItem;
+import org.eclipse.osee.ats.world.search.MyGoalWorkflowItem.GoalSearchState; import org.eclipse.osee.ats.world.search.MyReviewWorkflowItem;
+import org.eclipse.osee.ats.world.search.MyReviewWorkflowItem.ReviewState; import org.eclipse.osee.ats.world.search.MySubscribedSearchItem;
import org.eclipse.osee.ats.world.search.MyWorldSearchItem;
import org.eclipse.osee.ats.world.search.NextVersionSearchItem;
@@ -55,8 +57,6 @@ import org.eclipse.osee.ats.world.search.TaskSearchWorldSearchItem; import org.eclipse.osee.ats.world.search.UserCommunitySearchItem;
import org.eclipse.osee.ats.world.search.UserRelatedToAtsObjectSearch;
import org.eclipse.osee.ats.world.search.VersionTargetedForTeamSearchItem;
-import org.eclipse.osee.ats.world.search.MyGoalWorkflowItem.GoalSearchState;
-import org.eclipse.osee.ats.world.search.MyReviewWorkflowItem.ReviewState;
import org.eclipse.osee.ats.world.search.WorldSearchItem.LoadView;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.core.model.Branch;
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/AtsRemoteEventTestItem.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/AtsRemoteEventTestItem.java index 4c50c1f5074..d3c3492a28a 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/AtsRemoteEventTestItem.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/AtsRemoteEventTestItem.java @@ -19,15 +19,15 @@ import org.eclipse.osee.ats.actions.wizard.NewActionJob; import org.eclipse.osee.ats.artifact.ATSAttributes;
import org.eclipse.osee.ats.artifact.ActionArtifact;
import org.eclipse.osee.ats.artifact.ActionableItemArtifact;
-import org.eclipse.osee.ats.artifact.TeamWorkFlowArtifact;
-import org.eclipse.osee.ats.artifact.VersionArtifact;
import org.eclipse.osee.ats.artifact.StateMachineArtifact.TransitionOption;
+import org.eclipse.osee.ats.artifact.TeamWorkFlowArtifact; import org.eclipse.osee.ats.artifact.TeamWorkFlowArtifact.DefaultTeamState;
+import org.eclipse.osee.ats.artifact.VersionArtifact; import org.eclipse.osee.ats.internal.AtsPlugin;
import org.eclipse.osee.ats.util.AtsArtifactTypes;
+import org.eclipse.osee.ats.util.AtsPriority.PriorityType; import org.eclipse.osee.ats.util.AtsRelationTypes;
import org.eclipse.osee.ats.util.AtsUtil;
-import org.eclipse.osee.ats.util.AtsPriority.PriorityType;
import org.eclipse.osee.ats.world.WorldXNavigateItemAction;
import org.eclipse.osee.framework.core.exception.OseeArgumentException;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
@@ -38,8 +38,8 @@ import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery; import org.eclipse.osee.framework.skynet.core.event.RemoteEventManager;
import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction;
import org.eclipse.osee.framework.ui.plugin.util.AWorkbench;
-import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateItem;
import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateComposite.TableLoadOption;
+import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateItem; import org.eclipse.osee.framework.ui.skynet.results.XResultData;
import org.eclipse.osee.framework.ui.skynet.util.ChangeType;
import org.eclipse.osee.framework.ui.skynet.widgets.dialog.EntryDialog;
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/AtsXNavigateItemLauncher.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/AtsXNavigateItemLauncher.java index ba103d336c2..2fffdd3afb4 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/AtsXNavigateItemLauncher.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/AtsXNavigateItemLauncher.java @@ -15,15 +15,15 @@ import org.eclipse.osee.ats.world.WorldEditorParameterSearchItem; import org.eclipse.osee.ats.world.WorldEditorParameterSearchItemProvider;
import org.eclipse.osee.ats.world.WorldEditorUISearchItemProvider;
import org.eclipse.osee.ats.world.search.WorldSearchItem;
-import org.eclipse.osee.ats.world.search.WorldUISearchItem;
import org.eclipse.osee.ats.world.search.WorldSearchItem.LoadView;
+import org.eclipse.osee.ats.world.search.WorldUISearchItem; import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.jdk.core.util.Collections;
import org.eclipse.osee.framework.logging.OseeLevel;
import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.ui.plugin.util.AWorkbench;
-import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateItem;
import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateComposite.TableLoadOption;
+import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateItem; /**
* @author Donald G. Dunne
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/BarChartExample.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/BarChartExample.java index eee90737c2f..aa875215612 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/BarChartExample.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/BarChartExample.java @@ -38,9 +38,9 @@ import org.eclipse.birt.chart.model.type.impl.BarSeriesImpl; import org.eclipse.osee.ats.AtsImage;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.jdk.core.util.AHTML;
+import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateComposite.TableLoadOption; import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateItem;
import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateItemAction;
-import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateComposite.TableLoadOption;
import org.eclipse.osee.framework.ui.skynet.results.IResultsEditorProvider;
import org.eclipse.osee.framework.ui.skynet.results.IResultsEditorTab;
import org.eclipse.osee.framework.ui.skynet.results.ResultsEditor;
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/CompareEditorExample.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/CompareEditorExample.java index 2fe9821a0b6..21b32d9b070 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/CompareEditorExample.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/CompareEditorExample.java @@ -13,9 +13,9 @@ package org.eclipse.osee.ats.navigate; import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.osee.framework.core.exception.OseeArgumentException; import org.eclipse.osee.framework.core.exception.OseeCoreException; +import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateComposite.TableLoadOption; import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateItem; import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateItemAction; -import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateComposite.TableLoadOption; import org.eclipse.osee.framework.ui.skynet.FrameworkImage; import org.eclipse.osee.framework.ui.skynet.compare.CompareHandler; import org.eclipse.swt.widgets.Display; diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/ConfigureDBForAts.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/ConfigureDBForAts.java index d34cfb26af3..a56decb48e8 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/ConfigureDBForAts.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/ConfigureDBForAts.java @@ -21,9 +21,9 @@ import org.eclipse.osee.ats.workflow.item.AtsWorkDefinitions; import org.eclipse.osee.ats.workflow.vue.LoadAIsAndTeamsAction; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.plugin.core.util.Jobs; +import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateComposite.TableLoadOption; import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateItem; import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateItemAction; -import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateComposite.TableLoadOption; import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkItemDefinition.WriteType; import org.eclipse.swt.widgets.Display; diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/CreateGoalTestArtifacts.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/CreateGoalTestArtifacts.java index eb7b14d2559..f7871bb4497 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/CreateGoalTestArtifacts.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/CreateGoalTestArtifacts.java @@ -21,17 +21,17 @@ import org.eclipse.osee.ats.artifact.PeerToPeerReviewArtifact; import org.eclipse.osee.ats.artifact.TaskArtifact; import org.eclipse.osee.ats.artifact.TeamWorkFlowArtifact; import org.eclipse.osee.ats.util.ActionManager; -import org.eclipse.osee.ats.util.AtsUtil; import org.eclipse.osee.ats.util.AtsPriority.PriorityType; +import org.eclipse.osee.ats.util.AtsUtil; import org.eclipse.osee.ats.util.widgets.ReviewManager; import org.eclipse.osee.ats.world.WorldEditor; import org.eclipse.osee.ats.world.WorldEditorSimpleProvider; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction; import org.eclipse.osee.framework.ui.plugin.util.AWorkbench; +import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateComposite.TableLoadOption; import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateItem; import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateItemAction; -import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateComposite.TableLoadOption; import org.eclipse.osee.framework.ui.skynet.util.ChangeType; import org.eclipse.swt.widgets.Display; diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/CreateNewVersionItem.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/CreateNewVersionItem.java index f4d096b3414..649f13ec05c 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/CreateNewVersionItem.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/CreateNewVersionItem.java @@ -26,11 +26,12 @@ import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.artifact.ArtifactTypeManager; import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction; import org.eclipse.osee.framework.ui.plugin.util.AWorkbench; +import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateComposite.TableLoadOption; import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateItem; import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateItemAction; -import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateComposite.TableLoadOption; import org.eclipse.osee.framework.ui.skynet.FrameworkImage; -import org.eclipse.osee.framework.ui.skynet.artifact.editor.ArtifactEditor; +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.widgets.dialog.EntryDialog; import org.eclipse.swt.widgets.Display; @@ -47,7 +48,7 @@ public class CreateNewVersionItem extends XNavigateItemAction { */ public CreateNewVersionItem(XNavigateItem parent, TeamDefinitionArtifact teamDefHoldingVersions) { super(parent, "Create New " + (teamDefHoldingVersions != null ? teamDefHoldingVersions + " " : "") + "Version", - FrameworkImage.VERSION); + FrameworkImage.VERSION); this.teamDefHoldingVersions = teamDefHoldingVersions; } @@ -63,8 +64,8 @@ public class CreateNewVersionItem extends XNavigateItemAction { return; } EntryDialog ed = - new EntryDialog(Display.getCurrent().getActiveShell(), "Create New Version", null, "Enter Version Name", - MessageDialog.QUESTION, new String[] {"OK", "Cancel"}, 0); + new EntryDialog(Display.getCurrent().getActiveShell(), "Create New Version", null, "Enter Version Name", + MessageDialog.QUESTION, new String[] {"OK", "Cancel"}, 0); if (ed.open() == 0) { String newVer = ed.getEntry(); if (newVer.equals("")) { @@ -103,10 +104,10 @@ public class CreateNewVersionItem extends XNavigateItemAction { private void createNewVersionItemTx(SkynetTransaction transaction, TeamDefinitionArtifact teamDefHoldingVersions, String newVer) throws OseeCoreException { VersionArtifact ver = - (VersionArtifact) ArtifactTypeManager.addArtifact(AtsArtifactTypes.Version, AtsUtil.getAtsBranch(), newVer); + (VersionArtifact) ArtifactTypeManager.addArtifact(AtsArtifactTypes.Version, AtsUtil.getAtsBranch(), newVer); teamDefHoldingVersions.addRelation(AtsRelationTypes.TeamDefinitionToVersion_Version, ver); ver.persist(transaction); - ArtifactEditor.editArtifact(ver); + RendererManager.open(ver, PresentationType.GENERALIZED_EDIT); } } diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/DisplayCurrentOseeEventListeners.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/DisplayCurrentOseeEventListeners.java index 947c73cf3ad..eccd00bb53c 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/DisplayCurrentOseeEventListeners.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/DisplayCurrentOseeEventListeners.java @@ -16,9 +16,9 @@ import org.eclipse.osee.framework.logging.OseeLevel; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.event.OseeEventManager; import org.eclipse.osee.framework.ui.plugin.PluginUiImage; +import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateComposite.TableLoadOption; import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateItem; import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateItemAction; -import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateComposite.TableLoadOption; import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; import org.eclipse.osee.framework.ui.skynet.results.ResultsEditor; import org.eclipse.osee.framework.ui.skynet.results.html.XResultPage; diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/EmailTeamsItem.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/EmailTeamsItem.java index ca34af36f01..650fd82d25c 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/EmailTeamsItem.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/EmailTeamsItem.java @@ -23,9 +23,9 @@ import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.skynet.core.User; import org.eclipse.osee.framework.skynet.core.utility.Artifacts; 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.plugin.xnavigate.XNavigateItem; import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateItemAction; -import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateComposite.TableLoadOption; import org.eclipse.osee.framework.ui.skynet.FrameworkImage; import org.eclipse.swt.program.Program; diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/FirstTimeQualityMetricReportItem.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/FirstTimeQualityMetricReportItem.java index b78e43c2e9d..9cee390e642 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/FirstTimeQualityMetricReportItem.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/FirstTimeQualityMetricReportItem.java @@ -23,10 +23,10 @@ import org.eclipse.osee.ats.artifact.TeamWorkFlowArtifact; import org.eclipse.osee.ats.config.AtsCacheManager;
import org.eclipse.osee.ats.internal.AtsPlugin;
import org.eclipse.osee.ats.util.AtsArtifactTypes;
+import org.eclipse.osee.ats.util.AtsPriority.PriorityType; import org.eclipse.osee.ats.util.AtsUtil;
import org.eclipse.osee.ats.util.VersionMetrics;
import org.eclipse.osee.ats.util.VersionTeamMetrics;
-import org.eclipse.osee.ats.util.AtsPriority.PriorityType;
import org.eclipse.osee.ats.util.widgets.dialog.TeamDefinitionDialog;
import org.eclipse.osee.framework.core.enums.Active;
import org.eclipse.osee.framework.core.exception.MultipleAttributesExist;
@@ -36,9 +36,9 @@ import org.eclipse.osee.framework.logging.OseeLevel; import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.skynet.core.artifact.ArtifactTypeManager;
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.plugin.xnavigate.XNavigateItem;
import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateItemAction;
-import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateComposite.TableLoadOption;
import org.eclipse.osee.framework.ui.skynet.results.XResultData;
import org.eclipse.osee.framework.ui.skynet.results.html.XResultPage.Manipulations;
import org.eclipse.osee.framework.ui.skynet.util.ChangeType;
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/GenerateFullVersionReportItem.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/GenerateFullVersionReportItem.java index c5958739120..81fd2a9172d 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/GenerateFullVersionReportItem.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/GenerateFullVersionReportItem.java @@ -29,9 +29,9 @@ import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.logging.OseeLevel;
import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.skynet.core.artifact.ArtifactTypeManager;
+import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateComposite.TableLoadOption; import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateItem;
import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateItemAction;
-import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateComposite.TableLoadOption;
import org.eclipse.osee.framework.ui.skynet.FrameworkImage;
import org.eclipse.osee.framework.ui.skynet.results.XResultData;
import org.eclipse.osee.framework.ui.skynet.results.html.XResultPage.Manipulations;
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/GenerateGuid.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/GenerateGuid.java index 1969c637787..2a683a26637 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/GenerateGuid.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/GenerateGuid.java @@ -12,9 +12,9 @@ package org.eclipse.osee.ats.navigate; import org.eclipse.osee.ats.AtsImage;
import org.eclipse.osee.framework.jdk.core.util.GUID;
+import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateComposite.TableLoadOption; import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateItem;
import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateItemAction;
-import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateComposite.TableLoadOption;
import org.eclipse.osee.framework.ui.skynet.results.XResultData;
public class GenerateGuid extends XNavigateItemAction {
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/GenerateReviewParticipationReport.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/GenerateReviewParticipationReport.java index 6a3de61d57d..743ab57cd74 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/GenerateReviewParticipationReport.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/GenerateReviewParticipationReport.java @@ -27,9 +27,9 @@ import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.skynet.core.User;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
import org.eclipse.osee.framework.ui.plugin.util.AWorkbench;
+import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateComposite.TableLoadOption; import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateItem;
import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateItemAction;
-import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateComposite.TableLoadOption;
import org.eclipse.osee.framework.ui.skynet.artifact.massEditor.MassArtifactEditor;
import org.eclipse.osee.framework.ui.skynet.artifact.massEditor.MassArtifactEditorInput;
import org.eclipse.osee.framework.ui.skynet.widgets.XDate;
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/GenerateVersionReportItem.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/GenerateVersionReportItem.java index c09854fad03..82c86f9bdfc 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/GenerateVersionReportItem.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/GenerateVersionReportItem.java @@ -15,9 +15,9 @@ import org.eclipse.osee.ats.artifact.VersionArtifact; import org.eclipse.osee.ats.util.VersionReportJob; import org.eclipse.osee.ats.util.widgets.dialog.TeamVersionListDialog; import org.eclipse.osee.framework.core.enums.Active; +import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateComposite.TableLoadOption; import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateItem; import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateItemAction; -import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateComposite.TableLoadOption; import org.eclipse.osee.framework.ui.skynet.FrameworkImage; /** diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/ImportActionsViaSpreadsheet.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/ImportActionsViaSpreadsheet.java index d1b4581284f..cde5bf47da0 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/ImportActionsViaSpreadsheet.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/ImportActionsViaSpreadsheet.java @@ -12,9 +12,9 @@ package org.eclipse.osee.ats.navigate; import org.eclipse.jface.wizard.WizardDialog; import org.eclipse.osee.ats.util.Import.ActionImportWizard; +import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateComposite.TableLoadOption; import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateItem; import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateItemAction; -import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateComposite.TableLoadOption; import org.eclipse.osee.framework.ui.skynet.FrameworkImage; import org.eclipse.ui.PlatformUI; diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/MassEditTeamVersionItem.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/MassEditTeamVersionItem.java index 15b2647d67f..25c1951d8f0 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/MassEditTeamVersionItem.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/MassEditTeamVersionItem.java @@ -24,9 +24,9 @@ import org.eclipse.osee.framework.logging.OseeLevel; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.artifact.ArtifactTypeManager; 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.plugin.xnavigate.XNavigateItem; import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateItemAction; -import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateComposite.TableLoadOption; import org.eclipse.osee.framework.ui.skynet.artifact.massEditor.MassArtifactEditor; import org.eclipse.osee.framework.ui.swt.KeyedImage; diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/NewPeerToPeerReviewItem.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/NewPeerToPeerReviewItem.java index 82e10d70ddb..5bf8befc03f 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/NewPeerToPeerReviewItem.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/NewPeerToPeerReviewItem.java @@ -24,9 +24,9 @@ import org.eclipse.osee.framework.logging.OseeLevel; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.UserManager; import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction; +import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateComposite.TableLoadOption; import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateItem; import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateItemAction; -import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateComposite.TableLoadOption; import org.eclipse.osee.framework.ui.skynet.widgets.dialog.EntryDialog; /** diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/PublishFullVersionReportItem.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/PublishFullVersionReportItem.java index 577ce413890..7c5c76fbf18 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/PublishFullVersionReportItem.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/PublishFullVersionReportItem.java @@ -28,9 +28,9 @@ import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.jdk.core.util.Lib;
import org.eclipse.osee.framework.skynet.core.artifact.ArtifactTypeManager;
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.plugin.xnavigate.XNavigateItem;
import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateItemAction;
-import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateComposite.TableLoadOption;
import org.eclipse.swt.SWT;
import org.eclipse.swt.program.Program;
import org.eclipse.swt.widgets.Display;
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/ReleaseVersionItem.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/ReleaseVersionItem.java index 54c90c1dd69..bb76858aa33 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/ReleaseVersionItem.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/ReleaseVersionItem.java @@ -28,9 +28,9 @@ import org.eclipse.osee.framework.logging.OseeLevel; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.UserManager; 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.plugin.xnavigate.XNavigateItem; import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateItemAction; -import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateComposite.TableLoadOption; import org.eclipse.osee.framework.ui.skynet.FrameworkImage; import org.eclipse.swt.widgets.Display; diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/SubscribeByActionableItem.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/SubscribeByActionableItem.java index 8c2f07867c3..a9bb59e5544 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/SubscribeByActionableItem.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/SubscribeByActionableItem.java @@ -23,9 +23,9 @@ import org.eclipse.osee.framework.logging.OseeLevel; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.UserManager; 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.plugin.xnavigate.XNavigateItem; import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateItemAction; -import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateComposite.TableLoadOption; import org.eclipse.osee.framework.ui.skynet.FrameworkImage; /** diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/SubscribeByTeamDefinition.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/SubscribeByTeamDefinition.java index 7c36f3cc584..afb7a0d896c 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/SubscribeByTeamDefinition.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/SubscribeByTeamDefinition.java @@ -23,9 +23,9 @@ import org.eclipse.osee.framework.logging.OseeLevel; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.UserManager; 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.plugin.xnavigate.XNavigateItem; import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateItemAction; -import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateComposite.TableLoadOption; import org.eclipse.osee.framework.ui.skynet.FrameworkImage; /** diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/UpdateAtsWorkItemDefinitions.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/UpdateAtsWorkItemDefinitions.java index 905f1b7977e..3a0385e567b 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/UpdateAtsWorkItemDefinitions.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/UpdateAtsWorkItemDefinitions.java @@ -15,9 +15,9 @@ import org.eclipse.osee.ats.config.AtsDatabaseConfig; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.ui.plugin.PluginUiImage; 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.plugin.xnavigate.XNavigateItem; import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateItemAction; -import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateComposite.TableLoadOption; import org.eclipse.osee.framework.ui.skynet.results.XResultData; import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkItemDefinition.WriteType; import org.eclipse.swt.widgets.Display; diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/VisitedItems.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/VisitedItems.java index 7bd7bb5bddf..f99dafc5f3e 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/VisitedItems.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/VisitedItems.java @@ -20,9 +20,9 @@ import org.eclipse.osee.ats.world.WorldEditorSimpleProvider; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery; +import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateComposite.TableLoadOption; import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateItem; import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateItemAction; -import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateComposite.TableLoadOption; /** * @author Donald G. Dunne diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/notify/AtsNotificationNavigateItem.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/notify/AtsNotificationNavigateItem.java index 70edee92b70..37624aaaf5f 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/notify/AtsNotificationNavigateItem.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/notify/AtsNotificationNavigateItem.java @@ -23,9 +23,9 @@ import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.utility.Artifacts; import org.eclipse.osee.framework.ui.plugin.PluginUiImage; 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.plugin.xnavigate.XNavigateItem; import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateItemAction; -import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateComposite.TableLoadOption; import org.eclipse.osee.framework.ui.skynet.notify.OseeNotificationEvent; import org.eclipse.osee.framework.ui.skynet.notify.OseeNotificationManager; import org.eclipse.osee.framework.ui.skynet.notify.OseeNotifyUsersJob; diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/operation/DuplicateWorkflowBlam.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/operation/DuplicateWorkflowBlam.java index 51931ce1700..bcfce41da34 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/operation/DuplicateWorkflowBlam.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/operation/DuplicateWorkflowBlam.java @@ -18,12 +18,12 @@ import java.util.List; import java.util.Set; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.osee.ats.actions.wizard.IAtsTeamWorkflow; +import org.eclipse.osee.ats.artifact.ATSLog.LogType; +import org.eclipse.osee.ats.artifact.ActionArtifact.CreateTeamOption; import org.eclipse.osee.ats.artifact.TaskArtifact; import org.eclipse.osee.ats.artifact.TaskableStateMachineArtifact; import org.eclipse.osee.ats.artifact.TeamWorkFlowArtifact; import org.eclipse.osee.ats.artifact.TeamWorkflowExtensions; -import org.eclipse.osee.ats.artifact.ATSLog.LogType; -import org.eclipse.osee.ats.artifact.ActionArtifact.CreateTeamOption; import org.eclipse.osee.ats.editor.SMAEditor; import org.eclipse.osee.ats.internal.AtsPlugin; import org.eclipse.osee.ats.util.AtsRelationTypes; 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 443ff3d9ee7..544ba795c2e 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 @@ -14,8 +14,8 @@ import java.io.IOException; import java.util.Arrays; import java.util.Collection; import java.util.List; -import java.util.Set; import java.util.Map.Entry; +import java.util.Set; import org.eclipse.core.resources.IFile; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.osee.ats.artifact.ATSAttributes; diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsArtifactChecks.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsArtifactChecks.java index 8dd25b5df77..55faeecbdc9 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsArtifactChecks.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsArtifactChecks.java @@ -20,8 +20,8 @@ import org.eclipse.osee.ats.artifact.TeamDefinitionArtifact; import org.eclipse.osee.ats.internal.AtsPlugin;
import org.eclipse.osee.ats.world.search.ActionableItemWorldSearchItem;
import org.eclipse.osee.ats.world.search.TeamWorldSearchItem;
-import org.eclipse.osee.ats.world.search.UserRelatedToAtsObjectSearch;
import org.eclipse.osee.ats.world.search.TeamWorldSearchItem.ReleasedOption;
+import org.eclipse.osee.ats.world.search.UserRelatedToAtsObjectSearch; import org.eclipse.osee.ats.world.search.WorldSearchItem.LoadView;
import org.eclipse.osee.framework.core.enums.CoreArtifactTypes;
import org.eclipse.osee.framework.core.enums.CoreRelationTypes;
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsBranchCommitJob.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsBranchCommitJob.java index db581a4386c..bbbc07d3bec 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsBranchCommitJob.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsBranchCommitJob.java @@ -7,8 +7,8 @@ import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.osee.ats.artifact.ReviewSMArtifact;
-import org.eclipse.osee.ats.artifact.TeamWorkFlowArtifact;
import org.eclipse.osee.ats.artifact.ReviewSMArtifact.ReviewBlockType;
+import org.eclipse.osee.ats.artifact.TeamWorkFlowArtifact; import org.eclipse.osee.ats.editor.stateItem.IAtsStateItem;
import org.eclipse.osee.ats.internal.AtsPlugin;
import org.eclipse.osee.ats.util.widgets.ReviewManager;
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 96f707871d5..84a246fdf11 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 @@ -244,8 +244,8 @@ public class AtsBranchManager { message.append(branch);
isExecutionAllowed =
- MessageDialog.openQuestion(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(),
- "Delete Working Branch", message.toString());
+ MessageDialog.openQuestion(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), + "Delete Working Branch", message.toString()); }
if (isExecutionAllowed) {
@@ -254,7 +254,7 @@ public class AtsBranchManager { IStatus status = job.getResult();
if (promptUser) {
AWorkbench.popup("Delete Complete",
- status.isOK() ? "Branch delete was successful." : "Branch delete failed.\n" + status.getMessage());
+ status.isOK() ? "Branch delete was successful." : "Branch delete failed.\n" + status.getMessage()); } else {
if (!status.isOK()) {
OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, status.getMessage(), status.getException());
@@ -268,7 +268,7 @@ public class AtsBranchManager { public Collection<TransactionRecord> getFirstCommitTransaction() throws OseeCoreException {
Collection<TransactionRecord> committedTransactions =
- TransactionManager.getCommittedArtifactTransactionIds(teamArt);
+ TransactionManager.getCommittedArtifactTransactionIds(teamArt); Collection<TransactionRecord> transactionIds = new ArrayList<TransactionRecord>();
for (TransactionRecord transactionId : committedTransactions) {
@@ -350,8 +350,8 @@ public class AtsBranchManager { }
};
SimpleCheckFilteredTreeDialog ld =
- new SimpleCheckFilteredTreeDialog(title, "Select Commit Branch", new ArrayTreeContentProvider(),
- new TransactionIdLabelProvider(), sorter, 0, Integer.MAX_VALUE);
+ new SimpleCheckFilteredTreeDialog(title, "Select Commit Branch", new ArrayTreeContentProvider(), + new TransactionIdLabelProvider(), sorter, 0, Integer.MAX_VALUE); ld.setInput(transactionIds);
if (ld.open() == 0) {
@@ -376,7 +376,7 @@ public class AtsBranchManager { if (teamArt.getTargetedForVersion().getParentBranch() == null) {
return new Result(false,
- "Parent Branch not configured for Version [" + teamArt.getTargetedForVersion() + "]");
+ "Parent Branch not configured for Version [" + teamArt.getTargetedForVersion() + "]"); }
if (!teamArt.getTargetedForVersion().getParentBranch().getBranchType().isBaselineBranch()) {
return new Result(false, "Parent Branch must be of Baseline branch type. See Admin for configuration.");
@@ -391,7 +391,7 @@ public class AtsBranchManager { if (teamArt.getTeamDefinition().getParentBranch() == null) {
return new Result(false,
- "Parent Branch not configured for Team Definition [" + teamArt.getTeamDefinition() + "]");
+ "Parent Branch not configured for Team Definition [" + teamArt.getTeamDefinition() + "]"); }
if (!teamArt.getTeamDefinition().getParentBranch().getBranchType().isBaselineBranch()) {
return new Result(false, "Parent Branch must be of Baseline branch type. See Admin for configuration.");
@@ -415,7 +415,7 @@ public class AtsBranchManager { if (teamArt.getTargetedForVersion().getParentBranch() == null) {
return new Result(false,
- "Parent Branch not configured for Version [" + teamArt.getTargetedForVersion() + "]");
+ "Parent Branch not configured for Version [" + teamArt.getTargetedForVersion() + "]"); }
return Result.TrueResult;
@@ -427,7 +427,7 @@ public class AtsBranchManager { if (teamArt.getTeamDefinition().getParentBranch() == null) {
return new Result(false,
- "Parent Branch not configured for Team Definition [" + teamArt.getTeamDefinition() + "]");
+ "Parent Branch not configured for Team Definition [" + teamArt.getTeamDefinition() + "]"); }
return Result.TrueResult;
}
@@ -504,7 +504,7 @@ public class AtsBranchManager { return null;
} else if (branches.size() > 1) {
throw new MultipleBranchesExist(
- "Unexpected multiple associated un-deleted working branches found for workflow " + teamArt.getHumanReadableId());
+ "Unexpected multiple associated un-deleted working branches found for workflow " + teamArt.getHumanReadableId()); } else {
return branches.get(0);
}
@@ -637,7 +637,7 @@ public class AtsBranchManager { Branch parentBranch = getConfiguredBranchForWorkflow();
if (parentBranch == null) {
String errorStr =
- "Parent Branch can not be determined.\n\nPlease specify " + "parent branch through Version Artifact or Team Definition Artifact.\n\n" + "Contact your team lead to configure this.";
+ "Parent Branch can not be determined.\n\nPlease specify " + "parent branch through Version Artifact or Team Definition Artifact.\n\n" + "Contact your team lead to configure this."; if (popup) {
AWorkbench.popup("ERROR", errorStr);
}
@@ -652,9 +652,9 @@ public class AtsBranchManager { }
// Retrieve parent branch to create working branch from
if (popup && !MessageDialog.openConfirm(
- Display.getCurrent().getActiveShell(),
- "Create Working Branch",
- "Create a working branch from parent branch\n\n\"" + parentBranch.getName() + "\"?\n\n" + "NOTE: Working branches are necessary when OSEE Artifact changes " + "are made during implementation.")) {
+ Display.getCurrent().getActiveShell(), + "Create Working Branch", + "Create a working branch from parent branch\n\n\"" + parentBranch.getName() + "\"?\n\n" + "NOTE: Working branches are necessary when OSEE Artifact changes " + "are made during implementation.")) { return Result.FalseResult;
}
createWorkingBranch(pageId, parentBranch);
@@ -676,14 +676,14 @@ public class AtsBranchManager { if (eventType != null && eventType == stateEventType) {
if (ruleId.equals(AtsAddDecisionReviewRule.ID)) {
DecisionReviewArtifact decArt =
- AtsAddDecisionReviewRule.createNewDecisionReview(workRuleDef, transaction, teamArt,
- DecisionRuleOption.TransitionToDecision);
+ AtsAddDecisionReviewRule.createNewDecisionReview(workRuleDef, transaction, teamArt, + DecisionRuleOption.TransitionToDecision); if (decArt != null) {
decArt.persist(transaction);
}
} else if (ruleId.equals(AtsAddPeerToPeerReviewRule.ID)) {
PeerToPeerReviewArtifact peerArt =
- AtsAddPeerToPeerReviewRule.createNewPeerToPeerReview(workRuleDef, teamArt, transaction);
+ AtsAddPeerToPeerReviewRule.createNewPeerToPeerReview(workRuleDef, teamArt, transaction); if (peerArt != null) {
peerArt.persist(transaction);
}
@@ -728,7 +728,7 @@ public class AtsBranchManager { BranchManager.createWorkingBranch(parentBranch, branchName, teamArt);
// Create reviews as necessary
SkynetTransaction transaction =
- new SkynetTransaction(AtsUtil.getAtsBranch(), "Create Reviews upon Transition");
+ new SkynetTransaction(AtsUtil.getAtsBranch(), "Create Reviews upon Transition"); createNecessaryBranchEventReviews(StateEventType.CreateBranch, teamArt, transaction);
transaction.execute();
return Status.OK_STATUS;
@@ -748,15 +748,14 @@ public class AtsBranchManager { /**
* @param commitPopup if true, pop-up errors associated with results
* @param overrideStateValidation if true, don't do checks to see if commit can be performed. This should only be
- * used for developmental testing or automation
+ * used for developmental testing or automation */
public Job commitWorkingBranch(final boolean commitPopup, final boolean overrideStateValidation, Branch destinationBranch, boolean archiveWorkingBranch) throws OseeCoreException {
if (isBranchInCommit()) {
throw new OseeCoreException("Branch is currently being committed.");
}
Job job =
- new AtsBranchCommitJob(teamArt, commitPopup, overrideStateValidation, destinationBranch,
- archiveWorkingBranch);
+ new AtsBranchCommitJob(teamArt, commitPopup, overrideStateValidation, destinationBranch, archiveWorkingBranch); Operations.scheduleJob(job, true, Job.LONG, null);
return job;
}
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 3480513cb58..20eb11d4723 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 @@ -67,8 +67,9 @@ import org.eclipse.osee.framework.ui.plugin.util.Result; import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateComposite.TableLoadOption;
import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin;
import org.eclipse.osee.framework.ui.skynet.XFormToolkit;
-import org.eclipse.osee.framework.ui.skynet.artifact.editor.ArtifactEditor;
import org.eclipse.osee.framework.ui.skynet.ats.OseeEditor;
+import org.eclipse.osee.framework.ui.skynet.render.PresentationType; +import org.eclipse.osee.framework.ui.skynet.render.RendererManager; import org.eclipse.osee.framework.ui.swt.ALayout;
import org.eclipse.osee.framework.ui.swt.ImageManager;
import org.eclipse.osee.framework.ui.swt.KeyedImage;
@@ -99,7 +100,7 @@ public final class AtsUtil { public final static String activeColor = "#EEEEEE";
private static BranchGuidEventFilter branchGuidEventFilter;
private static ArtifactTypeEventFilter atsObjectArtifactTypesFilter, reviewArtifactTypesFilter,
- teamWorkflowArtifactTypesFilter, workItemArtifactTypesFilter;
+ teamWorkflowArtifactTypesFilter, workItemArtifactTypesFilter; private static List<IEventFilter> atsObjectEventFilter;
private AtsUtil() {
@@ -229,10 +230,6 @@ public final class AtsUtil { }
}
- public static void open(String guid, OseeEditor view) {
- openArtifact(guid, view);
- }
-
public static void openArtifact(String guidOrHrid, Integer branchId, OseeEditor view) {
try {
Branch branch = BranchManager.getBranch(branchId);
@@ -247,6 +244,7 @@ public final class AtsUtil { * Only to be used by browser. Use open (artifact) instead.
*
* @param guid
+ * @throws OseeCoreException */
public static void openArtifact(String guid, OseeEditor view) {
AtsBulkLoad.loadConfig(false);
@@ -258,16 +256,20 @@ public final class AtsUtil { return;
}
- if (view == OseeEditor.ActionEditor) {
- if (artifact instanceof StateMachineArtifact || artifact instanceof ActionArtifact) {
- openATSAction(artifact, AtsOpenOption.OpenOneOrPopupSelect);
- } else {
- ArtifactEditor.editArtifact(artifact);
+ try { + if (view == OseeEditor.ActionEditor) { + if (artifact instanceof StateMachineArtifact || artifact instanceof ActionArtifact) { + openATSAction(artifact, AtsOpenOption.OpenOneOrPopupSelect); + } else { + RendererManager.open(artifact, PresentationType.GENERALIZED_EDIT); + } + } else if (view == OseeEditor.ArtifactEditor) { + RendererManager.open(artifact, PresentationType.GENERALIZED_EDIT); + } else if (view == OseeEditor.ArtifactHyperViewer) { + AWorkbench.popup("ERROR", "Unimplemented"); }
- } else if (view == OseeEditor.ArtifactEditor) {
- ArtifactEditor.editArtifact(artifact);
- } else if (view == OseeEditor.ArtifactHyperViewer) {
- AWorkbench.popup("ERROR", "Unimplemented");
+ } catch (OseeCoreException ex) { + OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex); }
}
@@ -275,11 +277,11 @@ public final class AtsUtil { // Ensure actionable item is configured for ATS before continuing
try {
AtsCacheManager.getSoleArtifactByName(ArtifactTypeManager.getType(AtsArtifactTypes.ActionableItem),
- actionableItemName);
+ actionableItemName); } catch (ArtifactDoesNotExist ex) {
AWorkbench.popup(
- "Configuration Error",
- "Actionable Item \"" + actionableItemName + "\" is not configured for ATS tracking.\n\nAction can not be created.");
+ "Configuration Error", + "Actionable Item \"" + actionableItemName + "\" is not configured for ATS tracking.\n\nAction can not be created."); return;
} catch (Exception ex) {
OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex);
@@ -315,7 +317,7 @@ public final class AtsUtil { }
} else if (atsOpenOption == AtsOpenOption.AtsWorld) {
WorldEditor.open(new WorldEditorSimpleProvider("Action " + actionArt.getHumanReadableId(),
- Arrays.asList(actionArt)));
+ Arrays.asList(actionArt))); } else if (atsOpenOption == AtsOpenOption.OpenOneOrPopupSelect) {
if (teams.size() == 1) {
SMAEditor.editArtifact(teams.iterator().next());
@@ -367,7 +369,7 @@ public final class AtsUtil { for (Artifact art : artifacts) {
if (art.isOfType(CoreArtifactTypes.UniversalGroup)) {
WorldEditor.open(new WorldEditorUISearchItemProvider(new GroupWorldSearchItem(art), null,
- TableLoadOption.None));
+ TableLoadOption.None)); } else {
otherArts.add(art);
}
@@ -422,14 +424,13 @@ public final class AtsUtil { * @param active state to validate against; Both will return all artifacts matching type
* @param clazz type of artifacts to consider; null for all
* @return set of Artifacts of type clazz that match the given active state of the "Active" or "ats.Active" attribute
- * value. If no attribute exists, Active == true; If does exist then attribute value "yes" == true, "no" ==
- * false.
+ * value. If no attribute exists, Active == true; If does exist then attribute value "yes" == true, "no" == false. */
@SuppressWarnings("unchecked")
public static <A extends Artifact> List<A> getActive(Collection<A> artifacts, Active active, Class<? extends Artifact> clazz) throws OseeCoreException {
List<A> results = new ArrayList<A>();
Collection<? extends Artifact> artsOfClass =
- clazz != null ? Collections.castMatching(clazz, artifacts) : artifacts;
+ clazz != null ? Collections.castMatching(clazz, artifacts) : artifacts; for (Artifact art : artsOfClass) {
if (active == Active.Both) {
results.add((A) art);
@@ -469,9 +470,8 @@ public final class AtsUtil { public static ArtifactTypeEventFilter getAtsObjectArtifactTypeEventFilter() {
if (atsObjectArtifactTypesFilter == null) {
atsObjectArtifactTypesFilter =
- new ArtifactTypeEventFilter(AtsArtifactTypes.TeamWorkflow, AtsArtifactTypes.Action,
- AtsArtifactTypes.Task, AtsArtifactTypes.Goal, AtsArtifactTypes.PeerToPeerReview,
- AtsArtifactTypes.DecisionReview);
+ new ArtifactTypeEventFilter(AtsArtifactTypes.TeamWorkflow, AtsArtifactTypes.Action, AtsArtifactTypes.Task, + AtsArtifactTypes.Goal, AtsArtifactTypes.PeerToPeerReview, AtsArtifactTypes.DecisionReview); }
return atsObjectArtifactTypesFilter;
}
@@ -486,7 +486,7 @@ public final class AtsUtil { public static ArtifactTypeEventFilter getReviewArtifactTypeEventFilter() {
if (reviewArtifactTypesFilter == null) {
reviewArtifactTypesFilter =
- new ArtifactTypeEventFilter(AtsArtifactTypes.PeerToPeerReview, AtsArtifactTypes.DecisionReview);
+ new ArtifactTypeEventFilter(AtsArtifactTypes.PeerToPeerReview, AtsArtifactTypes.DecisionReview); }
return reviewArtifactTypesFilter;
}
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/DoesNotWorkItemAts.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/DoesNotWorkItemAts.java index f3246a86c48..c6419f7676d 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/DoesNotWorkItemAts.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/DoesNotWorkItemAts.java @@ -17,8 +17,8 @@ import java.util.HashMap; import java.util.HashSet;
import java.util.List;
import java.util.Map;
-import java.util.Set;
import java.util.Map.Entry;
+import java.util.Set; import java.util.logging.Level;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -54,9 +54,9 @@ import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction; import org.eclipse.osee.framework.ui.plugin.PluginUiImage;
import org.eclipse.osee.framework.ui.plugin.util.AWorkbench;
import org.eclipse.osee.framework.ui.plugin.util.Result;
+import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateComposite.TableLoadOption; import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateItem;
import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateItemAction;
-import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateComposite.TableLoadOption;
import org.eclipse.osee.framework.ui.skynet.results.XResultData;
import org.eclipse.osee.framework.ui.skynet.util.ElapsedTime;
import org.eclipse.swt.widgets.Display;
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 4fbe019b5e8..1117eb04434 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 @@ -21,10 +21,10 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.osee.ats.artifact.ATSAttributes;
import org.eclipse.osee.ats.artifact.StateMachineArtifact;
+import org.eclipse.osee.ats.artifact.StateMachineArtifact.TransitionOption; import org.eclipse.osee.ats.artifact.TaskArtifact;
import org.eclipse.osee.ats.artifact.TaskableStateMachineArtifact;
import org.eclipse.osee.ats.artifact.TeamWorkFlowArtifact;
-import org.eclipse.osee.ats.artifact.StateMachineArtifact.TransitionOption;
import org.eclipse.osee.ats.internal.AtsPlugin;
import org.eclipse.osee.ats.util.AtsNotifyUsers;
import org.eclipse.osee.ats.util.AtsUtil;
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 5c04a7f11ee..bb793cf1705 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 @@ -17,11 +17,11 @@ import java.util.List; import java.util.logging.Level;
import org.eclipse.osee.ats.artifact.ATSArtifact;
import org.eclipse.osee.ats.artifact.ATSLog;
+import org.eclipse.osee.ats.artifact.ATSLog.LogType; import org.eclipse.osee.ats.artifact.LogItem;
import org.eclipse.osee.ats.artifact.StateMachineArtifact;
import org.eclipse.osee.ats.artifact.TaskArtifact;
import org.eclipse.osee.ats.artifact.TeamWorkFlowArtifact;
-import org.eclipse.osee.ats.artifact.ATSLog.LogType;
import org.eclipse.osee.ats.internal.AtsPlugin;
import org.eclipse.osee.ats.util.widgets.SMAState;
import org.eclipse.osee.framework.core.enums.CoreRelationTypes;
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/VersionTeamMetrics.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/VersionTeamMetrics.java index 8c3c3f8ea09..46071f516d2 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/VersionTeamMetrics.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/VersionTeamMetrics.java @@ -18,8 +18,8 @@ import java.util.HashMap; import java.util.HashSet;
import java.util.List;
import java.util.Map;
-import java.util.Set;
import java.util.Map.Entry;
+import java.util.Set; import org.eclipse.osee.ats.artifact.TeamDefinitionArtifact;
import org.eclipse.osee.ats.artifact.TeamWorkFlowArtifact;
import org.eclipse.osee.ats.artifact.VersionArtifact;
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/ReviewManager.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/ReviewManager.java index 56347585e69..a9c1e9b1f5d 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/ReviewManager.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/ReviewManager.java @@ -16,13 +16,13 @@ import java.util.HashSet; import java.util.Set; import java.util.logging.Level; import org.eclipse.osee.ats.artifact.ATSAttributes; +import org.eclipse.osee.ats.artifact.ATSLog.LogType; import org.eclipse.osee.ats.artifact.DecisionReviewArtifact; import org.eclipse.osee.ats.artifact.PeerToPeerReviewArtifact; import org.eclipse.osee.ats.artifact.ReviewSMArtifact; -import org.eclipse.osee.ats.artifact.TeamWorkFlowArtifact; -import org.eclipse.osee.ats.artifact.ATSLog.LogType; import org.eclipse.osee.ats.artifact.ReviewSMArtifact.ReviewBlockType; import org.eclipse.osee.ats.artifact.StateMachineArtifact.TransitionOption; +import org.eclipse.osee.ats.artifact.TeamWorkFlowArtifact; import org.eclipse.osee.ats.internal.AtsPlugin; import org.eclipse.osee.ats.util.AtsArtifactTypes; import org.eclipse.osee.ats.util.AtsRelationTypes; diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/XCurrentStateDam.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/XCurrentStateDam.java index 8bfa8ad430d..a31a7b9ef24 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/XCurrentStateDam.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/XCurrentStateDam.java @@ -13,9 +13,9 @@ package org.eclipse.osee.ats.util.widgets; import java.util.Date;
import java.util.Set;
import org.eclipse.osee.ats.artifact.ATSAttributes;
+import org.eclipse.osee.ats.artifact.ATSLog.LogType; import org.eclipse.osee.ats.artifact.LogItem;
import org.eclipse.osee.ats.artifact.StateMachineArtifact;
-import org.eclipse.osee.ats.artifact.ATSLog.LogType;
import org.eclipse.osee.ats.util.AtsUtil;
import org.eclipse.osee.ats.util.StateManager;
import org.eclipse.osee.framework.core.exception.OseeArgumentException;
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 1272b493ade..ad8f810598a 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 @@ -19,9 +19,9 @@ import org.eclipse.jface.action.MenuManager; import org.eclipse.jface.action.Separator;
import org.eclipse.nebula.widgets.xviewer.IXViewerFactory;
import org.eclipse.nebula.widgets.xviewer.XPromptChange;
+import org.eclipse.nebula.widgets.xviewer.XPromptChange.Option; import org.eclipse.nebula.widgets.xviewer.XViewer;
import org.eclipse.nebula.widgets.xviewer.XViewerColumn;
-import org.eclipse.nebula.widgets.xviewer.XPromptChange.Option;
import org.eclipse.nebula.widgets.xviewer.util.EnumStringSingleSelectionDialog;
import org.eclipse.osee.ats.internal.AtsPlugin;
import org.eclipse.osee.ats.util.widgets.defect.DefectItem.Disposition;
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/AtsWorkflowConfigEditor.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/AtsWorkflowConfigEditor.java index 0d634ce4fd2..e5a7ab80885 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/AtsWorkflowConfigEditor.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/AtsWorkflowConfigEditor.java @@ -68,7 +68,6 @@ import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction; import org.eclipse.osee.framework.ui.plugin.util.AWorkbench;
import org.eclipse.osee.framework.ui.plugin.util.Displays;
import org.eclipse.osee.framework.ui.plugin.util.Result;
-import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin;
import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkFlowDefinition;
import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkPageDefinition;
import org.eclipse.swt.widgets.Composite;
@@ -100,19 +99,6 @@ public class AtsWorkflowConfigEditor extends GraphicalEditorWithFlyoutPalette im OseeEventManager.addListener(this);
}
- public static void editWorkflow(final WorkFlowDefinition workflow) {
- Displays.ensureInDisplayThread(new Runnable() {
- public void run() {
- try {
- AWorkbench.getActivePage().openEditor(new AtsWorkflowConfigEditorInput(workflow),
- AtsWorkflowConfigEditor.EDITOR_ID);
- } catch (Exception ex) {
- OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex);
- }
- }
- });
- }
-
/**
* Configure the graphical viewer before it receives contents.
* <p>
@@ -200,10 +186,11 @@ public class AtsWorkflowConfigEditor extends GraphicalEditorWithFlyoutPalette im AWorkbench.popup("ERROR", "Not implemented yet");
}
- @SuppressWarnings("unchecked")
@Override
public Object getAdapter(Class type) {
- if (type == IContentOutlinePage.class) return new ShapesOutlinePage(new TreeViewer());
+ if (type == IContentOutlinePage.class) { + return new ShapesOutlinePage(new TreeViewer()); + } return super.getAdapter(type);
}
@@ -213,7 +200,9 @@ public class AtsWorkflowConfigEditor extends GraphicalEditorWithFlyoutPalette im @Override
protected PaletteRoot getPaletteRoot() {
- if (PALETTE_MODEL == null) PALETTE_MODEL = AtsWorkflowConfigEditorPaletteFactory.createPalette(this);
+ if (PALETTE_MODEL == null) { + PALETTE_MODEL = AtsWorkflowConfigEditorPaletteFactory.createPalette(this); + } return PALETTE_MODEL;
}
@@ -284,7 +273,7 @@ public class AtsWorkflowConfigEditor extends GraphicalEditorWithFlyoutPalette im pageShape.setLocation(new Point(50, yLoc += 90));
}
pageShape.setStartPage(startPage.getId().equals(pageShape.getId()) || pageShape.getId().endsWith(
- startPage.getId()));
+ startPage.getId())); diagram.addChild(pageShape);
}
@@ -292,7 +281,7 @@ public class AtsWorkflowConfigEditor extends GraphicalEditorWithFlyoutPalette im for (WorkPageDefinition workPageDefinition : workflowDef.getPagesOrdered()) {
WorkPageShape pageShape = getWorkPageShape(workPageDefinition);
AtsWorkPage atsWorkPage =
- new AtsWorkPage(workflowDef, workPageDefinition, null, ATSXWidgetOptionResolver.getInstance());
+ new AtsWorkPage(workflowDef, workPageDefinition, null, ATSXWidgetOptionResolver.getInstance()); // Handle to pages
Set<WorkPageDefinition> toPages = new HashSet<WorkPageDefinition>();
toPages.addAll(atsWorkPage.getToPages());
@@ -332,7 +321,7 @@ public class AtsWorkflowConfigEditor extends GraphicalEditorWithFlyoutPalette im for (Object object : getModel().getChildren()) {
if (object instanceof WorkPageShape) {
if (((WorkPageShape) object).getId().equals(page.getId()) || (page.getParentId() != null && ((WorkPageShape) object).getId().equals(
- page.getParentId()))) {
+ page.getParentId()))) { return (WorkPageShape) object;
}
}
@@ -362,10 +351,10 @@ public class AtsWorkflowConfigEditor extends GraphicalEditorWithFlyoutPalette im getViewer().setEditPartFactory(new ShapesTreeEditPartFactory());
// configure & add context menu to viewer
ContextMenuProvider cmProvider =
- new AtsWorkflowConfigEditorContextMenuProvider(getViewer(), getActionRegistry());
+ new AtsWorkflowConfigEditorContextMenuProvider(getViewer(), getActionRegistry()); getViewer().setContextMenu(cmProvider);
getSite().registerContextMenu("org.eclipse.osee.ats.config.editor.contextmenu", cmProvider,
- getSite().getSelectionProvider());
+ getSite().getSelectionProvider()); // hook outline viewer
getSelectionSynchronizer().addViewer(getViewer());
// initialize outline viewer with model
@@ -417,7 +406,9 @@ public class AtsWorkflowConfigEditor extends GraphicalEditorWithFlyoutPalette im @Override
public void handleFrameworkTransactionEvent(Sender sender, FrameworkTransactionData transData) throws OseeCoreException {
- if (transData.branchId != AtsUtil.getAtsBranch().getId()) return;
+ if (transData.branchId != AtsUtil.getAtsBranch().getId()) { + return; + } for (Artifact delArt : transData.cacheDeletedArtifacts) {
if (delArt.isOfType(CoreArtifactTypes.WorkFlowDefinition)) {
if (delArt.getName().equals(getPartName())) {
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/AtsWorkflowConfigRenderer.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/AtsWorkflowConfigRenderer.java index 8b36a9e7373..8ccfaa761bf 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/AtsWorkflowConfigRenderer.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/AtsWorkflowConfigRenderer.java @@ -12,18 +12,22 @@ package org.eclipse.osee.ats.workflow.editor; import java.util.ArrayList; import java.util.List; +import org.eclipse.core.runtime.CoreException; import org.eclipse.osee.ats.AtsImage; -import org.eclipse.osee.ats.internal.AtsPlugin; import org.eclipse.osee.framework.core.enums.CoreArtifactTypes; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.logging.OseeLevel; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; +import org.eclipse.osee.framework.ui.plugin.util.AWorkbench; +import org.eclipse.osee.framework.ui.plugin.util.Displays; +import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; import org.eclipse.osee.framework.ui.skynet.render.DefaultArtifactRenderer; import org.eclipse.osee.framework.ui.skynet.render.PresentationType; import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkFlowDefinition; import org.eclipse.osee.framework.ui.swt.ImageManager; import org.eclipse.swt.graphics.Image; +import org.eclipse.ui.IEditorInput; /** * @author Donald G. Dunne @@ -43,19 +47,6 @@ public class AtsWorkflowConfigRenderer extends DefaultArtifactRenderer { } @Override - public void open(List<Artifact> artifacts) throws OseeCoreException { - try { - for (Artifact artifact : artifacts) { - if (artifact.isOfType(CoreArtifactTypes.WorkFlowDefinition)) { - AtsWorkflowConfigEditor.editWorkflow(new WorkFlowDefinition(artifact)); - } - } - } catch (Exception ex) { - OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex); - } - } - - @Override public AtsWorkflowConfigRenderer newInstance() throws OseeCoreException { return new AtsWorkflowConfigRenderer(); } @@ -69,11 +60,6 @@ public class AtsWorkflowConfigRenderer extends DefaultArtifactRenderer { } @Override - public void preview(List<Artifact> artifacts) throws OseeCoreException { - open(artifacts); - } - - @Override public int minimumRanking() throws OseeCoreException { return NO_MATCH; } @@ -87,4 +73,20 @@ public class AtsWorkflowConfigRenderer extends DefaultArtifactRenderer { return commandIds; } -} + @Override + public void open(final List<Artifact> artifacts, PresentationType presentationType) { + Displays.ensureInDisplayThread(new Runnable() { + @Override + public void run() { + for (Artifact artifact : artifacts) { + try { + IEditorInput input = new AtsWorkflowConfigEditorInput(new WorkFlowDefinition(artifact)); + AWorkbench.getActivePage().openEditor(input, AtsWorkflowConfigEditor.EDITOR_ID); + } catch (CoreException ex) { + OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); + } + } + } + }); + } +}
\ No newline at end of file diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/actions/EditAction.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/actions/EditAction.java index 6cb2cf27acf..9b39b56f5af 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/actions/EditAction.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/actions/EditAction.java @@ -23,7 +23,8 @@ 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.plugin.util.AWorkbench;
-import org.eclipse.osee.framework.ui.skynet.artifact.editor.ArtifactEditor;
+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.widgets.workflow.WorkFlowDefinition;
import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkItemDefinitionFactory;
import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkPageDefinition;
@@ -47,7 +48,7 @@ public class EditAction extends Action { @Override
public void run() {
ISelectionProvider selectionProvider =
- AWorkbench.getActivePage().getActivePart().getSite().getSelectionProvider();
+ AWorkbench.getActivePage().getActivePart().getSite().getSelectionProvider(); if (selectionProvider != null && selectionProvider.getSelection() instanceof IStructuredSelection) {
IStructuredSelection structuredSelection = (IStructuredSelection) selectionProvider.getSelection();
@@ -65,7 +66,7 @@ public class EditAction extends Action { artifact = WorkItemDefinitionFactory.getWorkItemDefinitionArtifact(def.getId());
}
if (artifact != null) {
- ArtifactEditor.editArtifact(artifact);
+ RendererManager.open(artifact, PresentationType.GENERALIZED_EDIT); return;
}
}
@@ -80,11 +81,11 @@ public class EditAction extends Action { } else {
String id = shape.getId();
artifact = WorkItemDefinitionFactory.getWorkItemDefinitionArtifact(id);
- ArtifactEditor.editArtifact(artifact);
+ RendererManager.open(artifact, PresentationType.GENERALIZED_EDIT); return;
}
if (artifact != null) {
- ArtifactEditor.editArtifact(artifact);
+ RendererManager.open(artifact, PresentationType.GENERALIZED_EDIT); return;
}
}
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/model/WorkPageShape.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/model/WorkPageShape.java index f9a442da3bd..93a8a203b1a 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/model/WorkPageShape.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/model/WorkPageShape.java @@ -23,9 +23,9 @@ import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction;
import org.eclipse.osee.framework.ui.plugin.util.Result;
import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkItemAttributes;
+import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkItemDefinition.WriteType; import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkItemDefinitionFactory;
import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkPageDefinition;
-import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkItemDefinition.WriteType;
import org.eclipse.ui.views.properties.ComboBoxPropertyDescriptor;
import org.eclipse.ui.views.properties.IPropertyDescriptor;
import org.eclipse.ui.views.properties.TextPropertyDescriptor;
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/model/WorkflowDiagram.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/model/WorkflowDiagram.java index 9a7ed5c0a26..9f20577f834 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/model/WorkflowDiagram.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/model/WorkflowDiagram.java @@ -23,11 +23,11 @@ import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction;
import org.eclipse.osee.framework.ui.plugin.util.Result;
import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkFlowDefinition;
+import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkFlowDefinition.TransitionType; import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkItemAttributes;
+import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkItemDefinition.WriteType; import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkItemDefinitionFactory;
import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkPageDefinition;
-import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkFlowDefinition.TransitionType;
-import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkItemDefinition.WriteType;
/**
* A container for multiple shapes. This is the "root" of the model data structure.
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/wizard/AtsWorkflowConfigCreationWizard.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/wizard/AtsWorkflowConfigCreationWizard.java index a71d02b8930..a14d3f11f11 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/wizard/AtsWorkflowConfigCreationWizard.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/wizard/AtsWorkflowConfigCreationWizard.java @@ -19,7 +19,6 @@ import org.eclipse.osee.ats.artifact.TeamDefinitionArtifact; import org.eclipse.osee.ats.config.AtsConfigManager;
import org.eclipse.osee.ats.internal.AtsPlugin;
import org.eclipse.osee.ats.util.AtsUtil;
-import org.eclipse.osee.ats.workflow.editor.AtsWorkflowConfigEditor;
import org.eclipse.osee.ats.workflow.item.AtsWorkDefinitions;
import org.eclipse.osee.ats.workflow.item.AtsWorkDefinitions.RuleWorkItemId;
import org.eclipse.osee.ats.workflow.page.AtsCancelledWorkPageDefinition;
@@ -32,11 +31,13 @@ import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction;
import org.eclipse.osee.framework.ui.plugin.util.AWorkbench;
+import org.eclipse.osee.framework.ui.skynet.render.PresentationType; +import org.eclipse.osee.framework.ui.skynet.render.RendererManager; import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkFlowDefinition;
-import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkItemDefinitionFactory;
-import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkPageDefinition;
import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkFlowDefinition.TransitionType;
import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkItemDefinition.WriteType;
+import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkItemDefinitionFactory; +import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkPageDefinition; import org.eclipse.ui.INewWizard;
import org.eclipse.ui.IWorkbench;
@@ -84,8 +85,7 @@ public class AtsWorkflowConfigCreationWizard extends Wizard implements INewWizar }
transaction.execute();
- AtsWorkflowConfigEditor.editWorkflow(workflow);
-
+ RendererManager.open(workflow.getArtifact(), PresentationType.SPECIALIZED_EDIT); } catch (Exception ex) {
OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex);
}
@@ -119,7 +119,7 @@ public class AtsWorkflowConfigCreationWizard extends Wizard implements INewWizar public static WorkflowData generateSimpleWorkflow(String namespace, SkynetTransaction transaction, TeamDefinitionArtifact teamDef) throws OseeCoreException {
WorkFlowDefinition workflow = new WorkFlowDefinition(namespace, namespace, null);
WorkPageDefinition endorsePage =
- new WorkPageDefinition("Endorse", namespace + ".Endorse", AtsEndorseWorkPageDefinition.ID);
+ new WorkPageDefinition("Endorse", namespace + ".Endorse", AtsEndorseWorkPageDefinition.ID); workflow.setStartPageId(endorsePage.getPageName());
@@ -129,16 +129,16 @@ public class AtsWorkflowConfigCreationWizard extends Wizard implements INewWizar implementPage.addWorkItem(ATSAttributes.RESOLUTION_ATTRIBUTE.getStoreName());
WorkPageDefinition completedPage =
- new WorkPageDefinition("Completed", namespace + ".Completed", AtsCompletedWorkPageDefinition.ID);
+ new WorkPageDefinition("Completed", namespace + ".Completed", AtsCompletedWorkPageDefinition.ID); WorkPageDefinition cancelledPage =
- new WorkPageDefinition("Cancelled", namespace + ".Cancelled", AtsCancelledWorkPageDefinition.ID);
+ new WorkPageDefinition("Cancelled", namespace + ".Cancelled", AtsCancelledWorkPageDefinition.ID); workflow.addPageTransition(endorsePage.getPageName(), implementPage.getPageName(), TransitionType.ToPageAsDefault);
workflow.addPageTransition(implementPage.getPageName(), endorsePage.getPageName(), TransitionType.ToPageAsReturn);
workflow.addPageTransition(cancelledPage.getPageName(), endorsePage.getPageName(), TransitionType.ToPageAsReturn);
workflow.addPageTransition(implementPage.getPageName(), completedPage.getPageName(),
- TransitionType.ToPageAsDefault);
+ TransitionType.ToPageAsDefault); workflow.addPageTransition(endorsePage.getPageName(), cancelledPage.getPageName(), TransitionType.ToPage);
List<Artifact> artifacts = new ArrayList<Artifact>();
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/item/AtsAddDecisionReviewRule.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/item/AtsAddDecisionReviewRule.java index 72bf2bfd7b3..60418b08f26 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/item/AtsAddDecisionReviewRule.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/item/AtsAddDecisionReviewRule.java @@ -13,10 +13,10 @@ package org.eclipse.osee.ats.workflow.item; import java.util.Arrays;
import java.util.Collection;
import java.util.logging.Level;
-import org.eclipse.osee.ats.artifact.DecisionReviewArtifact;
-import org.eclipse.osee.ats.artifact.TeamWorkFlowArtifact;
import org.eclipse.osee.ats.artifact.ATSLog.LogType;
+import org.eclipse.osee.ats.artifact.DecisionReviewArtifact; import org.eclipse.osee.ats.artifact.ReviewSMArtifact.ReviewBlockType;
+import org.eclipse.osee.ats.artifact.TeamWorkFlowArtifact; import org.eclipse.osee.ats.internal.AtsPlugin;
import org.eclipse.osee.ats.util.widgets.ReviewManager;
import org.eclipse.osee.framework.core.exception.OseeArgumentException;
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/item/AtsAddPeerToPeerReviewRule.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/item/AtsAddPeerToPeerReviewRule.java index 18ca8bd8d2c..4c86b24eaa0 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/item/AtsAddPeerToPeerReviewRule.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/item/AtsAddPeerToPeerReviewRule.java @@ -14,10 +14,10 @@ import java.util.Collection; import java.util.Date;
import java.util.logging.Level;
import org.eclipse.osee.ats.artifact.ATSAttributes;
-import org.eclipse.osee.ats.artifact.PeerToPeerReviewArtifact;
-import org.eclipse.osee.ats.artifact.TeamWorkFlowArtifact;
import org.eclipse.osee.ats.artifact.ATSLog.LogType;
+import org.eclipse.osee.ats.artifact.PeerToPeerReviewArtifact; import org.eclipse.osee.ats.artifact.ReviewSMArtifact.ReviewBlockType;
+import org.eclipse.osee.ats.artifact.TeamWorkFlowArtifact; import org.eclipse.osee.ats.internal.AtsPlugin;
import org.eclipse.osee.ats.util.widgets.ReviewManager;
import org.eclipse.osee.framework.core.exception.OseeArgumentException;
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/item/AtsCancellationReasonStateWorkItem.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/item/AtsCancellationReasonStateWorkItem.java index 18234dade0b..5e17e937674 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/item/AtsCancellationReasonStateWorkItem.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/item/AtsCancellationReasonStateWorkItem.java @@ -10,9 +10,9 @@ *******************************************************************************/
package org.eclipse.osee.ats.workflow.item;
+import org.eclipse.osee.ats.artifact.ATSLog.LogType; import org.eclipse.osee.ats.artifact.LogItem;
import org.eclipse.osee.ats.artifact.StateMachineArtifact;
-import org.eclipse.osee.ats.artifact.ATSLog.LogType;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.ui.skynet.widgets.XOption;
import org.eclipse.osee.framework.ui.skynet.widgets.workflow.DynamicXWidgetLayoutData;
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/item/AtsCancelledFromStateWorkItem.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/item/AtsCancelledFromStateWorkItem.java index 738fce16aa8..01e7c05ffe1 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/item/AtsCancelledFromStateWorkItem.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/item/AtsCancelledFromStateWorkItem.java @@ -10,9 +10,9 @@ *******************************************************************************/
package org.eclipse.osee.ats.workflow.item;
+import org.eclipse.osee.ats.artifact.ATSLog.LogType; import org.eclipse.osee.ats.artifact.LogItem;
import org.eclipse.osee.ats.artifact.StateMachineArtifact;
-import org.eclipse.osee.ats.artifact.ATSLog.LogType;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.ui.skynet.widgets.XOption;
import org.eclipse.osee.framework.ui.skynet.widgets.workflow.DynamicXWidgetLayoutData;
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/item/AtsCompletedFromStateWorkItem.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/item/AtsCompletedFromStateWorkItem.java index 074435d034b..35482c0a55b 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/item/AtsCompletedFromStateWorkItem.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/item/AtsCompletedFromStateWorkItem.java @@ -10,9 +10,9 @@ *******************************************************************************/
package org.eclipse.osee.ats.workflow.item;
+import org.eclipse.osee.ats.artifact.ATSLog.LogType; import org.eclipse.osee.ats.artifact.LogItem;
import org.eclipse.osee.ats.artifact.StateMachineArtifact;
-import org.eclipse.osee.ats.artifact.ATSLog.LogType;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.ui.skynet.widgets.XOption;
import org.eclipse.osee.framework.ui.skynet.widgets.workflow.DynamicXWidgetLayoutData;
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/item/AtsWorkDefinitions.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/item/AtsWorkDefinitions.java index 7b0c9552976..8dd86451af7 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/item/AtsWorkDefinitions.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/item/AtsWorkDefinitions.java @@ -21,8 +21,8 @@ import org.eclipse.osee.ats.artifact.PeerToPeerReviewArtifact; import org.eclipse.osee.ats.artifact.TaskArtifact;
import org.eclipse.osee.ats.artifact.TeamWorkFlowArtifact;
import org.eclipse.osee.ats.util.AtsFolderUtil;
-import org.eclipse.osee.ats.util.AtsUtil;
import org.eclipse.osee.ats.util.AtsFolderUtil.AtsFolder;
+import org.eclipse.osee.ats.util.AtsUtil; import org.eclipse.osee.ats.util.widgets.XWorkingBranch;
import org.eclipse.osee.ats.util.widgets.commit.XCommitManager;
import org.eclipse.osee.ats.workflow.flow.DecisionWorkflowDefinition;
@@ -44,12 +44,12 @@ import org.eclipse.osee.framework.ui.skynet.widgets.workflow.DynamicXWidgetLayou import org.eclipse.osee.framework.ui.skynet.widgets.workflow.IWorkDefinitionProvider;
import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkFlowDefinition;
import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkItemDefinition;
+import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkItemDefinition.WriteType; import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkItemDefinitionFactory;
import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkPageDefinition;
import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkRuleDefinition;
import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkWidgetDefinition;
import org.eclipse.osee.framework.ui.skynet.widgets.workflow.XWidgetFactory;
-import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkItemDefinition.WriteType;
/**
* Create all the default ATS work items. This keeps from having to create a class for each of these. Also implement
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/vue/LoadAIsAndTeamsAction.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/vue/LoadAIsAndTeamsAction.java index 899bbf35646..e819883f6b0 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/vue/LoadAIsAndTeamsAction.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/vue/LoadAIsAndTeamsAction.java @@ -17,8 +17,8 @@ import java.util.HashMap; import java.util.HashSet; import java.util.List; import java.util.Map; -import java.util.Set; import java.util.Map.Entry; +import java.util.Set; import org.eclipse.core.runtime.IConfigurationElement; import org.eclipse.core.runtime.IExtension; import org.eclipse.core.runtime.IExtensionPoint; @@ -31,9 +31,9 @@ import org.eclipse.osee.ats.artifact.TeamDefinitionArtifact.TeamDefinitionOption import org.eclipse.osee.ats.internal.AtsPlugin; import org.eclipse.osee.ats.util.AtsArtifactTypes; import org.eclipse.osee.ats.util.AtsFolderUtil; +import org.eclipse.osee.ats.util.AtsFolderUtil.AtsFolder; import org.eclipse.osee.ats.util.AtsRelationTypes; import org.eclipse.osee.ats.util.AtsUtil; -import org.eclipse.osee.ats.util.AtsFolderUtil.AtsFolder; import org.eclipse.osee.ats.workflow.vue.DiagramNode.PageType; import org.eclipse.osee.framework.core.data.OseeUser; import org.eclipse.osee.framework.core.enums.CoreRelationTypes; diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldComposite.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldComposite.java index 50a60dfb81f..ac37f4ecff7 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldComposite.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldComposite.java @@ -35,7 +35,8 @@ import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.ui.plugin.util.Displays;
import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateComposite.TableLoadOption;
import org.eclipse.osee.framework.ui.skynet.action.RefreshAction.IRefreshActionHandler;
-import org.eclipse.osee.framework.ui.skynet.artifact.editor.ArtifactEditor;
+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.util.DbConnectionExceptionComposite;
import org.eclipse.osee.framework.ui.skynet.widgets.XDate;
import org.eclipse.osee.framework.ui.swt.ALayout;
@@ -80,8 +81,8 @@ public class WorldComposite extends ScrolledComposite implements IWorldViewerEve }
worldXViewer =
- new WorldXViewer(mainComp, SWT.MULTI | SWT.BORDER | SWT.FULL_SELECTION,
- xViewerFactory != null ? xViewerFactory : new WorldXViewerFactory());
+ new WorldXViewer(mainComp, SWT.MULTI | SWT.BORDER | SWT.FULL_SELECTION, + xViewerFactory != null ? xViewerFactory : new WorldXViewerFactory()); worldXViewer.getTree().setLayoutData(new GridData(GridData.FILL_BOTH));
worldXViewer.setContentProvider(new WorldContentProvider(worldXViewer));
@@ -133,7 +134,7 @@ public class WorldComposite extends ScrolledComposite implements IWorldViewerEve }
}
if (customizeData != null && !worldXViewer.getCustomizeMgr().generateCustDataFromTable().equals(
- customizeData)) {
+ customizeData)) { setCustomizeData(customizeData);
}
if (arts.isEmpty()) {
@@ -144,11 +145,9 @@ public class WorldComposite extends ScrolledComposite implements IWorldViewerEve worldXViewer.setInput(worldArts);
worldXViewer.updateStatusLabel();
if (otherArts.size() > 0) {
- if (MessageDialog.openConfirm(
- Display.getCurrent().getActiveShell(),
- "Open in Artifact Editor?",
- otherArts.size() + " Non-WorldView Artifacts were returned from request.\n\nOpen in Artifact Editor?")) {
- ArtifactEditor.editArtifacts(otherArts);
+ if (MessageDialog.openConfirm(Display.getCurrent().getActiveShell(), "Open in Artifact Editor?", + otherArts.size() + " Non-WorldView Artifacts were returned from request.\n\nOpen in Artifact Editor?")) { + RendererManager.openInJob(otherArts, PresentationType.GENERALIZED_EDIT); }
}
worldXViewer.getTree().setFocus();
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 012c201e6f4..2b6d3866879 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 @@ -22,8 +22,8 @@ import org.eclipse.osee.ats.internal.AtsPlugin; import org.eclipse.osee.ats.world.search.NextVersionSearchItem;
import org.eclipse.osee.ats.world.search.VersionTargetedForTeamSearchItem;
import org.eclipse.osee.ats.world.search.WorldSearchItem;
-import org.eclipse.osee.ats.world.search.WorldUISearchItem;
import org.eclipse.osee.ats.world.search.WorldSearchItem.SearchType;
+import org.eclipse.osee.ats.world.search.WorldUISearchItem; import org.eclipse.osee.framework.core.exception.OseeArgumentException;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.jdk.core.util.Collections;
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldXViewerFactory.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldXViewerFactory.java index f7f84d9cbda..a92d76e6d98 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldXViewerFactory.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldXViewerFactory.java @@ -13,8 +13,8 @@ package org.eclipse.osee.ats.world; import java.util.logging.Level;
import org.eclipse.nebula.widgets.xviewer.XViewer;
import org.eclipse.nebula.widgets.xviewer.XViewerColumn;
-import org.eclipse.nebula.widgets.xviewer.XViewerSorter;
import org.eclipse.nebula.widgets.xviewer.XViewerColumn.SortDataType;
+import org.eclipse.nebula.widgets.xviewer.XViewerSorter; import org.eclipse.osee.ats.artifact.ATSAttributes;
import org.eclipse.osee.ats.artifact.GoalArtifact;
import org.eclipse.osee.ats.internal.AtsPlugin;
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/MultipleHridSearchOperation.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/MultipleHridSearchOperation.java index e1a389d8103..b1a3a603375 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/MultipleHridSearchOperation.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/MultipleHridSearchOperation.java @@ -4,54 +4,56 @@ * 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.Collection;
-import java.util.HashSet;
-import java.util.Set;
-import java.util.logging.Level;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.viewers.ArrayContentProvider;
-import org.eclipse.osee.ats.AtsOpenOption;
-import org.eclipse.osee.ats.artifact.ActionArtifact;
-import org.eclipse.osee.ats.artifact.SmaWorkflowLabelProvider;
-import org.eclipse.osee.ats.artifact.TeamDefinitionArtifact;
-import org.eclipse.osee.ats.artifact.TeamWorkFlowArtifact;
-import org.eclipse.osee.ats.editor.SMAEditor;
-import org.eclipse.osee.ats.internal.AtsPlugin;
-import org.eclipse.osee.ats.util.AtsEditor;
-import org.eclipse.osee.ats.util.AtsUtil;
-import org.eclipse.osee.ats.util.LegacyPCRActions;
-import org.eclipse.osee.ats.world.IWorldEditorConsumer;
-import org.eclipse.osee.ats.world.WorldEditor;
-import org.eclipse.osee.ats.world.WorldEditorOperationProvider;
-import org.eclipse.osee.framework.core.exception.OseeCoreException;
-import org.eclipse.osee.framework.core.operation.AbstractOperation;
-import org.eclipse.osee.framework.jdk.core.util.Collections;
-import org.eclipse.osee.framework.jdk.core.util.Lib;
-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;
-import org.eclipse.osee.framework.skynet.core.artifact.IATSArtifact;
-import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery;
-import org.eclipse.osee.framework.ui.plugin.util.AWorkbench;
-import org.eclipse.osee.framework.ui.plugin.util.ArrayTreeContentProvider;
-import org.eclipse.osee.framework.ui.plugin.util.Displays;
-import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateComposite.TableLoadOption;
-import org.eclipse.osee.framework.ui.skynet.ArtifactDecoratorPreferences;
-import org.eclipse.osee.framework.ui.skynet.ArtifactLabelProvider;
-import org.eclipse.osee.framework.ui.skynet.ArtifactViewerSorter;
-import org.eclipse.osee.framework.ui.skynet.artifact.editor.ArtifactEditor;
-import org.eclipse.osee.framework.ui.skynet.util.filteredTree.SimpleCheckFilteredTreeDialog;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.dialogs.ListDialog;
-
-/**
+package org.eclipse.osee.ats.world.search; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashSet; +import java.util.Set; +import java.util.logging.Level; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.jface.dialogs.MessageDialog; +import org.eclipse.jface.viewers.ArrayContentProvider; +import org.eclipse.osee.ats.AtsOpenOption; +import org.eclipse.osee.ats.artifact.ActionArtifact; +import org.eclipse.osee.ats.artifact.SmaWorkflowLabelProvider; +import org.eclipse.osee.ats.artifact.TeamDefinitionArtifact; +import org.eclipse.osee.ats.artifact.TeamWorkFlowArtifact; +import org.eclipse.osee.ats.editor.SMAEditor; +import org.eclipse.osee.ats.internal.AtsPlugin; +import org.eclipse.osee.ats.util.AtsEditor; +import org.eclipse.osee.ats.util.AtsUtil; +import org.eclipse.osee.ats.util.LegacyPCRActions; +import org.eclipse.osee.ats.world.IWorldEditorConsumer; +import org.eclipse.osee.ats.world.WorldEditor; +import org.eclipse.osee.ats.world.WorldEditorOperationProvider; +import org.eclipse.osee.framework.core.exception.OseeCoreException; +import org.eclipse.osee.framework.core.operation.AbstractOperation; +import org.eclipse.osee.framework.jdk.core.util.Collections; +import org.eclipse.osee.framework.jdk.core.util.Lib; +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; +import org.eclipse.osee.framework.skynet.core.artifact.IATSArtifact; +import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery; +import org.eclipse.osee.framework.ui.plugin.util.AWorkbench; +import org.eclipse.osee.framework.ui.plugin.util.ArrayTreeContentProvider; +import org.eclipse.osee.framework.ui.plugin.util.Displays; +import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateComposite.TableLoadOption; +import org.eclipse.osee.framework.ui.skynet.ArtifactDecoratorPreferences; +import org.eclipse.osee.framework.ui.skynet.ArtifactLabelProvider; +import org.eclipse.osee.framework.ui.skynet.ArtifactViewerSorter; +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.util.filteredTree.SimpleCheckFilteredTreeDialog; +import org.eclipse.swt.widgets.Display; +import org.eclipse.ui.dialogs.ListDialog; + +/** * @author Donald G. Dunne */ public class MultipleHridSearchOperation extends AbstractOperation implements IWorldEditorConsumer { @@ -83,7 +85,7 @@ public class MultipleHridSearchOperation extends AbstractOperation implements IW return; } if (resultNonAtsArts.size() > 0) { - ArtifactEditor.editArtifacts(resultNonAtsArts); + RendererManager.openInJob(new ArrayList<Artifact>(resultNonAtsArts), PresentationType.GENERALIZED_EDIT); } if (resultAtsArts.size() > 0) { // If requested world editor and it's already been opened there, don't process other arts in editors @@ -137,10 +139,9 @@ public class MultipleHridSearchOperation extends AbstractOperation implements IW artDecorator.setShowArtBranch(true); artDecorator.setShowArtType(true); SimpleCheckFilteredTreeDialog dialog = - new SimpleCheckFilteredTreeDialog("Select Available Change Reports", - "Select available Change Reports to run.", new ArrayTreeContentProvider(), - new ArtifactLabelProvider(artDecorator), new ArtifactViewerSorter(), 0, - Integer.MAX_VALUE); + new SimpleCheckFilteredTreeDialog("Select Available Change Reports", + "Select available Change Reports to run.", new ArrayTreeContentProvider(), + new ArtifactLabelProvider(artDecorator), new ArtifactViewerSorter(), 0, Integer.MAX_VALUE); dialog.setInput(addedArts); if (dialog.open() == 0) { if (dialog.getResult().length == 0) { @@ -157,7 +158,7 @@ public class MultipleHridSearchOperation extends AbstractOperation implements IW @Override public void run() { MessageDialog.openInformation(Display.getCurrent().getActiveShell(), "Open Change Reports", - "No change report exists for " + enteredIds); + "No change report exists for " + enteredIds); } }); } @@ -188,7 +189,11 @@ public class MultipleHridSearchOperation extends AbstractOperation implements IW if (artifact instanceof ActionArtifact) { AtsUtil.openATSAction(artifact, AtsOpenOption.OpenOneOrPopupSelect); } else { - SMAEditor.editArtifact(artifact); + try { + SMAEditor.editArtifact(artifact); + } catch (OseeCoreException ex) { + OseeLog.log(AtsPlugin.class, Level.SEVERE, ex); + } } } }); @@ -196,12 +201,12 @@ public class MultipleHridSearchOperation extends AbstractOperation implements IW private void searchAndSplitResults() throws OseeCoreException { resultAtsArts.addAll(LegacyPCRActions.getTeamsTeamWorkflowArtifacts(data.getIds(), - (Collection<TeamDefinitionArtifact>) null)); + (Collection<TeamDefinitionArtifact>) null)); // This does artId search if (data.isIncludeArtIds() && data.getBranchForIncludeArtIds() != null) { for (Artifact art : ArtifactQuery.getArtifactListFromIds(Lib.stringToIntegerList(data.getEnteredIds()), - data.getBranchForIncludeArtIds())) { + data.getBranchForIncludeArtIds())) { artifacts.add(art); } } diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/TeamWorldSearchItem.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/TeamWorldSearchItem.java index 017e13f87f0..4d11efcdd75 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/TeamWorldSearchItem.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/TeamWorldSearchItem.java @@ -23,8 +23,8 @@ import org.eclipse.osee.ats.artifact.AtsAttributeTypes; import org.eclipse.osee.ats.artifact.StateMachineArtifact; import org.eclipse.osee.ats.artifact.TeamDefinitionArtifact; import org.eclipse.osee.ats.artifact.TeamWorkFlowArtifact; -import org.eclipse.osee.ats.artifact.VersionArtifact; import org.eclipse.osee.ats.artifact.TeamWorkFlowArtifact.DefaultTeamState; +import org.eclipse.osee.ats.artifact.VersionArtifact; import org.eclipse.osee.ats.config.AtsCacheManager; import org.eclipse.osee.ats.util.AtsArtifactTypes; import org.eclipse.osee.ats.util.AtsRelationTypes; |