diff options
author | megumi.telles | 2017-06-29 17:21:49 +0000 |
---|---|---|
committer | megumi.telles | 2017-06-29 17:21:49 +0000 |
commit | ac7a4c0d447d412fa08280f3501aad58d49ab5ec (patch) | |
tree | 27fb3c9783fc12a4605acc7f98a5d37ad2f8e53f | |
parent | dae70e8f50a2c9ed85b74191669382ba7d65ae82 (diff) | |
download | org.eclipse.osee-ac7a4c0d447d412fa08280f3501aad58d49ab5ec.tar.gz org.eclipse.osee-ac7a4c0d447d412fa08280f3501aad58d49ab5ec.tar.xz org.eclipse.osee-ac7a4c0d447d412fa08280f3501aad58d49ab5ec.zip |
bug: Fix app check on excluded configs
-rw-r--r-- | plugins/org.eclipse.osee.define.report/src/org/eclipse/osee/define/report/internal/wordupdate/WordMLApplicabilityHandler.java | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/plugins/org.eclipse.osee.define.report/src/org/eclipse/osee/define/report/internal/wordupdate/WordMLApplicabilityHandler.java b/plugins/org.eclipse.osee.define.report/src/org/eclipse/osee/define/report/internal/wordupdate/WordMLApplicabilityHandler.java index d9d2e7646ad..40e27be7322 100644 --- a/plugins/org.eclipse.osee.define.report/src/org/eclipse/osee/define/report/internal/wordupdate/WordMLApplicabilityHandler.java +++ b/plugins/org.eclipse.osee.define.report/src/org/eclipse/osee/define/report/internal/wordupdate/WordMLApplicabilityHandler.java @@ -16,6 +16,7 @@ import java.util.HashMap; import java.util.Iterator; import java.util.List; import java.util.Map; +import java.util.Map.Entry; import java.util.Stack; import java.util.TreeMap; import java.util.regex.Matcher; @@ -50,7 +51,7 @@ public class WordMLApplicabilityHandler { private final Collection<String> configurationsAllowed; private final Stack<ApplicabilityBlock> applicBlocks; private final String featureDefinitionJson; - private ScriptEngine se; + private final ScriptEngine se; private final Log logger; public WordMLApplicabilityHandler(OrcsApi orcsApi, Log logger, BranchId branch, ArtifactId view) { @@ -399,8 +400,17 @@ public class WordMLApplicabilityHandler { if (!value.toLowerCase().equals("excluded")) { toReturn = beginningText; } + } else { + boolean isExcluded = false; + for (Entry<String, List<String>> entry : id_value_map.entrySet()) { + List<String> value = entry.getValue(); + isExcluded = value.get(0).toLowerCase().equals("excluded") ? true : false; + if (!isExcluded) { + break; + } + } + toReturn = isExcluded ? beginningText : ""; } - return toReturn; } |