diff options
16 files changed, 63 insertions, 36 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; diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/editor/CoverageRenderer.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/editor/CoverageRenderer.java index 2d9d3ab5747..1a23527323a 100644 --- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/editor/CoverageRenderer.java +++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/editor/CoverageRenderer.java @@ -24,6 +24,7 @@ import org.eclipse.osee.coverage.util.CoverageImage; import org.eclipse.osee.framework.access.AccessControlManager; 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.DefaultArtifactRenderer; import org.eclipse.osee.framework.ui.skynet.render.PresentationType; import org.eclipse.osee.framework.ui.swt.ImageManager; @@ -75,9 +76,10 @@ public class CoverageRenderer extends DefaultArtifactRenderer { } @Override - public int getApplicabilityRating(PresentationType presentationType, Artifact artifact) throws OseeCoreException { - if (!presentationType.matches(GENERALIZED_EDIT, PRODUCE_ATTRIBUTE) && !artifact.isHistorical()) { - if (artifact.isOfType(CoveragePackage, CoverageFolder, CoverageUnit)) { + public int getApplicabilityRating(PresentationType presentationType, IArtifact artifact) throws OseeCoreException { + Artifact aArtifact = artifact.getFullArtifact(); + if (!presentationType.matches(GENERALIZED_EDIT, PRODUCE_ATTRIBUTE) && !aArtifact.isHistorical()) { + if (aArtifact.isOfType(CoveragePackage, CoverageFolder, CoverageUnit)) { return PRESENTATION_SUBTYPE_MATCH; } } diff --git a/plugins/org.eclipse.osee.framework.core.dsl.ui.integration/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.framework.core.dsl.ui.integration/META-INF/MANIFEST.MF index 8610b0c4ca1..0d34ff48b6d 100644 --- a/plugins/org.eclipse.osee.framework.core.dsl.ui.integration/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.framework.core.dsl.ui.integration/META-INF/MANIFEST.MF @@ -43,6 +43,7 @@ Import-Package: org.eclipse.compare, org.eclipse.osee.framework.skynet.core.attribute, org.eclipse.osee.framework.skynet.core.importing, org.eclipse.osee.framework.skynet.core.transaction, + org.eclipse.osee.framework.skynet.core.types, org.eclipse.osee.framework.skynet.core.utility, org.eclipse.osee.framework.ui.plugin, org.eclipse.osee.framework.ui.plugin.util, diff --git a/plugins/org.eclipse.osee.framework.core.dsl.ui.integration/src/org/eclipse/osee/framework/core/dsl/ui/integration/internal/OseeDslRenderer.java b/plugins/org.eclipse.osee.framework.core.dsl.ui.integration/src/org/eclipse/osee/framework/core/dsl/ui/integration/internal/OseeDslRenderer.java index 89c643842ed..23806d17c10 100644 --- a/plugins/org.eclipse.osee.framework.core.dsl.ui.integration/src/org/eclipse/osee/framework/core/dsl/ui/integration/internal/OseeDslRenderer.java +++ b/plugins/org.eclipse.osee.framework.core.dsl.ui.integration/src/org/eclipse/osee/framework/core/dsl/ui/integration/internal/OseeDslRenderer.java @@ -32,6 +32,7 @@ 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.skynet.core.artifact.Artifact; +import org.eclipse.osee.framework.skynet.core.types.IArtifact; import org.eclipse.osee.framework.ui.skynet.render.DefaultArtifactRenderer; import org.eclipse.osee.framework.ui.skynet.render.FileSystemRenderer; import org.eclipse.osee.framework.ui.skynet.render.PresentationType; @@ -60,9 +61,10 @@ public final class OseeDslRenderer extends FileSystemRenderer { } @Override - public int getApplicabilityRating(PresentationType presentationType, Artifact artifact) throws OseeCoreException { - if (!presentationType.matches(GENERALIZED_EDIT, PRODUCE_ATTRIBUTE) && !artifact.isHistorical()) { - if (artifact.isOfType(CoreArtifactTypes.AccessControlModel)) { + public int getApplicabilityRating(PresentationType presentationType, IArtifact artifact) throws OseeCoreException { + Artifact aArtifact = artifact.getFullArtifact(); + if (!presentationType.matches(GENERALIZED_EDIT, PRODUCE_ATTRIBUTE) && !aArtifact.isHistorical()) { + if (aArtifact.isOfType(CoreArtifactTypes.AccessControlModel)) { return ARTIFACT_TYPE_MATCH; } } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/DefaultArtifactRenderer.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/DefaultArtifactRenderer.java index 8fc55d782b1..eea22a72d88 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/DefaultArtifactRenderer.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/DefaultArtifactRenderer.java @@ -35,6 +35,7 @@ import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.skynet.core.linking.OseeLinkBuilder; import org.eclipse.osee.framework.skynet.core.relation.RelationManager; import org.eclipse.osee.framework.skynet.core.relation.order.RelationOrderData; +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.ArtifactExplorer; import org.eclipse.osee.framework.ui.skynet.ArtifactImageManager; @@ -104,7 +105,7 @@ public class DefaultArtifactRenderer implements IRenderer { } @Override - public int getApplicabilityRating(PresentationType presentationType, Artifact artifact) throws OseeCoreException { + public int getApplicabilityRating(PresentationType presentationType, IArtifact artifact) throws OseeCoreException { if (presentationType.matches(GENERALIZED_EDIT, GENERAL_REQUESTED, PRODUCE_ATTRIBUTE)) { return PRESENTATION_TYPE; } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/IRenderer.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/IRenderer.java index c58f12ce906..1fa741bf83c 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/IRenderer.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/IRenderer.java @@ -19,6 +19,7 @@ import org.eclipse.osee.framework.core.exception.OseeArgumentException; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.model.Branch; 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.compare.IComparator; import org.eclipse.osee.framework.ui.skynet.render.word.AttributeElement; import org.eclipse.osee.framework.ui.skynet.render.word.Producer; @@ -86,7 +87,7 @@ public interface IRenderer { public void open(List<Artifact> artifacts, PresentationType presentationType) throws OseeCoreException; - public int getApplicabilityRating(PresentationType presentationType, Artifact artifact) throws OseeCoreException; + public int getApplicabilityRating(PresentationType presentationType, IArtifact artifact) throws OseeCoreException; public String getName(); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/NativeRenderer.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/NativeRenderer.java index a41ae57779d..e6e9b04f8e5 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/NativeRenderer.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/NativeRenderer.java @@ -28,6 +28,7 @@ import org.eclipse.osee.framework.core.operation.IOperation; 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.types.IArtifact; import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; import org.eclipse.osee.framework.ui.swt.ImageManager; import org.eclipse.swt.program.Program; @@ -84,8 +85,9 @@ public class NativeRenderer extends FileSystemRenderer { } @Override - public int getApplicabilityRating(PresentationType presentationType, Artifact artifact) throws OseeCoreException { - if (artifact.isAttributeTypeValid(CoreAttributeTypes.NativeContent)) { + public int getApplicabilityRating(PresentationType presentationType, IArtifact artifact) throws OseeCoreException { + Artifact aArtifact = artifact.getFullArtifact(); + if (aArtifact.isAttributeTypeValid(CoreAttributeTypes.NativeContent)) { if (presentationType.matches(SPECIALIZED_EDIT, PREVIEW, DEFAULT_OPEN)) { return PRESENTATION_SUBTYPE_MATCH; } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/OpenOfficeWriterRenderer.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/OpenOfficeWriterRenderer.java index 542b7603a67..9ce8c7f84a7 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/OpenOfficeWriterRenderer.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/OpenOfficeWriterRenderer.java @@ -17,6 +17,7 @@ import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.model.Branch; import org.eclipse.osee.framework.core.operation.IOperation; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; +import org.eclipse.osee.framework.skynet.core.types.IArtifact; import org.eclipse.swt.program.Program; /** @@ -45,7 +46,7 @@ public class OpenOfficeWriterRenderer extends FileSystemRenderer implements ITem } @Override - public int getApplicabilityRating(PresentationType presentationType, Artifact artifact) { + public int getApplicabilityRating(PresentationType presentationType, IArtifact artifact) { return NO_MATCH; } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/TisRenderer.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/TisRenderer.java index 28430020590..36e50326aaf 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/TisRenderer.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/TisRenderer.java @@ -22,6 +22,7 @@ import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.exception.OseeExceptions; import org.eclipse.osee.framework.jdk.core.util.io.CharBackedInputStream; 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.word.WordMLProducer; import org.eclipse.osee.framework.ui.skynet.render.word.template.BasicTemplateAttributeHandler; import org.eclipse.osee.framework.ui.skynet.render.word.template.ITemplateAttributeHandler; @@ -41,8 +42,9 @@ public class TisRenderer extends WordTemplateRenderer { } @Override - public int getApplicabilityRating(PresentationType presentationType, Artifact artifact) throws OseeCoreException { - if (artifact.isOfType(CoreArtifactTypes.TestInformationSheet) && presentationType.matches(DEFAULT_OPEN, PREVIEW)) { + public int getApplicabilityRating(PresentationType presentationType, IArtifact artifact) throws OseeCoreException { + if (artifact.getArtifactType().inheritsFrom(CoreArtifactTypes.TestInformationSheet) && presentationType.matches( + DEFAULT_OPEN, PREVIEW)) { return SPECIALIZED_MATCH; } return NO_MATCH; diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/UrlRenderer.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/UrlRenderer.java index dff61d7ffb4..f5e615d5ce4 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/UrlRenderer.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/UrlRenderer.java @@ -17,6 +17,7 @@ import static org.eclipse.osee.framework.ui.skynet.render.PresentationType.GENER import static org.eclipse.osee.framework.ui.skynet.render.PresentationType.PRODUCE_ATTRIBUTE; 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; /** * @author Ryan D. Brooks @@ -29,8 +30,9 @@ public class UrlRenderer extends DefaultArtifactRenderer { } @Override - public int getApplicabilityRating(PresentationType presentationType, Artifact artifact) throws OseeCoreException { - if (!presentationType.matches(GENERALIZED_EDIT, GENERAL_REQUESTED, PRODUCE_ATTRIBUTE) && artifact.isAttributeTypeValid(ContentUrl)) { + public int getApplicabilityRating(PresentationType presentationType, IArtifact artifact) throws OseeCoreException { + Artifact aArtifact = artifact.getFullArtifact(); + if (!presentationType.matches(GENERALIZED_EDIT, GENERAL_REQUESTED, PRODUCE_ATTRIBUTE) && aArtifact.isAttributeTypeValid(ContentUrl)) { return SUBTYPE_TYPE_MATCH; } return NO_MATCH; diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/WholeWordRenderer.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/WholeWordRenderer.java index e0bdf395783..743c7422706 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/WholeWordRenderer.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/WholeWordRenderer.java @@ -31,6 +31,7 @@ import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.skynet.core.attribute.WordWholeDocumentAttribute; import org.eclipse.osee.framework.skynet.core.linking.LinkType; import org.eclipse.osee.framework.skynet.core.linking.WordMlLinkHandler; +import org.eclipse.osee.framework.skynet.core.types.IArtifact; import org.eclipse.osee.framework.skynet.core.word.WordUtil; import org.eclipse.osee.framework.ui.skynet.render.compare.IComparator; import org.eclipse.osee.framework.ui.skynet.render.compare.WholeWordCompare; @@ -67,8 +68,9 @@ public class WholeWordRenderer extends WordRenderer { } @Override - public int getApplicabilityRating(PresentationType presentationType, Artifact artifact) throws OseeCoreException { - if (!presentationType.matches(GENERALIZED_EDIT, GENERAL_REQUESTED, PRODUCE_ATTRIBUTE) && artifact.isAttributeTypeValid(WholeWordContent)) { + public int getApplicabilityRating(PresentationType presentationType, IArtifact artifact) throws OseeCoreException { + Artifact aArtifact = artifact.getFullArtifact(); + if (!presentationType.matches(GENERALIZED_EDIT, GENERAL_REQUESTED, PRODUCE_ATTRIBUTE) && aArtifact.isAttributeTypeValid(WholeWordContent)) { return PRESENTATION_SUBTYPE_MATCH; } return NO_MATCH; diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/WordTemplateRenderer.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/WordTemplateRenderer.java index 8cb48e77fb8..c13e08ef5ec 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/WordTemplateRenderer.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/WordTemplateRenderer.java @@ -33,6 +33,7 @@ import org.eclipse.osee.framework.skynet.core.artifact.Attribute; import org.eclipse.osee.framework.skynet.core.linking.LinkType; import org.eclipse.osee.framework.skynet.core.linking.OseeLinkBuilder; import org.eclipse.osee.framework.skynet.core.linking.WordMlLinkHandler; +import org.eclipse.osee.framework.skynet.core.types.IArtifact; import org.eclipse.osee.framework.skynet.core.word.WordUtil; import org.eclipse.osee.framework.ui.skynet.render.compare.IComparator; import org.eclipse.osee.framework.ui.skynet.render.compare.WordTemplateCompare; @@ -134,10 +135,11 @@ public class WordTemplateRenderer extends WordRenderer implements ITemplateRende } @Override - public int getApplicabilityRating(PresentationType presentationType, Artifact artifact) throws OseeCoreException { + public int getApplicabilityRating(PresentationType presentationType, IArtifact artifact) throws OseeCoreException { int rating = NO_MATCH; + Artifact aArtifact = artifact.getFullArtifact(); if (!presentationType.matches(PresentationType.GENERALIZED_EDIT, PresentationType.GENERAL_REQUESTED)) { - if (artifact.isAttributeTypeValid(CoreAttributeTypes.WordTemplateContent)) { + if (aArtifact.isAttributeTypeValid(CoreAttributeTypes.WordTemplateContent)) { rating = PRESENTATION_SUBTYPE_MATCH; } else if (presentationType.matches(PresentationType.PREVIEW, PresentationType.DIFF)) { rating = BASE_MATCH; |