diff --git a/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/menus/ncepHydro/nco/ncoMenus.xml b/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/menus/ncepHydro/nco/ncoMenus.xml
index 7d0920a97f..c57bd4945a 100644
--- a/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/menus/ncepHydro/nco/ncoMenus.xml
+++ b/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/menus/ncepHydro/nco/ncoMenus.xml
@@ -14,7 +14,7 @@
-
+
@@ -24,18 +24,18 @@
-
+
-
+
-
+
diff --git a/cave/com.raytheon.uf.viz.ui.menus/src/com/raytheon/uf/viz/ui/menus/widgets/BundleContributionItem.java b/cave/com.raytheon.uf.viz.ui.menus/src/com/raytheon/uf/viz/ui/menus/widgets/BundleContributionItem.java
index 3f1afdaa1b..81727c4888 100644
--- a/cave/com.raytheon.uf.viz.ui.menus/src/com/raytheon/uf/viz/ui/menus/widgets/BundleContributionItem.java
+++ b/cave/com.raytheon.uf.viz.ui.menus/src/com/raytheon/uf/viz/ui/menus/widgets/BundleContributionItem.java
@@ -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.
*
*
*
@@ -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