diff options
author | rbrooks | 2010-08-27 01:21:12 +0000 |
---|---|---|
committer | rbrooks | 2010-08-27 01:21:12 +0000 |
commit | 01ebcbd80ad02ba75b515262e1b0c6a74fee12fe (patch) | |
tree | a262843c2ecd21ed327607802859c0da6c5fe5e4 /plugins | |
parent | 8586f057c2e8ebe07bd74e9c4028c3ed4b3ce5a0 (diff) | |
download | org.eclipse.osee-01ebcbd80ad02ba75b515262e1b0c6a74fee12fe.tar.gz org.eclipse.osee-01ebcbd80ad02ba75b515262e1b0c6a74fee12fe.tar.xz org.eclipse.osee-01ebcbd80ad02ba75b515262e1b0c6a74fee12fe.zip |
Corrected bug in TisRenderer.getApplicabilityRating identified by improving RendererManagerTest
Diffstat (limited to 'plugins')
3 files changed, 11 insertions, 12 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 fd67d87d938..9daa06d58d7 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 @@ -16,6 +16,7 @@ import static org.eclipse.osee.ats.test.render.RendererManagerTest.DefaultOption import static org.eclipse.osee.ats.util.AtsArtifactTypes.Action; import static org.eclipse.osee.framework.core.enums.CoreArtifactTypes.GeneralDocument; import static org.eclipse.osee.framework.core.enums.CoreArtifactTypes.SoftwareRequirement; +import static org.eclipse.osee.framework.core.enums.CoreArtifactTypes.TestInformationSheet; import static org.eclipse.osee.framework.core.enums.CoreArtifactTypes.TestProcedureWML; import static org.eclipse.osee.framework.ui.skynet.render.PresentationType.DEFAULT_OPEN; import static org.eclipse.osee.framework.ui.skynet.render.PresentationType.DIFF; @@ -141,14 +142,14 @@ public class RendererManagerTest { data.add(new Object[] {GeneralDocument, DEFAULT_OPEN, NativeRenderer.class, Off}); data.add(new Object[] {GeneralDocument, DEFAULT_OPEN, DefaultArtifactRenderer.class, On}); - data.add(new Object[] {TestProcedureWML, GENERALIZED_EDIT, DefaultArtifactRenderer.class, Both}); - data.add(new Object[] {TestProcedureWML, SPECIALIZED_EDIT, WordTemplateRenderer.class, Both}); - data.add(new Object[] {TestProcedureWML, DIFF, WordTemplateRenderer.class, Both}); - data.add(new Object[] {TestProcedureWML, PREVIEW, TisRenderer.class, Both}); - data.add(new Object[] {TestProcedureWML, MERGE, WordTemplateRenderer.class, Both}); - data.add(new Object[] {TestProcedureWML, MERGE_EDIT, WordTemplateRenderer.class, Both}); - data.add(new Object[] {TestProcedureWML, DEFAULT_OPEN, TisRenderer.class, Off}); - data.add(new Object[] {TestProcedureWML, DEFAULT_OPEN, DefaultArtifactRenderer.class, On}); + data.add(new Object[] {TestInformationSheet, GENERALIZED_EDIT, DefaultArtifactRenderer.class, Both}); + data.add(new Object[] {TestInformationSheet, SPECIALIZED_EDIT, WordTemplateRenderer.class, Both}); + data.add(new Object[] {TestInformationSheet, DIFF, WordTemplateRenderer.class, Both}); + data.add(new Object[] {TestInformationSheet, PREVIEW, TisRenderer.class, Both}); + data.add(new Object[] {TestInformationSheet, MERGE, WordTemplateRenderer.class, Both}); + 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}); return data; } 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 63a759a30e5..ff8ca82a909 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 @@ -28,6 +28,7 @@ import org.eclipse.swt.graphics.Image; */ public interface IRenderer { + public static final int SPECIALIZED_MATCH = 60; public static final int PRESENTATION_SUBTYPE_MATCH = 50; public static final int PRESENTATION_TYPE = 40; public static final int SUBTYPE_TYPE_MATCH = 30; 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 aa45bce65ef..1118b01a8fa 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 @@ -44,7 +44,7 @@ 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)) { - return SUBTYPE_TYPE_MATCH; + return SPECIALIZED_MATCH; } return NO_MATCH; } @@ -67,9 +67,6 @@ public class TisRenderer extends WordTemplateRenderer { @Override public InputStream getRenderInputStream(PresentationType presentationType, List<Artifact> artifacts) throws OseeCoreException { - if (PresentationType.GENERALIZED_EDIT == presentationType) { - return super.getRenderInputStream(presentationType, artifacts); - } final VariableMap variableMap = new VariableMap(); String template; |