| commit | 113e1cfe69c8834759ca82adae6bf63cde6ab254 | [log] [tgz] |
|---|---|---|
| author | megumi.telles <megumi.telles@boeing.com> | Fri Sep 22 11:53:55 2017 -0700 |
| committer | megumi.telles <megumi.telles@boeing.com> | Fri Sep 22 11:53:55 2017 -0700 |
| tree | 49b8894697043cd2b6722112dbecdc1a57c53c06 | |
| parent | 1ba2c7852e3d68bf06a169b51b207754972e4ac9 [diff] |
bug: Fix logic on publish ignore artifact
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 df7c25a..89a0859 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 @@ // 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);