xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Issue #2860 - Fix to not create empty substitution tags

Browse source 
Change-Id: I6734c61103b5bf9db3c27adfe0305cb5eb60d4ff

Former-commit-id: a4952ba394 [formerly 2b1116f380] [formerly 90895cf316] [formerly 90895cf316 [formerly 60bfadd865]] [formerly c0b2a19a2f [formerly 90895cf316 [formerly 60bfadd865] [formerly c0b2a19a2f [formerly ecd5428e2adad5a0b8022d4a89a13a5a4d549dc1]]]]
Former-commit-id: c0b2a19a2f
Former-commit-id: d5d5b17c60e5af1adfcf464f599ffafa228ab32f [formerly b8d16c9b3441a0ac07d22e0891f1c3ff651d8b8d] [formerly 1e84cb07c2 [formerly 0601068b03]]
Former-commit-id: 1e84cb07c2
Former-commit-id: e5572a5cd0
This commit is contained in:
Mike Duff 2014-04-30 10:17:56 -05:00
parent 4b51c10039
commit 9b76996af3
1 changed files with 2 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
edexOsgi/com.raytheon.uf.edex.plugin.redbook/src/com/raytheon/uf/edex/plugin/redbook/menu/RedbookMenuUtil.java
View file

@ -54,6 +54,7 @@ import com.raytheon.uf.edex.plugin.redbook.ingest.xml.RedbookMenusXML;
* Mar 07, 2014 2858 mpduff Initial creation
* Mar 14, 2014 2855 mpduff Refactored common code.
* Mar 19, 2014 2860 mpduff Implemented Redbook UpperAir.
* Apr 30, 2014 2860 mpduff Fixed instances of empty substitution tags.
*
* </pre>
*
@ -168,15 +169,8 @@ public abstract class RedbookMenuUtil extends AbstractMenuUtil {
commonBundleMenuContribution.id = menuEntry.getId();
commonBundleMenuContribution.text = menuEntry.getText();
if (menuEntry.getMenuEntryList().size() > 0) {
if (!menuEntry.getMenuEntryList().isEmpty()) {
List<VariableSubstitution> subList = new ArrayList<VariableSubstitution>();
for (MenuEntry substitute : menuEntry.getMenuEntryList()) {
VariableSubstitution var = new VariableSubstitution();
var.key = substitute.getKey();
var.value = substitute.getValue();
subList.add(var);
}
List<String> dataUriList = new ArrayList<String>();
for (MenuEntry me : menuEntry.getMenuEntryList()) {
@ -190,7 +184,6 @@ public abstract class RedbookMenuUtil extends AbstractMenuUtil {
} else if (MenuEntryType.DataUri == me.getType()) {
dataUriList.add(me.getDataUri());
}
}
commonBundleMenuContribution.substitutions = subList