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

Merge "Issue #2857 - Fix the ncoBase.xml file, add better error logging for missing menu text" into development

Browse source 
Former-commit-id: c37a55b552 [formerly 3e2f280091] [formerly 3221310454 [formerly 4ba995c11c3c67215821c582eeb91d2ed3e17f19]]
Former-commit-id: 3221310454
Former-commit-id: 6ebd2444ef
This commit is contained in:
Richard Peter 2014-03-25 13:11:36 -05:00 • committed by Gerrit Code Review
commit 457e51a4ee
2 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/menus/ncepHydro/nco/ncoMenus.xml
View file

@ -14,7 +14,7 @@
<substitute value="Snow Cover" key="customLegend"/>
<substitute value="0.00" key="sampleFormat"/>
</contribute>
<contribute xsi:type="bundleItem" useReferenceTime="true" file="bundles/ncepHydro/NOHRSC-SNOW.xml" timeQuery="true" id="ncepHydro.nco.snowCoverElev">
<contribute xsi:type="bundleItem" useReferenceTime="true" file="bundles/ncepHydro/NOHRSC-SNOW.xml" menuText="Snow Cover Elev" timeQuery="true" id="ncepHydro.nco.snowCoverElev">
<substitute value="sce" key="param"/>
<substitute value="Snow Cover by elevation (kft)" key="customLegend"/>
<substitute value="0.00" key="sampleFormat"/>
@ -24,18 +24,18 @@
<substitute value="Snow Water Equivalent (in)" key="customLegend"/>
<substitute value="0.00" key="sampleFormat"/>
</contribute>
<contribute xsi:type="bundleItem" useReferenceTime="true" file="bundles/ncepHydro/NOHRSC-SNOW.xml" timeQuery="true" id="ncepHydro.nco.snowWaterPercent">
<contribute xsi:type="bundleItem" useReferenceTime="true" file="bundles/ncepHydro/NOHRSC-SNOW.xml" menuText="Snow Water % nrml" timeQuery="true" id="ncepHydro.nco.snowWaterPercent">
<substitute value="SWEPN" key="param"/>
<substitute value="Snow Water Equivalent % of normal (%)" key="customLegend"/>
<substitute value="0.00" key="sampleFormat"/>
</contribute>
</contribute>
<contribute xsi:type="bundleItem" useReferenceTime="true" file="bundles/Redbook.xml" timeQuery="true" id="ncepHydro.nco.radarSummary">
<contribute xsi:type="bundleItem" useReferenceTime="true" file="bundles/Redbook.xml" menuText="Radar Summary" timeQuery="true" id="ncepHydro.nco.radarSummary">
<substitute value="PAWO82" key="wmo"/>
<substitute value="3600" key="posOff"/>
<substitute value="-2100" key="virtOff"/>
</contribute>
<contribute xsi:type="bundleItem" useReferenceTime="true" file="bundles/Redbook.xml" timeQuery="true" id="ncepHydro.nco.radarLegends">
<contribute xsi:type="bundleItem" useReferenceTime="true" file="bundles/Redbook.xml" menuText="Radar Legends" timeQuery="true" id="ncepHydro.nco.radarLegends">
<substitute value="PAWO83" key="wmo"/>
<substitute value="3600" key="posOff"/>
<substitute value="-2100" key="virtOff"/>

10
cave/com.raytheon.uf.viz.ui.menus/src/com/raytheon/uf/viz/ui/menus/widgets/BundleContributionItem.java
View file

@ -86,6 +86,8 @@ import com.raytheon.viz.ui.actions.LoadBundleHandler;
* Jan 14, 2013 1442 rferrel Add Simulated Time Change Listener.
* Aug 30, 2013 2310 bsteffen Move loading of bundle to
* LoadBundleHandler.
* Mar 25, 2014 2857 mpduff In the case of missing menu text throw exception
* stating the id of the missing text.
*
*
* </pre>
@ -164,7 +166,13 @@ public class BundleContributionItem extends ContributionItem {
.get(contribution.suppressErrors.substring(2,
contribution.suppressErrors.length() - 1)));
}
// Substitute the menu text
if (menuContribution.xml.text == null) {
throw new IllegalStateException("Missing menu text for menu id: "
+ menuContribution.xml.id);
}
this.menuText = VariableSubstitutionUtil.processVariables(
menuContribution.xml.text, this.substitutions);
if (contribution.dataURIs != null) {
@ -455,7 +463,7 @@ public class BundleContributionItem extends ContributionItem {
private class BundleRefreshCallback implements IURIRefreshCallback {
private BinOffset offset;
private final BinOffset offset;
/**
* @param optional2