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

Merge "Issue #2860 - Fix to not create empty substitution tags" into omaha_14.3.1

Browse source 
Former-commit-id: 580a95ed41 [formerly f6f9169aef] [formerly 1eade4f434] [formerly f005d2f31c [formerly 1eade4f434 [formerly aebaae7802e5429eed3ebc39ae9be45568912d8a]]]
Former-commit-id: f005d2f31c
Former-commit-id: 32bb783c21f96ad95b5837b59bfa30c95ba65a23 [formerly b98328113b]
Former-commit-id: a6df4bd2b2
This commit is contained in:
Nate Jensen 2014-04-30 15:16:11 -05:00 • committed by Gerrit Code Review
commit 299cb28462
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