From 46f7e6bb8d50c8fa713fe746d86fa3c6cbe5a62c Mon Sep 17 00:00:00 2001 From: AWIPS User Date: Wed, 22 Apr 2015 17:34:42 -0600 Subject: [PATCH] LOCAL_RADARS will not show under main menu anymore Former-commit-id: 26d3cfdf397f0d22ac888fab9ad69cf1fe6e4f6f [formerly 07afa1ef0d53d4d6681b30865f385fabdcc592aa] [formerly 13396447405d71652a5a45bdf024e2c65f3a9c5b [formerly 67632b57bdfe07f1f175e00bdd3c9dc4c21ce35e]] Former-commit-id: 8a107784ef89e4f80b84cf9d84c51f656bc40204 [formerly 98678aa03205c3595adb21b638ae0dd625c861d0] Former-commit-id: 4f28f24f1536ce0e451417fa8cfa02e51344fafc --- .../edex/plugin/radar/util/RadarMenuUtil.java | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/edexOsgi/com.raytheon.edex.plugin.radar/src/com/raytheon/edex/plugin/radar/util/RadarMenuUtil.java b/edexOsgi/com.raytheon.edex.plugin.radar/src/com/raytheon/edex/plugin/radar/util/RadarMenuUtil.java index 7cae0be45b..1e5e9fe059 100644 --- a/edexOsgi/com.raytheon.edex.plugin.radar/src/com/raytheon/edex/plugin/radar/util/RadarMenuUtil.java +++ b/edexOsgi/com.raytheon.edex.plugin.radar/src/com/raytheon/edex/plugin/radar/util/RadarMenuUtil.java @@ -90,22 +90,24 @@ public class RadarMenuUtil extends AbstractMenuUtil implements // retrieve the local radars from // radarsInUse.txt RadarsInUseUtil.setParsed(false); - List radars = RadarsInUseUtil.getSite(getSite(), - RadarsInUseUtil.LOCAL_CONSTANT); - + VariableSubstitution[] vars = null; + // loop through all the radars + Map> map = TerminalRadarUtils + .parseTerminalRadarFile(); String path = "menus" + File.separator + "radar" + File.separator; CommonMenuContributionFile menuContributionFile = new CommonMenuContributionFile(); CommonIncludeMenuItem includeMenuItem = null; - VariableSubstitution[] vars = null; + /* Unidata comment out localized radars from menus + List radars = RadarsInUseUtil.getSite(getSite(), + RadarsInUseUtil.LOCAL_CONSTANT); + if (radars.size() == 0) { menuContributionFile.contribution = new CommonIncludeMenuItem[1]; } else { menuContributionFile.contribution = new CommonIncludeMenuItem[radars .size()]; } - // loop through all the radars - Map> map = TerminalRadarUtils - .parseTerminalRadarFile(); + if (radars.size() > 0) { for (int i = radars.size() - 1; i >= 0; i--) { includeMenuItem = new CommonIncludeMenuItem(); @@ -166,9 +168,9 @@ public class RadarMenuUtil extends AbstractMenuUtil implements toXml(menuContributionFile, "menus" + File.separator + "radar" + File.separator + "index.xml"); - + */ // now on to dial radars - radars = RadarsInUseUtil.getSite(getSite(), + List radars = RadarsInUseUtil.getSite(getSite(), RadarsInUseUtil.DIAL_CONSTANT); // create MenuTemplateFile for the dialRadars.xml