diff options
Diffstat (limited to 'plugins/org.eclipse.osee.ats')
5 files changed, 26 insertions, 17 deletions
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 fb4f0c8e9a8..2ef6beab12b 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 @@ -17,10 +17,11 @@ import java.util.List; import org.eclipse.core.commands.Command; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.osee.ats.AtsImage; -import org.eclipse.osee.ats.artifact.TaskArtifact; +import org.eclipse.osee.ats.util.AtsArtifactTypes; import org.eclipse.osee.ats.util.AtsUtil; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; +import org.eclipse.osee.framework.skynet.core.types.IArtifact; import org.eclipse.osee.framework.ui.skynet.render.PresentationType; import org.eclipse.osee.framework.ui.swt.ImageManager; @@ -41,9 +42,10 @@ public class AtsTaskEditorRenderer extends AtsRenderer { } @Override - public int getApplicabilityRating(PresentationType presentationType, Artifact artifact) throws OseeCoreException { - if (artifact instanceof TaskArtifact && !artifact.isHistorical() && !presentationType.matches(GENERALIZED_EDIT, - PRODUCE_ATTRIBUTE)) { + public int getApplicabilityRating(PresentationType presentationType, IArtifact artifact) throws OseeCoreException { + Artifact aArtifact = artifact.getFullArtifact(); + if (aArtifact.isOfType(AtsArtifactTypes.Task) && !aArtifact.isHistorical() && !presentationType.matches( + GENERALIZED_EDIT, PRODUCE_ATTRIBUTE)) { return PRESENTATION_SUBTYPE_MATCH; } return NO_MATCH; 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 fb5d6a84305..57b797c0cc8 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 @@ -22,6 +22,7 @@ import org.eclipse.osee.ats.util.AtsArtifactTypes; import org.eclipse.osee.ats.util.AtsUtil; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; +import org.eclipse.osee.framework.skynet.core.types.IArtifact; import org.eclipse.osee.framework.ui.skynet.render.PresentationType; import org.eclipse.osee.framework.ui.swt.ImageManager; @@ -58,8 +59,9 @@ public class AtsWorkflowRenderer extends AtsRenderer { } @Override - public int getApplicabilityRating(PresentationType presentationType, Artifact artifact) throws OseeCoreException { - if (!artifact.isHistorical() && !presentationType.matches(GENERALIZED_EDIT, PRODUCE_ATTRIBUTE) && artifact.isOfType(AtsArtifactTypes.AtsArtifact)) { + public int getApplicabilityRating(PresentationType presentationType, IArtifact artifact) throws OseeCoreException { + Artifact aArtifact = artifact.getFullArtifact(); + if (!aArtifact.isHistorical() && !presentationType.matches(GENERALIZED_EDIT, PRODUCE_ATTRIBUTE) && aArtifact.isOfType(AtsArtifactTypes.AtsArtifact)) { return PRESENTATION_SUBTYPE_MATCH; } return NO_MATCH; 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 3057516e82f..d98704422f6 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 @@ -23,6 +23,7 @@ import org.eclipse.osee.framework.core.enums.CoreArtifactTypes; import org.eclipse.osee.framework.core.enums.CoreRelationTypes; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; +import org.eclipse.osee.framework.skynet.core.types.IArtifact; import org.eclipse.osee.framework.ui.skynet.render.PresentationType; import org.eclipse.osee.framework.ui.swt.ImageManager; @@ -33,18 +34,19 @@ public class AtsWorldEditorRenderer extends AtsRenderer { private static final String COMMAND_ID = "org.eclipse.osee.framework.ui.skynet.atsworldeditor.command"; @Override - public int getApplicabilityRating(PresentationType presentationType, Artifact artifact) throws OseeCoreException { - if (artifact.isHistorical() || presentationType.matches(GENERALIZED_EDIT, PRODUCE_ATTRIBUTE)) { + public int getApplicabilityRating(PresentationType presentationType, IArtifact artifact) throws OseeCoreException { + Artifact aArtifact = artifact.getFullArtifact(); + if (aArtifact.isHistorical() || presentationType.matches(GENERALIZED_EDIT, PRODUCE_ATTRIBUTE)) { return NO_MATCH; } - if (artifact.isOfType(AtsArtifactTypes.AtsArtifact)) { + if (aArtifact.isOfType(AtsArtifactTypes.AtsArtifact)) { return PRESENTATION_SUBTYPE_MATCH; } - if (artifact.isOfType(CoreArtifactTypes.UniversalGroup)) { - if (artifact.getRelatedArtifactsCount(CoreRelationTypes.Universal_Grouping__Members) == 0) { + if (aArtifact.isOfType(CoreArtifactTypes.UniversalGroup)) { + if (aArtifact.getRelatedArtifactsCount(CoreRelationTypes.Universal_Grouping__Members) == 0) { return NO_MATCH; } - for (Artifact childArt : artifact.getRelatedArtifacts(CoreRelationTypes.Universal_Grouping__Members)) { + for (Artifact childArt : aArtifact.getRelatedArtifacts(CoreRelationTypes.Universal_Grouping__Members)) { if (childArt.isOfType(AtsArtifactTypes.AtsArtifact)) { return PRESENTATION_SUBTYPE_MATCH; } 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 d1251dd4ca4..6187a3cb7c4 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 @@ -21,6 +21,7 @@ import org.eclipse.osee.ats.export.AtsExportManager.ExportOption; import org.eclipse.osee.ats.util.AtsArtifactTypes; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; +import org.eclipse.osee.framework.skynet.core.types.IArtifact; import org.eclipse.osee.framework.ui.skynet.FrameworkImage; import org.eclipse.osee.framework.ui.skynet.render.PresentationType; import org.eclipse.osee.framework.ui.swt.ImageManager; @@ -58,8 +59,9 @@ public class AtsExportRenderer extends AtsRenderer { } @Override - public int getApplicabilityRating(PresentationType presentationType, Artifact artifact) throws OseeCoreException { - if (artifact.isOfType(AtsArtifactTypes.AtsArtifact) && !artifact.isHistorical() && !presentationType.matches( + public int getApplicabilityRating(PresentationType presentationType, IArtifact artifact) throws OseeCoreException { + Artifact aArtifact = artifact.getFullArtifact(); + if (aArtifact.isOfType(AtsArtifactTypes.AtsArtifact) && !aArtifact.isHistorical() && !presentationType.matches( GENERALIZED_EDIT, PRODUCE_ATTRIBUTE)) { return PRESENTATION_SUBTYPE_MATCH; } 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 79f2a15665a..9e1693192e0 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 @@ -26,6 +26,7 @@ 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.skynet.core.types.IArtifact; import org.eclipse.osee.framework.ui.plugin.util.AWorkbench; import org.eclipse.osee.framework.ui.skynet.render.PresentationType; import org.eclipse.osee.framework.ui.swt.Displays; @@ -55,9 +56,9 @@ public class AtsWorkflowConfigRenderer extends AtsRenderer { } @Override - public int getApplicabilityRating(PresentationType presentationType, Artifact artifact) throws OseeCoreException { - if (artifact.isOfType(CoreArtifactTypes.WorkFlowDefinition) && !presentationType.matches(GENERALIZED_EDIT, - PRODUCE_ATTRIBUTE)) { + public int getApplicabilityRating(PresentationType presentationType, IArtifact artifact) throws OseeCoreException { + if (artifact.getArtifactType().inheritsFrom(CoreArtifactTypes.WorkFlowDefinition) && !presentationType.matches( + GENERALIZED_EDIT, PRODUCE_ATTRIBUTE)) { return PRESENTATION_SUBTYPE_MATCH; } return NO_MATCH; |