diff options
Diffstat (limited to 'plugins')
12 files changed, 39 insertions, 18 deletions
diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/render/RendererManagerTest.java b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/render/RendererManagerTest.java index e80c09f0181..a5455c286ab 100644 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/render/RendererManagerTest.java +++ b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/render/RendererManagerTest.java @@ -24,6 +24,7 @@ import static org.eclipse.osee.framework.ui.skynet.render.PresentationType.GENER import static org.eclipse.osee.framework.ui.skynet.render.PresentationType.MERGE; import static org.eclipse.osee.framework.ui.skynet.render.PresentationType.MERGE_EDIT; import static org.eclipse.osee.framework.ui.skynet.render.PresentationType.PREVIEW; +import static org.eclipse.osee.framework.ui.skynet.render.PresentationType.PRODUCE_ATTRIBUTE; import static org.eclipse.osee.framework.ui.skynet.render.PresentationType.SPECIALIZED_EDIT; import java.util.ArrayList; import java.util.Collection; @@ -114,6 +115,7 @@ public class RendererManagerTest { data.add(new Object[] {SoftwareRequirement, MERGE_EDIT, WordTemplateRenderer.class, Both}); data.add(new Object[] {SoftwareRequirement, DEFAULT_OPEN, WordTemplateRenderer.class, Off}); data.add(new Object[] {SoftwareRequirement, DEFAULT_OPEN, DefaultArtifactRenderer.class, On}); + data.add(new Object[] {SoftwareRequirement, PRODUCE_ATTRIBUTE, WordTemplateRenderer.class, Both}); data.add(new Object[] {Action, GENERALIZED_EDIT, DefaultArtifactRenderer.class, Both}); data.add(new Object[] {Action, SPECIALIZED_EDIT, AtsWorkflowRenderer.class, Both}); @@ -123,6 +125,7 @@ public class RendererManagerTest { data.add(new Object[] {Action, MERGE_EDIT, AtsWorkflowRenderer.class, Both}); data.add(new Object[] {Action, DEFAULT_OPEN, AtsWorkflowRenderer.class, Off}); data.add(new Object[] {Action, DEFAULT_OPEN, AtsWorkflowRenderer.class, On}); + data.add(new Object[] {Action, PRODUCE_ATTRIBUTE, DefaultArtifactRenderer.class, Both}); data.add(new Object[] {TestProcedureWML, GENERALIZED_EDIT, DefaultArtifactRenderer.class, Both}); data.add(new Object[] {TestProcedureWML, SPECIALIZED_EDIT, WholeWordRenderer.class, Both}); @@ -132,6 +135,7 @@ public class RendererManagerTest { data.add(new Object[] {TestProcedureWML, MERGE_EDIT, WholeWordRenderer.class, Both}); data.add(new Object[] {TestProcedureWML, DEFAULT_OPEN, WholeWordRenderer.class, Off}); data.add(new Object[] {TestProcedureWML, DEFAULT_OPEN, DefaultArtifactRenderer.class, On}); + data.add(new Object[] {TestProcedureWML, PRODUCE_ATTRIBUTE, DefaultArtifactRenderer.class, Both}); data.add(new Object[] {GeneralDocument, GENERALIZED_EDIT, DefaultArtifactRenderer.class, Both}); data.add(new Object[] {GeneralDocument, SPECIALIZED_EDIT, NativeRenderer.class, Both}); @@ -141,6 +145,7 @@ public class RendererManagerTest { data.add(new Object[] {GeneralDocument, MERGE_EDIT, null, Both}); data.add(new Object[] {GeneralDocument, DEFAULT_OPEN, NativeRenderer.class, Off}); data.add(new Object[] {GeneralDocument, DEFAULT_OPEN, DefaultArtifactRenderer.class, On}); + data.add(new Object[] {GeneralDocument, PRODUCE_ATTRIBUTE, DefaultArtifactRenderer.class, Both}); data.add(new Object[] {TestInformationSheet, GENERALIZED_EDIT, DefaultArtifactRenderer.class, Both}); data.add(new Object[] {TestInformationSheet, SPECIALIZED_EDIT, WordTemplateRenderer.class, Both}); @@ -150,6 +155,7 @@ public class RendererManagerTest { data.add(new Object[] {TestInformationSheet, MERGE_EDIT, WordTemplateRenderer.class, Both}); data.add(new Object[] {TestInformationSheet, DEFAULT_OPEN, TisRenderer.class, Off}); data.add(new Object[] {TestInformationSheet, DEFAULT_OPEN, DefaultArtifactRenderer.class, On}); + data.add(new Object[] {TestInformationSheet, PRODUCE_ATTRIBUTE, WordTemplateRenderer.class, Both}); return data; } 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 14e771cfa8f..7dab1bc9841 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 @@ -11,6 +11,7 @@ package org.eclipse.osee.ats.editor; import static org.eclipse.osee.framework.ui.skynet.render.PresentationType.GENERALIZED_EDIT; +import static org.eclipse.osee.framework.ui.skynet.render.PresentationType.PRODUCE_ATTRIBUTE; import java.util.ArrayList; import java.util.List; import org.eclipse.osee.ats.AtsImage; @@ -40,8 +41,9 @@ public class AtsTaskEditorRenderer extends DefaultArtifactRenderer { } @Override - public int getApplicabilityRating(PresentationType presentationType, Artifact artifact) { - if (artifact instanceof TaskArtifact && !artifact.isHistorical() && presentationType != GENERALIZED_EDIT) { + public int getApplicabilityRating(PresentationType presentationType, Artifact artifact) throws OseeCoreException { + if (artifact instanceof TaskArtifact && !artifact.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 6d9d900ad3d..bd8337bd7d5 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 @@ -11,6 +11,7 @@ package org.eclipse.osee.ats.editor; import static org.eclipse.osee.framework.ui.skynet.render.PresentationType.GENERALIZED_EDIT; +import static org.eclipse.osee.framework.ui.skynet.render.PresentationType.PRODUCE_ATTRIBUTE; import java.util.ArrayList; import java.util.List; import org.eclipse.osee.ats.AtsImage; @@ -58,8 +59,8 @@ public class AtsWorkflowRenderer extends DefaultArtifactRenderer { } @Override - public int getApplicabilityRating(PresentationType presentationType, Artifact artifact) { - if (artifact.isOfType(AtsArtifactTypes.AtsArtifact) && !artifact.isHistorical() && presentationType != GENERALIZED_EDIT) { + public int getApplicabilityRating(PresentationType presentationType, Artifact artifact) throws OseeCoreException { + if (!artifact.isHistorical() && !presentationType.matches(GENERALIZED_EDIT, PRODUCE_ATTRIBUTE) && artifact.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 59c21b1fea5..362be73fc06 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 @@ -11,6 +11,7 @@ package org.eclipse.osee.ats.editor; import static org.eclipse.osee.framework.ui.skynet.render.PresentationType.GENERALIZED_EDIT; +import static org.eclipse.osee.framework.ui.skynet.render.PresentationType.PRODUCE_ATTRIBUTE; import java.util.ArrayList; import java.util.List; import org.eclipse.osee.ats.AtsImage; @@ -33,7 +34,7 @@ public class AtsWorldEditorRenderer extends DefaultArtifactRenderer { @Override public int getApplicabilityRating(PresentationType presentationType, Artifact artifact) throws OseeCoreException { - if (artifact.isHistorical() || presentationType == GENERALIZED_EDIT) { + if (artifact.isHistorical() || presentationType.matches(GENERALIZED_EDIT, PRODUCE_ATTRIBUTE)) { return NO_MATCH; } if (artifact.isOfType(AtsArtifactTypes.AtsArtifact)) { 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 230cbfb2209..8c1dcfe5583 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 @@ -11,6 +11,7 @@ package org.eclipse.osee.ats.export; import static org.eclipse.osee.framework.ui.skynet.render.PresentationType.GENERALIZED_EDIT; +import static org.eclipse.osee.framework.ui.skynet.render.PresentationType.PRODUCE_ATTRIBUTE; import java.util.ArrayList; import java.util.List; import org.eclipse.osee.ats.export.AtsExportManager.ExportOption; @@ -56,8 +57,9 @@ public class AtsExportRenderer extends DefaultArtifactRenderer { } @Override - public int getApplicabilityRating(PresentationType presentationType, Artifact artifact) { - if (artifact.isOfType(AtsArtifactTypes.AtsArtifact) && !artifact.isHistorical() && presentationType != GENERALIZED_EDIT) { + public int getApplicabilityRating(PresentationType presentationType, Artifact artifact) throws OseeCoreException { + if (artifact.isOfType(AtsArtifactTypes.AtsArtifact) && !artifact.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/workflow/editor/AtsWorkflowConfigRenderer.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/AtsWorkflowConfigRenderer.java index f65587425e5..23b2b2e220c 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 @@ -11,12 +11,14 @@ package org.eclipse.osee.ats.workflow.editor; import static org.eclipse.osee.framework.ui.skynet.render.PresentationType.GENERALIZED_EDIT; +import static org.eclipse.osee.framework.ui.skynet.render.PresentationType.PRODUCE_ATTRIBUTE; 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; @@ -52,8 +54,9 @@ public class AtsWorkflowConfigRenderer extends DefaultArtifactRenderer { } @Override - public int getApplicabilityRating(PresentationType presentationType, Artifact artifact) { - if (artifact.isOfType(CoreArtifactTypes.WorkFlowDefinition) && presentationType != GENERALIZED_EDIT) { + public int getApplicabilityRating(PresentationType presentationType, Artifact artifact) throws OseeCoreException { + if (artifact.isOfType(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 6a1f3a8964c..6672da4c8e6 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 @@ -14,6 +14,7 @@ import static org.eclipse.osee.coverage.store.CoverageArtifactTypes.CoverageFold import static org.eclipse.osee.coverage.store.CoverageArtifactTypes.CoveragePackage; import static org.eclipse.osee.coverage.store.CoverageArtifactTypes.CoverageUnit; import static org.eclipse.osee.framework.ui.skynet.render.PresentationType.GENERALIZED_EDIT; +import static org.eclipse.osee.framework.ui.skynet.render.PresentationType.PRODUCE_ATTRIBUTE; import java.util.ArrayList; import java.util.List; import org.eclipse.osee.coverage.store.CoverageArtifactTypes; @@ -73,8 +74,8 @@ public class CoverageRenderer extends DefaultArtifactRenderer { } @Override - public int getApplicabilityRating(PresentationType presentationType, Artifact artifact) { - if (presentationType != GENERALIZED_EDIT && !artifact.isHistorical()) { + public int getApplicabilityRating(PresentationType presentationType, Artifact artifact) throws OseeCoreException { + if (!presentationType.matches(GENERALIZED_EDIT, PRODUCE_ATTRIBUTE) && !artifact.isHistorical()) { if (artifact.isOfType(CoveragePackage, CoverageFolder, CoverageUnit)) { return PRESENTATION_SUBTYPE_MATCH; } 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 81925a688c7..9dd8b8d7402 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 @@ -12,6 +12,7 @@ package org.eclipse.osee.framework.core.dsl.ui.integration.internal; import static org.eclipse.osee.framework.ui.skynet.render.PresentationType.DEFAULT_OPEN; import static org.eclipse.osee.framework.ui.skynet.render.PresentationType.GENERALIZED_EDIT; +import static org.eclipse.osee.framework.ui.skynet.render.PresentationType.PRODUCE_ATTRIBUTE; import static org.eclipse.osee.framework.ui.skynet.render.PresentationType.SPECIALIZED_EDIT; import java.io.ByteArrayInputStream; import java.io.File; @@ -74,8 +75,8 @@ public final class OseeDslRenderer extends FileSystemRenderer { } @Override - public int getApplicabilityRating(PresentationType presentationType, Artifact artifact) { - if (presentationType != GENERALIZED_EDIT && !artifact.isHistorical()) { + public int getApplicabilityRating(PresentationType presentationType, Artifact artifact) throws OseeCoreException { + if (!presentationType.matches(GENERALIZED_EDIT, PRODUCE_ATTRIBUTE) && !artifact.isHistorical()) { if (artifact.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 5bc3b19f5ac..a2c6dc4cc28 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 @@ -14,6 +14,7 @@ import static org.eclipse.osee.framework.ui.skynet.render.PresentationType.DEFAU import static org.eclipse.osee.framework.ui.skynet.render.PresentationType.GENERALIZED_EDIT; import static org.eclipse.osee.framework.ui.skynet.render.PresentationType.GENERAL_REQUESTED; import static org.eclipse.osee.framework.ui.skynet.render.PresentationType.PREVIEW; +import static org.eclipse.osee.framework.ui.skynet.render.PresentationType.PRODUCE_ATTRIBUTE; import static org.eclipse.osee.framework.ui.skynet.render.PresentationType.SPECIALIZED_EDIT; import java.util.ArrayList; import java.util.Collection; @@ -94,7 +95,7 @@ public class DefaultArtifactRenderer implements IRenderer { @Override public int getApplicabilityRating(PresentationType presentationType, Artifact artifact) throws OseeCoreException { - if (presentationType.matches(GENERALIZED_EDIT, GENERAL_REQUESTED)) { + if (presentationType.matches(GENERALIZED_EDIT, GENERAL_REQUESTED, PRODUCE_ATTRIBUTE)) { return PRESENTATION_TYPE; } if (presentationType.matches(SPECIALIZED_EDIT, PREVIEW, DEFAULT_OPEN)) { 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 752de51b086..dff61d7ffb4 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 @@ -11,9 +11,10 @@ package org.eclipse.osee.framework.ui.skynet.render; +import static org.eclipse.osee.framework.core.enums.CoreAttributeTypes.ContentUrl; import static org.eclipse.osee.framework.ui.skynet.render.PresentationType.GENERALIZED_EDIT; import static org.eclipse.osee.framework.ui.skynet.render.PresentationType.GENERAL_REQUESTED; -import org.eclipse.osee.framework.core.enums.CoreAttributeTypes; +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; @@ -29,7 +30,7 @@ public class UrlRenderer extends DefaultArtifactRenderer { @Override public int getApplicabilityRating(PresentationType presentationType, Artifact artifact) throws OseeCoreException { - if (!presentationType.matches(GENERALIZED_EDIT, GENERAL_REQUESTED) && artifact.isAttributeTypeValid(CoreAttributeTypes.ContentUrl)) { + if (!presentationType.matches(GENERALIZED_EDIT, GENERAL_REQUESTED, PRODUCE_ATTRIBUTE) && artifact.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 e8d868753cb..4450be3acb2 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 @@ -11,8 +11,10 @@ package org.eclipse.osee.framework.ui.skynet.render; +import static org.eclipse.osee.framework.core.enums.CoreAttributeTypes.WholeWordContent; import static org.eclipse.osee.framework.ui.skynet.render.PresentationType.GENERALIZED_EDIT; import static org.eclipse.osee.framework.ui.skynet.render.PresentationType.GENERAL_REQUESTED; +import static org.eclipse.osee.framework.ui.skynet.render.PresentationType.PRODUCE_ATTRIBUTE; import java.io.IOException; import java.io.InputStream; import java.util.ArrayList; @@ -61,7 +63,7 @@ public class WholeWordRenderer extends WordRenderer { @Override public int getApplicabilityRating(PresentationType presentationType, Artifact artifact) throws OseeCoreException { - if (!presentationType.matches(GENERALIZED_EDIT, GENERAL_REQUESTED) && artifact.isAttributeTypeValid(CoreAttributeTypes.WholeWordContent)) { + if (!presentationType.matches(GENERALIZED_EDIT, GENERAL_REQUESTED, PRODUCE_ATTRIBUTE) && artifact.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 e93c8412951..1cf90025f3f 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 @@ -142,7 +142,7 @@ public class WordTemplateRenderer extends WordRenderer implements ITemplateRende if (artifact.isAttributeTypeValid(CoreAttributeTypes.WordTemplateContent)) { return PRESENTATION_SUBTYPE_MATCH; } - if (presentationType != SPECIALIZED_EDIT && !artifact.isAttributeTypeValid(CoreAttributeTypes.NativeContent) && !artifact.isAttributeTypeValid(CoreAttributeTypes.WholeWordContent)) { + if (!presentationType.matches(SPECIALIZED_EDIT, PresentationType.PRODUCE_ATTRIBUTE) && !artifact.isAttributeTypeValid(CoreAttributeTypes.NativeContent) && !artifact.isAttributeTypeValid(CoreAttributeTypes.WholeWordContent)) { return PRESENTATION_TYPE; } } |