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

Merge "Issue #1978 Perform variable substitution on subMenu IDs." into development

Browse source 
Former-commit-id: 928953493d [formerly 11965c031f] [formerly 9e0f3acbc0] [formerly e753329f47 [formerly 9e0f3acbc0 [formerly b1e425c0da9a241a60f2a0508c40d180fe5058fa]]]
Former-commit-id: e753329f47
Former-commit-id: 017678ac36dc45fdfad60b080392f0b3fef458b8 [formerly 2299e22de2]
Former-commit-id: 84caf44a0c
This commit is contained in:
Nate Jensen 2013-05-08 18:40:51 -05:00 • committed by Gerrit Code Review
commit 148a005bfd
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -49,6 +49,8 @@ import com.raytheon.uf.viz.ui.menus.xml.MenuXMLMap;
* Date Ticket# Engineer Description * Date Ticket# Engineer Description
* ------------ ---------- ----------- -------------------------- * ------------ ---------- ----------- --------------------------
* Mar 26, 2009 chammack Initial creation * Mar 26, 2009 chammack Initial creation
* May 08, 2013 1978 bsteffen Perform variable substitution on subMenu
* IDs.
* *
* </pre> * </pre>
* *
@ -82,15 +84,17 @@ public class SubmenuContributionItem extends MenuManager {
public SubmenuContributionItem(VariableSubstitution[] includeSubstitutions, public SubmenuContributionItem(VariableSubstitution[] includeSubstitutions,
String id, String name, CommonAbstractMenuContribution[] ci, String id, String name, CommonAbstractMenuContribution[] ci,
Set<String> removals) { Set<String> removals) {
super(processNameSubstitution(includeSubstitutions, name), id); super(processSubstitution(includeSubstitutions, name),
processSubstitution(includeSubstitutions, id));
this.subs = includeSubstitutions; this.subs = includeSubstitutions;
this.contribs = ci; this.contribs = ci;
this.removals = removals; this.removals = removals;
} }
private static String processNameSubstitution( private static String processSubstitution(
VariableSubstitution[] includeSubstitutions, String name) { VariableSubstitution[] includeSubstitutions, String name) {
if (includeSubstitutions != null && includeSubstitutions.length > 0) { if (name != null && includeSubstitutions != null
&& includeSubstitutions.length > 0) {
Map<String, String> map = VariableSubstitution Map<String, String> map = VariableSubstitution
.toMap(includeSubstitutions); .toMap(includeSubstitutions);
try { try {

2
cave/com.raytheon.viz.radar/localization/menus/radar/baseRadarApplications.xml
View file

@ -37,7 +37,7 @@
<contribute xsi:type="command" <contribute xsi:type="command"
commandId="com.raytheon.uf.viz.radarapps.rps.rpsListEditor" menuText="RPS List Editor..." commandId="com.raytheon.uf.viz.radarapps.rps.rpsListEditor" menuText="RPS List Editor..."
id="${icao}RPSListEditor" /> 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" <contribute xsi:type="command" commandId="com.raytheon.viz.awipstools.estimatedactualvelocity" menuText="Estimated Actual Velocity"
id="${icao}EstimatedActualVelocity" /> id="${icao}EstimatedActualVelocity" />
<contribute xsi:type="command" <contribute xsi:type="command"