From aec7e4200ca45f9bf5de1d84393b731b75a72be4 Mon Sep 17 00:00:00 2001
From: Ben Steffensmeier <Benjamin.P.Steffensmeier@raytheon.com>
Date: Wed, 8 May 2013 14:41:33 -0500
Subject: [PATCH] Issue #1978 Perform variable substitution on subMenu IDs.

Former-commit-id: d6ae38dcdde7984d5caebcb27c80780123599854
---
 .../viz/ui/menus/widgets/SubmenuContributionItem.java  | 10 +++++++---
 .../localization/menus/radar/baseRadarApplications.xml |  2 +-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/cave/com.raytheon.uf.viz.ui.menus/src/com/raytheon/uf/viz/ui/menus/widgets/SubmenuContributionItem.java b/cave/com.raytheon.uf.viz.ui.menus/src/com/raytheon/uf/viz/ui/menus/widgets/SubmenuContributionItem.java
index b9616960b9..3d99c861bd 100644
--- a/cave/com.raytheon.uf.viz.ui.menus/src/com/raytheon/uf/viz/ui/menus/widgets/SubmenuContributionItem.java
+++ b/cave/com.raytheon.uf.viz.ui.menus/src/com/raytheon/uf/viz/ui/menus/widgets/SubmenuContributionItem.java
@@ -49,6 +49,8 @@ import com.raytheon.uf.viz.ui.menus.xml.MenuXMLMap;
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
  * Mar 26, 2009            chammack     Initial creation
+ * May 08, 2013 1978       bsteffen    Perform variable substitution on subMenu
+ *                                     IDs.
  * 
  * </pre>
  * 
@@ -82,15 +84,17 @@ public class SubmenuContributionItem extends MenuManager {
     public SubmenuContributionItem(VariableSubstitution[] includeSubstitutions,
             String id, String name, CommonAbstractMenuContribution[] ci,
             Set<String> removals) {
-        super(processNameSubstitution(includeSubstitutions, name), id);
+        super(processSubstitution(includeSubstitutions, name),
+                processSubstitution(includeSubstitutions, id));
         this.subs = includeSubstitutions;
         this.contribs = ci;
         this.removals = removals;
     }
 
-    private static String processNameSubstitution(
+    private static String processSubstitution(
             VariableSubstitution[] includeSubstitutions, String name) {
-        if (includeSubstitutions != null && includeSubstitutions.length > 0) {
+        if (name != null && includeSubstitutions != null
+                && includeSubstitutions.length > 0) {
             Map<String, String> map = VariableSubstitution
                     .toMap(includeSubstitutions);
             try {
diff --git a/cave/com.raytheon.viz.radar/localization/menus/radar/baseRadarApplications.xml b/cave/com.raytheon.viz.radar/localization/menus/radar/baseRadarApplications.xml
index 7dbbf2d264..89f85d5ac3 100644
--- a/cave/com.raytheon.viz.radar/localization/menus/radar/baseRadarApplications.xml
+++ b/cave/com.raytheon.viz.radar/localization/menus/radar/baseRadarApplications.xml
@@ -37,7 +37,7 @@
 	<contribute xsi:type="command"
 		commandId="com.raytheon.uf.viz.radarapps.rps.rpsListEditor" menuText="RPS List Editor..."
 		id="${icao}RPSListEditor" />
-	<contribute xsi:type="subMenu" menuText="Radar Tools" id="${icao}RadarTools">
+	<contribute xsi:type="subMenu" menuText="Radar Tools">
 		<contribute xsi:type="command" commandId="com.raytheon.viz.awipstools.estimatedactualvelocity" menuText="Estimated Actual Velocity" 
 			id="${icao}EstimatedActualVelocity" />
 		<contribute xsi:type="command"