diff options
author | megumi.telles | 2017-09-22 18:53:55 +0000 |
---|---|---|
committer | megumi.telles | 2017-09-22 18:53:55 +0000 |
commit | 113e1cfe69c8834759ca82adae6bf63cde6ab254 (patch) | |
tree | 49b8894697043cd2b6722112dbecdc1a57c53c06 | |
parent | 1ba2c7852e3d68bf06a169b51b207754972e4ac9 (diff) | |
download | org.eclipse.osee-113e1cfe69c8834759ca82adae6bf63cde6ab254.tar.gz org.eclipse.osee-113e1cfe69c8834759ca82adae6bf63cde6ab254.tar.xz org.eclipse.osee-113e1cfe69c8834759ca82adae6bf63cde6ab254.zip |
bug: Fix logic on publish ignore artifact
-rw-r--r-- | plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/word/WordTemplateProcessor.java | 5 |
1 files 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); |