From 113e1cfe69c8834759ca82adae6bf63cde6ab254 Mon Sep 17 00:00:00 2001 From: megumi.telles Date: Fri, 22 Sep 2017 11:53:55 -0700 Subject: bug: Fix logic on publish ignore artifact --- .../osee/framework/ui/skynet/render/word/WordTemplateProcessor.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/word/WordTemplateProcessor.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/word/WordTemplateProcessor.java index df7c25acea2..89a0859cca0 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/word/WordTemplateProcessor.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/word/WordTemplateProcessor.java @@ -578,8 +578,9 @@ public class WordTemplateProcessor { // If the artifact has not been processed if (!processedArtifacts.contains(artifact)) { - boolean ignoreArtifact = excludeFolders && artifact.isOfType( - CoreArtifactTypes.Folder) && !artifactsToExclude.containsKey(artifact.getId()); + boolean ignoreArtifact = + (excludeFolders && artifact.isOfType(CoreArtifactTypes.Folder)) || artifactsToExclude.containsKey( + ArtifactId.valueOf(artifact.getId())); boolean ignoreArtType = excludeArtifactTypes != null && artifact.isOfType(excludeArtifactTypes); boolean publishInline = artifact.getSoleAttributeValue(CoreAttributeTypes.PublishInline, false); -- cgit v1.2.3