Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid W. Miller2017-02-21 00:33:09 +0000
committerRyan Brooks2017-02-21 17:16:10 +0000
commit90931370ab0c708e4b39d020f436e63c33dfcc4c (patch)
tree42c97cec7aeb22c5acc665864ba68b7177a0f28c
parentd46365c9c9092196c39e502cb76b844e57a54b9c (diff)
downloadorg.eclipse.osee-90931370ab0c708e4b39d020f436e63c33dfcc4c.tar.gz
org.eclipse.osee-90931370ab0c708e4b39d020f436e63c33dfcc4c.tar.xz
org.eclipse.osee-90931370ab0c708e4b39d020f436e63c33dfcc4c.zip
feature[ats_ATS345087]: Update renderer to handle double click0.24.4.v201702221637-NR0.24.4.v201702171655-NR
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/UrlRenderer.java4
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/WordTemplateRenderer.java21
2 files changed, 20 insertions, 5 deletions
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 9f48e261e17..9a5d01857e0 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
@@ -12,6 +12,7 @@
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.DEFAULT_OPEN;
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.WEB_PREVIEW;
@@ -49,8 +50,9 @@ public class UrlRenderer extends DefaultArtifactRenderer {
GENERAL_REQUESTED) && aArtifact.getAttributeCount(ContentUrl) > 0) {
if (presentationType.equals(WEB_PREVIEW)) {
return SPECIALIZED_MATCH;
+ } else if (presentationType.equals(DEFAULT_OPEN)) {
+ return PRESENTATION_TYPE;
}
- return ARTIFACT_TYPE_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 602d120ef1e..81eaec418d7 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
@@ -11,6 +11,11 @@
package org.eclipse.osee.framework.ui.skynet.render;
+import static org.eclipse.osee.framework.core.enums.CoreAttributeTypes.WordTemplateContent;
+import static org.eclipse.osee.framework.ui.skynet.render.PresentationType.DEFAULT_OPEN;
+import static org.eclipse.osee.framework.ui.skynet.render.PresentationType.DIFF;
+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.SPECIALIZED_EDIT;
import java.io.ByteArrayOutputStream;
@@ -129,10 +134,18 @@ public class WordTemplateRenderer extends WordRenderer implements ITemplateRende
public int getApplicabilityRating(PresentationType presentationType, IArtifact artifact, Object... objects) throws OseeCoreException {
int rating = NO_MATCH;
Artifact aArtifact = artifact.getFullArtifact();
- if (!presentationType.matches(PresentationType.GENERALIZED_EDIT, PresentationType.GENERAL_REQUESTED)) {
- if (aArtifact.isAttributeTypeValid(CoreAttributeTypes.WordTemplateContent)) {
- rating = PRESENTATION_SUBTYPE_MATCH;
- } else if (presentationType.matches(PresentationType.PREVIEW, PresentationType.DIFF)) {
+ if (!presentationType.matches(GENERALIZED_EDIT, GENERAL_REQUESTED)) {
+ if (aArtifact.isAttributeTypeValid(WordTemplateContent)) {
+ if (presentationType.matches(DEFAULT_OPEN, PREVIEW)) {
+ if (aArtifact.getAttributeCount(WordTemplateContent) > 0) {
+ rating = PRESENTATION_SUBTYPE_MATCH;
+ } else {
+ rating = SUBTYPE_TYPE_MATCH;
+ }
+ } else {
+ rating = PRESENTATION_SUBTYPE_MATCH;
+ }
+ } else if (presentationType.matches(PREVIEW, DIFF)) {
rating = BASE_MATCH;
}
}

Back to the top