diff --git a/cave/build/p2-build.xml b/cave/build/p2-build.xml index 5d9098df19..9c3c8a1074 100644 --- a/cave/build/p2-build.xml +++ b/cave/build/p2-build.xml @@ -319,10 +319,14 @@ - - - + + + + + + diff --git a/cave/build/static/common/cave/etc/bundles/AllTilts.xml b/cave/build/static/common/cave/etc/bundles/AllTilts.xml deleted file mode 100644 index 2b168b7bb0..0000000000 --- a/cave/build/static/common/cave/etc/bundles/AllTilts.xml +++ /dev/null @@ -1,132 +0,0 @@ - - - - - - - - - - - 1.0 - 1.0 - false - METADATA - - - - - - EQUALS - 19 - - - - - EQUALS - radar - - - - - EQUALS - koax - - - - - - IN - 0.5,1.5,2.4,3.4 - - - - - - - - - - true - 1.0 - - - - - - 1.0 - 1.0 - false - METADATA - - - - - - EQUALS - 56 - - - - - EQUALS - radar - - - - - EQUALS - koax - - - - - - - - - - true - 1.0 - - - - - - Radar/OSF/16 Level Reflectivity - 255.0 - 255.0 - -28.0 - -24.0 - -20.0 - -16.0 - -12.0 - -8.0 - -4.0 - 0.0 - 4.0 - 8.0 - 12.0 - 16.0 - 20.0 - 24.0 - 28.0 - - - - - - true - 1.0 - true - - - - diff --git a/cave/build/static/common/cave/etc/bundles/DefaultFourSatellite.xml b/cave/build/static/common/cave/etc/bundles/DefaultFourSatellite.xml deleted file mode 100644 index 0582cc741d..0000000000 --- a/cave/build/static/common/cave/etc/bundles/DefaultFourSatellite.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - - - - - - - - PLAN_VIEW - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/cave/build/static/common/cave/etc/bundles/DefaultRadarFourPanel.xml b/cave/build/static/common/cave/etc/bundles/DefaultRadarFourPanel.xml deleted file mode 100644 index df8b21c579..0000000000 --- a/cave/build/static/common/cave/etc/bundles/DefaultRadarFourPanel.xml +++ /dev/null @@ -1,179 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/cave/build/static/common/cave/etc/bundles/DefaultRadarMosaicBestRes.xml b/cave/build/static/common/cave/etc/bundles/DefaultRadarMosaicBestRes.xml deleted file mode 100644 index 982f9d89c6..0000000000 --- a/cave/build/static/common/cave/etc/bundles/DefaultRadarMosaicBestRes.xml +++ /dev/null @@ -1,213 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/cave/build/static/common/cave/etc/bundles/IRWindow.xml b/cave/build/static/common/cave/etc/bundles/IRWindow.xml deleted file mode 100644 index dfae57f69a..0000000000 --- a/cave/build/static/common/cave/etc/bundles/IRWindow.xml +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - - 1.0 - 1.0 - false - METADATA - - - - - - EQUALS - Imager 11 micron IR - - - - - EQUALS - East CONUS - - - - - EQUALS - satellite - - - - - - - - - true - 1.0 - true - - - - diff --git a/cave/build/static/common/cave/etc/bundles/LocalWarnings.xml b/cave/build/static/common/cave/etc/bundles/LocalWarnings.xml deleted file mode 100644 index a54490718d..0000000000 --- a/cave/build/static/common/cave/etc/bundles/LocalWarnings.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/cave/build/static/common/cave/etc/bundles/VisWindow.xml b/cave/build/static/common/cave/etc/bundles/VisWindow.xml deleted file mode 100644 index 62a455a2a6..0000000000 --- a/cave/build/static/common/cave/etc/bundles/VisWindow.xml +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - - 1.0 - 1.0 - false - METADATA - - - - - - EQUALS - Imager Visible - - - - - EQUALS - East CONUS - - - - - EQUALS - satellite - - - - - - - - - true - 1.0 - true - - - - diff --git a/cave/build/static/common/cave/etc/bundles/WVWindow.xml b/cave/build/static/common/cave/etc/bundles/WVWindow.xml deleted file mode 100644 index d3e875bb81..0000000000 --- a/cave/build/static/common/cave/etc/bundles/WVWindow.xml +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - - 1.0 - 1.0 - false - METADATA - - - - - - EQUALS - Imager 6.7-6.5 micron IR (WV) - - - - - EQUALS - East CONUS - - - - - EQUALS - satellite - - - - - - - - - true - 1.0 - true - - - - diff --git a/cave/build/static/common/cave/etc/bundles/Warnings.xml b/cave/build/static/common/cave/etc/bundles/Warnings.xml deleted file mode 100644 index fd6366e4ef..0000000000 --- a/cave/build/static/common/cave/etc/bundles/Warnings.xml +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/cave/build/static/common/cave/etc/bundles/bundleToMenu.xslt b/cave/build/static/common/cave/etc/bundles/bundleToMenu.xslt deleted file mode 100644 index 88e82e5e4e..0000000000 --- a/cave/build/static/common/cave/etc/bundles/bundleToMenu.xslt +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - - - - - - - - - diff --git a/cave/build/static/common/cave/etc/bundles/corner_map.xml b/cave/build/static/common/cave/etc/bundles/corner_map.xml deleted file mode 100644 index 9420d387ee..0000000000 --- a/cave/build/static/common/cave/etc/bundles/corner_map.xml +++ /dev/null @@ -1,89 +0,0 @@ - - - CONUS - 0.5405884981155396 -
- -98.63120732934439 - 38.59133904765234 - 0.0 -
- - PROJCS["Lambert Conformal (SP: 25.0/25.0, Origin: -95.0)", - GEOGCS["WGS84", - DATUM["WGS84", - SPHEROID["WGS84", 6378137.0, 298.257223563]], - PRIMEM["Greenwich", 0.0], - UNIT["degree", 0.017453292519943295], - AXIS["Geodetic longitude", EAST], - AXIS["Geodetic latitude", NORTH]], - PROJECTION["Lambert_Conformal_Conic_1SP"], - PARAMETER["central_meridian", -95.0], - PARAMETER["latitude_of_origin", 25.0], - PARAMETER["false_easting", 0.0], - PARAMETER["false_northing", 0.0], - UNIT["m", 1.0], - AXIS["Easting", EAST], - AXIS["Northing", NORTH]] - - - - VALID_TIME_SEQ - - - - State/County Boundaries - - - - - State Boundaries - conandsta.bcd - RGB {155, 155, 155} - 1 - true - - - - true - 1.0 - true - - 750000 - 100000000 - - - - - - - US Counties - uscounty.bcd - RGB {155, 155, 155} - 1 - true - - - - true - 1.0 - true - - 0 - 750000 - - - - - RGB {155, 155, 155} - 1 - true - - - - true - 1.0 - true - - - - diff --git a/cave/build/static/common/cave/etc/menus/ncepHydro/cpc/baseCPC.xml b/cave/build/static/common/cave/etc/menus/ncepHydro/cpc/baseCPC.xml deleted file mode 100644 index 1e0eb6cc24..0000000000 --- a/cave/build/static/common/cave/etc/menus/ncepHydro/cpc/baseCPC.xml +++ /dev/null @@ -1,154 +0,0 @@ - - - - - - /redbook/%/PYIA88/% - - - - /redbook/%/PMNV88/% - - - - - - /redbook/%/PEIY97/% - - - - /redbook/%/PYIY97/% - - - - /redbook/%/PTIY97/% - - - - - - /redbook/%/PEIY96/% - - - - /redbook/%/PYIY96/% - - - - /redbook/%/PTIY96/% - - - - - - /redbook/%/PTAS90/% - - - - /redbook/%/PTAS95/% - - - - /redbook/%/PTAS00/% - - - - /redbook/%/PTNR98/% - - - - - - /redbook/%/PTAT90/% - - - - /redbook/%/PTAT95/% - - - - /redbook/%/PTAT00/% - - - - /redbook/%/PTNT98/% - - - - - - - - - - - - - /grib/%/CPCoutlook211/PTAN/% - - - /grib/%/CPCoutlook211/PTNN/% - - - /grib/%/CPCoutlook211/PTBN/% - - - /grib/%/CPCoutlook211/PPAN/% - - - /grib/%/CPCoutlook211/PPNN/% - - - /grib/%/CPCoutlook211/PPBN/% - - - \ No newline at end of file diff --git a/cave/build/static/common/cave/etc/menus/ncepHydro/hpc/baseHPC.xml b/cave/build/static/common/cave/etc/menus/ncepHydro/hpc/baseHPC.xml deleted file mode 100644 index 8862c717d7..0000000000 --- a/cave/build/static/common/cave/etc/menus/ncepHydro/hpc/baseHPC.xml +++ /dev/null @@ -1,259 +0,0 @@ - - - - - /grib/%/HPCqpf/% - - - - - /redbook/%/PEIC61/% - - - - /redbook/%/PEI745/% - - - - /grib/%/HPCqpfNDFD/PPFFG/% - - - - - - - - - - /redbook/%/PENJ88/% - - - - /redbook/%/PENA01/% - - - - - - /redbook/%/PSBB04/% - - - - /redbook/%/PSBC04/% - - - - /redbook/%/PSBD04/% - - - - - - /redbook/%/PSBB08/% - - - - /redbook/%/PSBC08/% - - - - /redbook/%/PSBD08/% - - - - - - /redbook/%/PSBB12/% - - - - /redbook/%/PSBC12/% - - - - /redbook/%/PSBD12/% - - - - - - /redbook/%/PSBB25/% - - - - /redbook/%/PSBC25/% - - - - /redbook/%/PSBD25/% - - - - - - /redbook/%/PEIO46/% - - - - /redbook/%/PEIY47/% - - - - /redbook/%/PEIV98/% - - - - /redbook/%/PEIW01/% - - - - /redbook/%/PENV01/% - - - - - - - /grib/%/HPCqpfNDFD/TP6hr/% - - - /grib/%/HPCqpfNDFD/TP48hr/% - - - /grib/%/HPCqpfNDFD/TP120hr/% - - - - - - /redbook/%/PTIO52/% - - - - /redbook/%/PTIO53/% - - - - /redbook/%/PYWK43/% - - - - /redbook/%/PTNK98/% - - - - /redbook/%/PTNM98/% - - - - /redbook/%/PTNO98/% - - - - /redbook/%/PTNQ98/% - - - - /redbook/%/PTNS98/% - - - - /redbook/%/PTTU98/% - - - - /redbook/%/PTIV98/% - - - - /redbook/%/PTIW01/% - - - - /redbook/%/PTNV01/% - - - - - /redbook/%/PPAA89/% - - - - /redbook/%/PYAA98/% - - - - - - - - - - /redbook/%/PSAO72/% - - - - \ No newline at end of file diff --git a/cave/build/static/common/cave/etc/menus/ncepHydro/hurricane/baseHurricane.xml b/cave/build/static/common/cave/etc/menus/ncepHydro/hurricane/baseHurricane.xml deleted file mode 100644 index 342cf202e2..0000000000 --- a/cave/build/static/common/cave/etc/menus/ncepHydro/hurricane/baseHurricane.xml +++ /dev/null @@ -1,175 +0,0 @@ - - - - - - /tcs/%/TCMAT%/% - - - - - /tcs/%/TCMEP%/% - - - - - /tcs/%/TCMWP%/% - - - - - - /tcs/%/TCMAT1/% - - - - /tcs/%/TCMAT2/% - - - - /tcs/%/TCMAT3/% - - - - /tcs/%/TCMAT4/% - - - - /tcs/%/TCMAT5/% - - - - /tcs/%/TCMEP1/% - - - - /tcs/%/TCMEP2/% - - - - /tcs/%/TCMEP3/% - - - - /tcs/%/TCMEP4/% - - - - /tcs/%/TCMEP5/% - - - - /tcs/%/TCMCP1/% - - - - /tcs/%/TCMCP2/% - - - - /tcs/%/TCMCP3/% - - - - /tcs/%/TCMCP4/% - - - - /tcs/%/TCMCP5/% - - - - /tcs/%/TCMWP1/% - - - - /tcs/%/TCMWP2/% - - - - /tcs/%/TCMWP3/% - - - - /tcs/%/TCMWP4/% - - - - /tcs/%/TCMWP5/% - - - - - - /tcg/%/TCEAT%/% - - - - - /tcg/%/TCEEP%/% - - - - - /tcg/%/TCECP%/% - - - - - - - /tcg/%/CHGHUR/% - - - /tcg/%/CHGQLM/% - - \ No newline at end of file diff --git a/cave/build/static/common/cave/etc/menus/ncepHydro/mpc/baseMPC.xml b/cave/build/static/common/cave/etc/menus/ncepHydro/mpc/baseMPC.xml deleted file mode 100644 index b8b0906bac..0000000000 --- a/cave/build/static/common/cave/etc/menus/ncepHydro/mpc/baseMPC.xml +++ /dev/null @@ -1,133 +0,0 @@ - - - - - /redbook/%/PYNA98/% - - - - /redbook/%/PGNE88/% - - - - /redbook/%/PGNE98/% - - - - - /redbook/%/PWAA85/% - - - - /redbook/%/PWAA20/% - - - - /redbook/%/PWAA00/% - - - - /redbook/%/PWAA65/% - - - - - - - /redbook/%/PPAE89/% - - - - /redbook/%/PWEA88/% - - - - - - - /redbook/%/PYAA89/% - - - - - - - - - - - - /redbook/%/PWBA88/% - - - - /redbook/%/PWDA00/% - - - - /redbook/%/PWDA65/% - - - - - - - /redbook/%/PPBE89/% - - - - - - /redbook/%/PYBA89/% - - - - - - - - - \ No newline at end of file diff --git a/cave/build/static/common/cave/etc/menus/ncepHydro/nco/baseNCO.xml b/cave/build/static/common/cave/etc/menus/ncepHydro/nco/baseNCO.xml deleted file mode 100644 index 81c8cd1199..0000000000 --- a/cave/build/static/common/cave/etc/menus/ncepHydro/nco/baseNCO.xml +++ /dev/null @@ -1,221 +0,0 @@ - - - - - - /redbook/%/PEWA31/% - - - - /redbook/%/PEWA32/% - - - - - - - - - - - - - - - - - - - - - - - - - - - - /redbook/%/PAWO82/% - - - - - - /redbook/%/PAWO83/% - - - - - - /redbook/%/PEWA33/% - - - - /redbook/%/PEWA34/% - - - - /redbook/%/PRWA51/% - - - - /redbook/%/PXWA50/% - - - - - - /redbook/%/PTWA31/% - - - - /redbook/%/PTWO33/% - - - - - /redbook/%/PTWA94/% - - - - /redbook/%/PTWA93/% - - - - - - - - /redbook/%/PGWA31/% - - - - /redbook/%/PGWA32/% - - - - /redbook/%/PGIC42/% - - - - - /redbook/%/PYWA31/% - - - - /redbook/%/PYWA32/% - - - - - - /redbook/%/PPZA50/% - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/cave/build/static/common/cave/etc/menus/ncepHydro/spc/baseSPCConvectiveOutlooks.xml b/cave/build/static/common/cave/etc/menus/ncepHydro/spc/baseSPCConvectiveOutlooks.xml deleted file mode 100644 index 3ee9c25c4c..0000000000 --- a/cave/build/static/common/cave/etc/menus/ncepHydro/spc/baseSPCConvectiveOutlooks.xml +++ /dev/null @@ -1,94 +0,0 @@ - - - - - /redbook/%/PGWE46/% - - - - - /redbook/%/PGWI47/% - - - - - /redbook/%/PGWK48/% - - - - - /redbook/%/PGWB44/% - - - - - /redbook/%/PGWB45/% - - - - - /redbook/%/PENE00/% - - - - - /redbook/%/PWNE00/% - - - - - /redbook/%/PGNE00/% - - - - - /redbook/%/PGNI00/% - - - - - /redbook/%/PZNK00/% - - - - - /redbook/%/PGNM98/% - - - - - /redbook/%/PGNA00/% - - - - \ No newline at end of file diff --git a/cave/build/static/common/cave/etc/menus/ncepHydro/spc/index.xml b/cave/build/static/common/cave/etc/menus/ncepHydro/spc/index.xml deleted file mode 100644 index 958cffb53d..0000000000 --- a/cave/build/static/common/cave/etc/menus/ncepHydro/spc/index.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/cave/build/static/common/cave/etc/bundles/BufrSigWx.xml b/cave/com.raytheon.uf.viz.bufrsigwx/localization/bundles/BufrSigWx.xml similarity index 99% rename from cave/build/static/common/cave/etc/bundles/BufrSigWx.xml rename to cave/com.raytheon.uf.viz.bufrsigwx/localization/bundles/BufrSigWx.xml index e89d9ed8cc..fe9ca28497 100644 --- a/cave/build/static/common/cave/etc/bundles/BufrSigWx.xml +++ b/cave/com.raytheon.uf.viz.bufrsigwx/localization/bundles/BufrSigWx.xml @@ -45,7 +45,7 @@ - + - - - - - /ccfp/% - - - - /ccfp/% - - - - /ccfp/% - - - - diff --git a/cave/com.raytheon.uf.viz.ccfp/localization/menus/ccfp/index.xml b/cave/com.raytheon.uf.viz.ccfp/localization/menus/ccfp/index.xml deleted file mode 100644 index ec871df2a7..0000000000 --- a/cave/com.raytheon.uf.viz.ccfp/localization/menus/ccfp/index.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - diff --git a/cave/com.raytheon.uf.viz.core.maps/build.properties b/cave/com.raytheon.uf.viz.core.maps/build.properties index e9863e281e..6e2f847b66 100644 --- a/cave/com.raytheon.uf.viz.core.maps/build.properties +++ b/cave/com.raytheon.uf.viz.core.maps/build.properties @@ -2,4 +2,5 @@ source.. = src/ output.. = bin/ bin.includes = META-INF/,\ .,\ - plugin.xml + plugin.xml,\ + localization/ diff --git a/cave/build/static/common/cave/etc/bundles/maps/Basins.xml b/cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/Basins.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/maps/Basins.xml rename to cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/Basins.xml diff --git a/cave/build/static/common/cave/etc/bundles/maps/CWA.xml b/cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/CWA.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/maps/CWA.xml rename to cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/CWA.xml diff --git a/cave/build/static/common/cave/etc/bundles/maps/CWA_All.xml b/cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/CWA_All.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/maps/CWA_All.xml rename to cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/CWA_All.xml diff --git a/cave/build/static/common/cave/etc/bundles/maps/Canada.xml b/cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/Canada.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/maps/Canada.xml rename to cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/Canada.xml diff --git a/cave/build/static/common/cave/etc/bundles/maps/Cities.xml b/cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/Cities.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/maps/Cities.xml rename to cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/Cities.xml diff --git a/cave/build/static/common/cave/etc/bundles/maps/Counties.xml b/cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/Counties.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/maps/Counties.xml rename to cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/Counties.xml diff --git a/cave/build/static/common/cave/etc/bundles/maps/Counties_site.xml b/cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/Counties_site.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/maps/Counties_site.xml rename to cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/Counties_site.xml diff --git a/cave/build/static/common/cave/etc/bundles/maps/FAA/ARTCC.xml b/cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/FAA/ARTCC.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/maps/FAA/ARTCC.xml rename to cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/FAA/ARTCC.xml diff --git a/cave/build/static/common/cave/etc/bundles/maps/FAA/Airports.xml b/cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/FAA/Airports.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/maps/FAA/Airports.xml rename to cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/FAA/Airports.xml diff --git a/cave/build/static/common/cave/etc/bundles/maps/FAA/Fix.xml b/cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/FAA/Fix.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/maps/FAA/Fix.xml rename to cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/FAA/Fix.xml diff --git a/cave/build/static/common/cave/etc/bundles/maps/FAA/HighAltitude.xml b/cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/FAA/HighAltitude.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/maps/FAA/HighAltitude.xml rename to cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/FAA/HighAltitude.xml diff --git a/cave/build/static/common/cave/etc/bundles/maps/FAA/LowAltitude.xml b/cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/FAA/LowAltitude.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/maps/FAA/LowAltitude.xml rename to cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/FAA/LowAltitude.xml diff --git a/cave/build/static/common/cave/etc/bundles/maps/FAA/NavAid.xml b/cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/FAA/NavAid.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/maps/FAA/NavAid.xml rename to cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/FAA/NavAid.xml diff --git a/cave/build/static/common/cave/etc/bundles/maps/FAA/SpecialUse.xml b/cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/FAA/SpecialUse.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/maps/FAA/SpecialUse.xml rename to cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/FAA/SpecialUse.xml diff --git a/cave/build/static/common/cave/etc/bundles/maps/FIPS_site.xml b/cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/FIPS_site.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/maps/FIPS_site.xml rename to cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/FIPS_site.xml diff --git a/cave/build/static/common/cave/etc/bundles/maps/FireWxAOR.xml b/cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/FireWxAOR.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/maps/FireWxAOR.xml rename to cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/FireWxAOR.xml diff --git a/cave/build/static/common/cave/etc/bundles/maps/FireWxZones.xml b/cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/FireWxZones.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/maps/FireWxZones.xml rename to cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/FireWxZones.xml diff --git a/cave/build/static/common/cave/etc/bundles/maps/FireWxZones_site.xml b/cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/FireWxZones_site.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/maps/FireWxZones_site.xml rename to cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/FireWxZones_site.xml diff --git a/cave/build/static/common/cave/etc/bundles/maps/Interstates.xml b/cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/Interstates.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/maps/Interstates.xml rename to cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/Interstates.xml diff --git a/cave/build/static/common/cave/etc/bundles/maps/Interstates_and_US_Highways.xml b/cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/Interstates_and_US_Highways.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/maps/Interstates_and_US_Highways.xml rename to cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/Interstates_and_US_Highways.xml diff --git a/cave/build/static/common/cave/etc/bundles/maps/Lakes.xml b/cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/Lakes.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/maps/Lakes.xml rename to cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/Lakes.xml diff --git a/cave/build/static/common/cave/etc/bundles/maps/Locations.xml b/cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/Locations.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/maps/Locations.xml rename to cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/Locations.xml diff --git a/cave/build/static/common/cave/etc/bundles/maps/Marine Zones/High_Sea_Marine_Zones.xml b/cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/Marine Zones/High_Sea_Marine_Zones.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/maps/Marine Zones/High_Sea_Marine_Zones.xml rename to cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/Marine Zones/High_Sea_Marine_Zones.xml diff --git a/cave/build/static/common/cave/etc/bundles/maps/Marine Zones/Marine_Zones.xml b/cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/Marine Zones/Marine_Zones.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/maps/Marine Zones/Marine_Zones.xml rename to cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/Marine Zones/Marine_Zones.xml diff --git a/cave/build/static/common/cave/etc/bundles/maps/Marine Zones/Marine_Zones_site.xml b/cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/Marine Zones/Marine_Zones_site.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/maps/Marine Zones/Marine_Zones_site.xml rename to cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/Marine Zones/Marine_Zones_site.xml diff --git a/cave/build/static/common/cave/etc/bundles/maps/Marine Zones/Offshore_Marine_Zones.xml b/cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/Marine Zones/Offshore_Marine_Zones.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/maps/Marine Zones/Offshore_Marine_Zones.xml rename to cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/Marine Zones/Offshore_Marine_Zones.xml diff --git a/cave/build/static/common/cave/etc/bundles/maps/Marine Zones/Offshore_Marine_Zones_site.xml b/cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/Marine Zones/Offshore_Marine_Zones_site.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/maps/Marine Zones/Offshore_Marine_Zones_site.xml rename to cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/Marine Zones/Offshore_Marine_Zones_site.xml diff --git a/cave/build/static/common/cave/etc/bundles/maps/RFC.xml b/cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/RFC.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/maps/RFC.xml rename to cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/RFC.xml diff --git a/cave/build/static/common/cave/etc/bundles/maps/RailRoads.xml b/cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/RailRoads.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/maps/RailRoads.xml rename to cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/RailRoads.xml diff --git a/cave/build/static/common/cave/etc/bundles/maps/Rivers/allRivers.xml b/cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/Rivers/allRivers.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/maps/Rivers/allRivers.xml rename to cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/Rivers/allRivers.xml diff --git a/cave/build/static/common/cave/etc/bundles/maps/Rivers/majorRivers.xml b/cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/Rivers/majorRivers.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/maps/Rivers/majorRivers.xml rename to cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/Rivers/majorRivers.xml diff --git a/cave/build/static/common/cave/etc/bundles/maps/States.xml b/cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/States.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/maps/States.xml rename to cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/States.xml diff --git a/cave/build/static/common/cave/etc/bundles/maps/Zones.xml b/cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/Zones.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/maps/Zones.xml rename to cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/Zones.xml diff --git a/cave/build/static/common/cave/etc/bundles/maps/Zones_site.xml b/cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/Zones_site.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/maps/Zones_site.xml rename to cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/Zones_site.xml diff --git a/cave/build/static/common/cave/etc/bundles/maps/iscAll.xml b/cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/iscAll.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/maps/iscAll.xml rename to cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/iscAll.xml diff --git a/cave/build/static/common/cave/etc/bundles/maps/latLonOcean.xml b/cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/latLonOcean.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/maps/latLonOcean.xml rename to cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/latLonOcean.xml diff --git a/cave/build/static/common/cave/etc/bundles/maps/marine.xml b/cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/marine.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/maps/marine.xml rename to cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/marine.xml diff --git a/cave/build/static/common/cave/etc/bundles/maps/mexico.xml b/cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/mexico.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/maps/mexico.xml rename to cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/mexico.xml diff --git a/cave/build/static/common/cave/etc/bundles/maps/statesCounties.xml b/cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/statesCounties.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/maps/statesCounties.xml rename to cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/statesCounties.xml diff --git a/cave/build/static/common/cave/etc/bundles/maps/timeZones.xml b/cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/timeZones.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/maps/timeZones.xml rename to cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/timeZones.xml diff --git a/cave/build/static/common/cave/etc/bundles/maps/world.xml b/cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/world.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/maps/world.xml rename to cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/world.xml diff --git a/cave/build/static/common/cave/etc/bundles/scales/CONUS.xml b/cave/com.raytheon.uf.viz.core.maps/localization/bundles/scales/CONUS.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/scales/CONUS.xml rename to cave/com.raytheon.uf.viz.core.maps/localization/bundles/scales/CONUS.xml diff --git a/cave/build/static/common/cave/etc/bundles/scales/NHemisphere.xml b/cave/com.raytheon.uf.viz.core.maps/localization/bundles/scales/NHemisphere.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/scales/NHemisphere.xml rename to cave/com.raytheon.uf.viz.core.maps/localization/bundles/scales/NHemisphere.xml diff --git a/cave/build/static/common/cave/etc/bundles/scales/NorthAmerican.xml b/cave/com.raytheon.uf.viz.core.maps/localization/bundles/scales/NorthAmerican.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/scales/NorthAmerican.xml rename to cave/com.raytheon.uf.viz.core.maps/localization/bundles/scales/NorthAmerican.xml diff --git a/cave/build/static/common/cave/etc/bundles/scales/Regional.xml b/cave/com.raytheon.uf.viz.core.maps/localization/bundles/scales/Regional.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/scales/Regional.xml rename to cave/com.raytheon.uf.viz.core.maps/localization/bundles/scales/Regional.xml diff --git a/cave/build/static/common/cave/etc/bundles/scales/States.xml b/cave/com.raytheon.uf.viz.core.maps/localization/bundles/scales/States.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/scales/States.xml rename to cave/com.raytheon.uf.viz.core.maps/localization/bundles/scales/States.xml diff --git a/cave/build/static/common/cave/etc/bundles/scales/WFO.xml b/cave/com.raytheon.uf.viz.core.maps/localization/bundles/scales/WFO.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/scales/WFO.xml rename to cave/com.raytheon.uf.viz.core.maps/localization/bundles/scales/WFO.xml diff --git a/cave/build/static/common/cave/etc/bundles/scales/scalesInfo.xml b/cave/com.raytheon.uf.viz.core.maps/localization/bundles/scales/scalesInfo.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/scales/scalesInfo.xml rename to cave/com.raytheon.uf.viz.core.maps/localization/bundles/scales/scalesInfo.xml diff --git a/cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/localization/BundleScanner.java b/cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/localization/BundleScanner.java index 8d7f44a441..c04fbcd2a1 100644 --- a/cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/localization/BundleScanner.java +++ b/cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/localization/BundleScanner.java @@ -22,22 +22,24 @@ package com.raytheon.uf.viz.core.localization; import java.io.File; import java.io.IOException; import java.net.URL; -import java.util.Collections; +import java.util.ArrayList; +import java.util.Collection; import java.util.HashMap; +import java.util.LinkedHashMap; import java.util.Map; -import java.util.Set; import org.eclipse.core.runtime.FileLocator; import org.eclipse.core.runtime.Path; import org.osgi.framework.Bundle; +import com.raytheon.uf.common.localization.IPathManager; import com.raytheon.uf.viz.core.Activator; /** * Allows files to be present in UNPACKED bundles. * * Hopefully in the future, we can add the capability to leave the files packed - * in the jar. + * in the jar. Path separation should use {@link IPathManager#SEPARATOR} * * * 
@@ -45,7 +47,9 @@ import com.raytheon.uf.viz.core.Activator;
  * SOFTWARE HISTORY
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
- * Mar 26, 2009            chammack     Initial creation
+ * Mar 26, 2009            chammack    Initial creation
+ * Aug 13, 2013       2033 mschenke    Generalized bundle scanner instead of
+ *                                     CAVE_STATIC vs CAVE_CONFIG
  * 
  *
* @@ -55,61 +59,68 @@ import com.raytheon.uf.viz.core.Activator; public class BundleScanner { - private static Map CAVE_STATIC_BUNDLES; + private static Map scanners = new HashMap(); - private static Map CAVE_BUNDLES; - - static { - scan(); - } - - private static synchronized void scan() { - if (CAVE_STATIC_BUNDLES != null) { - return; + private static BundleScanner getBundleScanner(String path) { + if (path == null) { + path = IPathManager.SEPARATOR; } - - CAVE_STATIC_BUNDLES = new HashMap(); - CAVE_BUNDLES = new HashMap(); - - Bundle[] bndls = Activator.getDefault().getContext().getBundles(); - for (Bundle bndl : bndls) { - CAVE_BUNDLES.put(bndl.getSymbolicName(), bndl); - URL url = FileLocator.find(bndl, new Path("localization"), null); - if (url != null) { - CAVE_STATIC_BUNDLES.put(bndl.getSymbolicName(), bndl); + path = path.trim(); + if (path.isEmpty() || ".".equals(path)) { + path = IPathManager.SEPARATOR; + } + BundleScanner scanner; + synchronized (scanners) { + scanner = scanners.get(path); + if (scanner == null) { + scanner = new BundleScanner(path); + scanners.put(path, scanner); } } - + return scanner; } - public static Set getListOfBundles() { - return getListOfBundles(true); + private final String basePath; + + private Map bundles = new LinkedHashMap(); + + public BundleScanner(String basePath) { + this.basePath = basePath; + Path path = new Path(basePath); + Bundle[] bundles = Activator.getDefault().getContext().getBundles(); + for (Bundle bundle : bundles) { + String bundleName = bundle.getSymbolicName(); + URL url = FileLocator.find(bundle, path, null); + if (url != null) { + this.bundles.put(bundleName, bundle); + } + } } - public static Set getListOfBundles(boolean caveStaticOnly) { - return Collections.unmodifiableSet(caveStaticOnly ? CAVE_STATIC_BUNDLES - .keySet() : CAVE_BUNDLES.keySet()); + public Collection getContributingBundles() { + return new ArrayList(bundles.keySet()); } - public static File searchInBundle(String bundleToSearch, - String pathToLookFor) { - return searchInBundle(bundleToSearch, "localization", pathToLookFor, - CAVE_STATIC_BUNDLES); + public Bundle getBundle(String symbolicName) { + return bundles.get(symbolicName); } - public static File searchInBundle(String bundleToSearch, String basePath, - String pathToLookFor) { - return searchInBundle(bundleToSearch, basePath, pathToLookFor, - CAVE_BUNDLES); + public File searchInBundles(String path) { + for (String bundle : bundles.keySet()) { + File file = searchInBundle(bundle, path); + if (file != null) { + return file; + } + } + return null; } - public static File searchInBundle(String bundleToSearch, String basePath, - String pathToLookFor, Map toSearch) { + public File searchInBundle(String bundleToSearch, String pathToLookFor) { File file = null; - Bundle b = toSearch.get(bundleToSearch); - if (b != null && b.getState() != Bundle.UNINSTALLED) { - URL url = FileLocator.find(b, new Path(basePath + File.separator - + pathToLookFor), null); + Bundle bundle = getBundle(bundleToSearch); + if (bundle != null && bundle.getState() != Bundle.UNINSTALLED) { + URL url = FileLocator.find(bundle, new Path(basePath + + IPathManager.SEPARATOR + pathToLookFor), null); if (url != null) { URL resolvedURL = null; try { @@ -124,4 +135,40 @@ public class BundleScanner { } return file; } + + /** + * Gets a list of all bundles + * + * @return + */ + public static Collection getListOfBundles() { + return getListOfBundles(IPathManager.SEPARATOR); + } + + /** + * Gets the bundles that contain the path passed in in their bundle. Null, + * empty string, ".", or "/" will return all bundles. + * + * @param path + * @return + */ + public static Collection getListOfBundles(String path) { + BundleScanner scanner = getBundleScanner(path); + return scanner.getContributingBundles(); + } + + /** + * Search in the specified bundle for the pathToLookFor relative to basePath + * + * @param bundleToSearch + * @param basePath + * @param pathToLookFor + * @return + */ + public static File searchInBundle(String bundleToSearch, String basePath, + String pathToLookFor) { + BundleScanner scanner = getBundleScanner(basePath); + return scanner.searchInBundle(bundleToSearch, pathToLookFor); + } + } diff --git a/cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/localization/CAVELocalizationAdapter.java b/cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/localization/CAVELocalizationAdapter.java index b268397e1a..16dbfe73ad 100644 --- a/cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/localization/CAVELocalizationAdapter.java +++ b/cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/localization/CAVELocalizationAdapter.java @@ -73,24 +73,26 @@ import com.raytheon.uf.common.util.FileUtil; public class CAVELocalizationAdapter implements ILocalizationAdapter { + protected static final String BUNDLE_LOCALIZATION_DIR = "localization"; + private static final Map contexts = new HashMap(); private static final Map caveStaticBaseFiles = new HashMap(); - private static final LocalizationContext CAVE_STATIC_BASE = new LocalizationContext( + protected static final LocalizationContext CAVE_STATIC_BASE = new LocalizationContext( LocalizationType.CAVE_STATIC, LocalizationLevel.BASE); - private static final LocalizationContext CAVE_CONFIG_BASE = new LocalizationContext( + protected static final LocalizationContext CAVE_CONFIG_BASE = new LocalizationContext( LocalizationType.CAVE_CONFIG, LocalizationLevel.BASE); - private static boolean isCaveStaticBase(LocalizationContext ctx) { + protected static boolean isCaveStaticBase(LocalizationContext ctx) { return ctx.getLocalizationType() == CAVE_STATIC_BASE .getLocalizationType() && ctx.getLocalizationLevel() == CAVE_STATIC_BASE .getLocalizationLevel(); } - private static boolean isCaveConfigBase(LocalizationContext ctx) { + protected static boolean isCaveConfigBase(LocalizationContext ctx) { return ctx.getLocalizationType() == CAVE_CONFIG_BASE .getLocalizationType() && ctx.getLocalizationLevel() == CAVE_CONFIG_BASE @@ -132,7 +134,7 @@ public class CAVELocalizationAdapter implements ILocalizationAdapter { // else go to the cave static dir if (context.getContextName() != null) { return BundleScanner.searchInBundle(context.getContextName(), - fileName); + BUNDLE_LOCALIZATION_DIR, fileName); } else { File file = new File(FileUtil.join( LocalizationManager.getBaseDir(), typeDir, fileName)); @@ -149,9 +151,9 @@ public class CAVELocalizationAdapter implements ILocalizationAdapter { } if (!containsKey) { for (String bundle : BundleScanner - .getListOfBundles(true)) { + .getListOfBundles(BUNDLE_LOCALIZATION_DIR)) { file = BundleScanner.searchInBundle(bundle, - fileName); + BUNDLE_LOCALIZATION_DIR, fileName); if (file != null && file.exists()) { bundleFile = file; break; @@ -387,7 +389,8 @@ public class CAVELocalizationAdapter implements ILocalizationAdapter { localContexts.add(context); if (context.getContextName() == null) { // Also search bundles if CAVE_STATIC without context name - for (String bundle : BundleScanner.getListOfBundles()) { + for (String bundle : BundleScanner + .getListOfBundles(BUNDLE_LOCALIZATION_DIR)) { localContexts.add(new LocalizationContext(context .getLocalizationType(), context .getLocalizationLevel(), bundle)); diff --git a/cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/localization/LocalizationInitializer.java b/cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/localization/LocalizationInitializer.java index 3007b8fd3e..036772020e 100644 --- a/cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/localization/LocalizationInitializer.java +++ b/cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/localization/LocalizationInitializer.java @@ -76,7 +76,7 @@ public class LocalizationInitializer { LocalizationContext baseContext = pm.getContext( LocalizationType.CAVE_CONFIG, LocalizationLevel.BASE); String filePath = "config.xml"; - for (String bundle : BundleScanner.getListOfBundles(false)) { + for (String bundle : BundleScanner.getListOfBundles()) { File copyFrom = BundleScanner.searchInBundle(bundle, "", filePath); if (copyFrom != null) { String searchPath = bundle + File.separator + filePath; diff --git a/cave/com.raytheon.uf.viz.cwa/build.properties b/cave/com.raytheon.uf.viz.cwa/build.properties index 34d2e4d2da..3459198753 100644 --- a/cave/com.raytheon.uf.viz.cwa/build.properties +++ b/cave/com.raytheon.uf.viz.cwa/build.properties @@ -1,4 +1,5 @@ source.. = src/ output.. = bin/ bin.includes = META-INF/,\ - . + .,\ + localization/ diff --git a/cave/build/static/common/cave/etc/bundles/CWA.xml b/cave/com.raytheon.uf.viz.cwa/localization/bundles/CWA.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/CWA.xml rename to cave/com.raytheon.uf.viz.cwa/localization/bundles/CWA.xml diff --git a/cave/com.raytheon.uf.viz.d2d.nsharp.feature/feature.xml b/cave/com.raytheon.uf.viz.d2d.nsharp.feature/feature.xml index 28c10e3954..666d2a7971 100644 --- a/cave/com.raytheon.uf.viz.d2d.nsharp.feature/feature.xml +++ b/cave/com.raytheon.uf.viz.d2d.nsharp.feature/feature.xml @@ -29,7 +29,6 @@ id="com.raytheon.uf.viz.d2d.nsharp" download-size="0" install-size="0" - version="0.0.0" - unpack="false"/> + version="0.0.0"/> diff --git a/cave/com.raytheon.uf.viz.d2d.nsharp/build.properties b/cave/com.raytheon.uf.viz.d2d.nsharp/build.properties index e9863e281e..6e2f847b66 100644 --- a/cave/com.raytheon.uf.viz.d2d.nsharp/build.properties +++ b/cave/com.raytheon.uf.viz.d2d.nsharp/build.properties @@ -2,4 +2,5 @@ source.. = src/ output.. = bin/ bin.includes = META-INF/,\ .,\ - plugin.xml + plugin.xml,\ + localization/ diff --git a/cave/com.raytheon.uf.viz.d2d.ui.awips.feature/.project b/cave/com.raytheon.uf.viz.d2d.ui.awips.feature/.project new file mode 100644 index 0000000000..c4fc0c3d21 --- /dev/null +++ b/cave/com.raytheon.uf.viz.d2d.ui.awips.feature/.project @@ -0,0 +1,17 @@ + + + com.raytheon.uf.viz.d2d.ui.awips.feature + + + + + + org.eclipse.pde.FeatureBuilder + + + + + + org.eclipse.pde.FeatureNature + + diff --git a/cave/com.raytheon.uf.viz.d2d.ui.awips.feature/build.properties b/cave/com.raytheon.uf.viz.d2d.ui.awips.feature/build.properties new file mode 100644 index 0000000000..64f93a9f0b --- /dev/null +++ b/cave/com.raytheon.uf.viz.d2d.ui.awips.feature/build.properties @@ -0,0 +1 @@ +bin.includes = feature.xml diff --git a/cave/com.raytheon.uf.viz.d2d.ui.awips.feature/feature.xml b/cave/com.raytheon.uf.viz.d2d.ui.awips.feature/feature.xml new file mode 100644 index 0000000000..11694fb264 --- /dev/null +++ b/cave/com.raytheon.uf.viz.d2d.ui.awips.feature/feature.xml @@ -0,0 +1,47 @@ + + + + + [Enter Feature Description here.] + + + + [Enter Copyright Description here.] + + + + [Enter License Description here.] + + + + + + + + + + + + + + + + + + diff --git a/cave/com.raytheon.uf.viz.d2d.ui.local/.classpath b/cave/com.raytheon.uf.viz.d2d.ui.local/.classpath new file mode 100644 index 0000000000..ad32c83a78 --- /dev/null +++ b/cave/com.raytheon.uf.viz.d2d.ui.local/.classpath @@ -0,0 +1,7 @@ + + + + + + + diff --git a/cave/com.raytheon.uf.viz.d2d.ui.local/.project b/cave/com.raytheon.uf.viz.d2d.ui.local/.project new file mode 100644 index 0000000000..5dbc170435 --- /dev/null +++ b/cave/com.raytheon.uf.viz.d2d.ui.local/.project @@ -0,0 +1,28 @@ + + + com.raytheon.uf.viz.d2d.ui.local + + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.pde.ManifestBuilder + + + + + org.eclipse.pde.SchemaBuilder + + + + + + org.eclipse.pde.PluginNature + org.eclipse.jdt.core.javanature + + diff --git a/cave/com.raytheon.uf.viz.d2d.ui.local/.settings/org.eclipse.jdt.core.prefs b/cave/com.raytheon.uf.viz.d2d.ui.local/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 0000000000..c537b63063 --- /dev/null +++ b/cave/com.raytheon.uf.viz.d2d.ui.local/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,7 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 +org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.6 diff --git a/cave/com.raytheon.uf.viz.d2d.ui.local/META-INF/MANIFEST.MF b/cave/com.raytheon.uf.viz.d2d.ui.local/META-INF/MANIFEST.MF new file mode 100644 index 0000000000..108ffd3551 --- /dev/null +++ b/cave/com.raytheon.uf.viz.d2d.ui.local/META-INF/MANIFEST.MF @@ -0,0 +1,13 @@ +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: D2D Local Menu +Bundle-SymbolicName: com.raytheon.uf.viz.d2d.ui.local;singleton:=true +Bundle-Version: 1.0.0.qualifier +Bundle-Activator: com.raytheon.uf.viz.d2d.ui.local.Activator +Bundle-Vendor: RAYTHEON +Require-Bundle: org.eclipse.core.runtime, + com.raytheon.uf.viz.d2d.ui;bundle-version="1.12.1174", + com.raytheon.viz.grid;bundle-version="1.12.1174", + com.raytheon.viz.pointdata;bundle-version="1.12.1174" +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-ActivationPolicy: lazy diff --git a/cave/com.raytheon.uf.viz.d2d.ui.local/build.properties b/cave/com.raytheon.uf.viz.d2d.ui.local/build.properties new file mode 100644 index 0000000000..15f66d39dc --- /dev/null +++ b/cave/com.raytheon.uf.viz.d2d.ui.local/build.properties @@ -0,0 +1,6 @@ +source.. = src/ +output.. = bin/ +bin.includes = META-INF/,\ + .,\ + localization/,\ + plugin.xml diff --git a/cave/build/static/common/cave/etc/bundles/SingleGrib.xml b/cave/com.raytheon.uf.viz.d2d.ui.local/localization/bundles/local/SingleGrib.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/SingleGrib.xml rename to cave/com.raytheon.uf.viz.d2d.ui.local/localization/bundles/local/SingleGrib.xml diff --git a/cave/build/static/common/cave/etc/menus/local/baseLAPSMSASSurface.xml b/cave/com.raytheon.uf.viz.d2d.ui.local/localization/menus/local/baseLAPSMSASSurface.xml similarity index 74% rename from cave/build/static/common/cave/etc/menus/local/baseLAPSMSASSurface.xml rename to cave/com.raytheon.uf.viz.d2d.ui.local/localization/menus/local/baseLAPSMSASSurface.xml index d6e8429626..dd8a12ea4d 100644 --- a/cave/build/static/common/cave/etc/menus/local/baseLAPSMSASSurface.xml +++ b/cave/com.raytheon.uf.viz.d2d.ui.local/localization/menus/local/baseLAPSMSASSurface.xml @@ -24,45 +24,45 @@ - - - - - - - - @@ -71,57 +71,57 @@ - - - - - - - - - - - @@ -130,38 +130,38 @@ - - - - - - - @@ -171,83 +171,83 @@ - - - - - - - - - - - - - - - - diff --git a/cave/build/static/common/cave/etc/menus/local/baseTDLSurface.xml b/cave/com.raytheon.uf.viz.d2d.ui.local/localization/menus/local/baseTDLSurface.xml similarity index 100% rename from cave/build/static/common/cave/etc/menus/local/baseTDLSurface.xml rename to cave/com.raytheon.uf.viz.d2d.ui.local/localization/menus/local/baseTDLSurface.xml diff --git a/cave/build/static/common/cave/etc/menus/local/index.xml b/cave/com.raytheon.uf.viz.d2d.ui.local/localization/menus/local/index.xml similarity index 93% rename from cave/build/static/common/cave/etc/menus/local/index.xml rename to cave/com.raytheon.uf.viz.d2d.ui.local/localization/menus/local/index.xml index e95fcd4297..a4006a73a8 100644 --- a/cave/build/static/common/cave/etc/menus/local/index.xml +++ b/cave/com.raytheon.uf.viz.d2d.ui.local/localization/menus/local/index.xml @@ -19,10 +19,10 @@ further_licensing_information. --> - - \ No newline at end of file diff --git a/cave/com.raytheon.uf.viz.d2d.ui.local/plugin.xml b/cave/com.raytheon.uf.viz.d2d.ui.local/plugin.xml new file mode 100644 index 0000000000..7d2e5032e3 --- /dev/null +++ b/cave/com.raytheon.uf.viz.d2d.ui.local/plugin.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + diff --git a/cave/com.raytheon.uf.viz.d2d.ui.local/src/com/raytheon/uf/viz/d2d/ui/local/Activator.java b/cave/com.raytheon.uf.viz.d2d.ui.local/src/com/raytheon/uf/viz/d2d/ui/local/Activator.java new file mode 100644 index 0000000000..329bce5946 --- /dev/null +++ b/cave/com.raytheon.uf.viz.d2d.ui.local/src/com/raytheon/uf/viz/d2d/ui/local/Activator.java @@ -0,0 +1,30 @@ +package com.raytheon.uf.viz.d2d.ui.local; + +import org.osgi.framework.BundleActivator; +import org.osgi.framework.BundleContext; + +public class Activator implements BundleActivator { + + private static BundleContext context; + + static BundleContext getContext() { + return context; + } + + /* + * (non-Javadoc) + * @see org.osgi.framework.BundleActivator#start(org.osgi.framework.BundleContext) + */ + public void start(BundleContext bundleContext) throws Exception { + Activator.context = bundleContext; + } + + /* + * (non-Javadoc) + * @see org.osgi.framework.BundleActivator#stop(org.osgi.framework.BundleContext) + */ + public void stop(BundleContext bundleContext) throws Exception { + Activator.context = null; + } + +} diff --git a/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/.classpath b/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/.classpath new file mode 100644 index 0000000000..ad32c83a78 --- /dev/null +++ b/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/.classpath @@ -0,0 +1,7 @@ + + + + + + + diff --git a/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/.project b/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/.project new file mode 100644 index 0000000000..a9db05029e --- /dev/null +++ b/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/.project @@ -0,0 +1,28 @@ + + + com.raytheon.uf.viz.d2d.ui.ncephydro + + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.pde.ManifestBuilder + + + + + org.eclipse.pde.SchemaBuilder + + + + + + org.eclipse.pde.PluginNature + org.eclipse.jdt.core.javanature + + diff --git a/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/.settings/org.eclipse.jdt.core.prefs b/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 0000000000..c537b63063 --- /dev/null +++ b/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,7 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 +org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.6 diff --git a/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/META-INF/MANIFEST.MF b/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/META-INF/MANIFEST.MF new file mode 100644 index 0000000000..dbe3d61ce5 --- /dev/null +++ b/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/META-INF/MANIFEST.MF @@ -0,0 +1,17 @@ +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: D2D Ncep Hydro +Bundle-SymbolicName: com.raytheon.uf.viz.d2d.ui.ncephydro;singleton:=true +Bundle-Version: 1.0.0.qualifier +Bundle-Activator: com.raytheon.uf.viz.d2d.ui.ncephydro.Activator +Bundle-Vendor: RAYTHEON +Require-Bundle: org.eclipse.core.runtime, + com.raytheon.uf.viz.d2d.ui;bundle-version="1.12.1174", + com.raytheon.viz.grid;bundle-version="1.12.1174", + com.raytheon.viz.redbook;bundle-version="1.12.1174", + com.raytheon.viz.pointdata;bundle-version="1.12.1174", + com.raytheon.viz.warnings;bundle-version="1.12.1174", + com.raytheon.uf.viz.tcs;bundle-version="1.12.1174", + com.raytheon.uf.viz.ccfp;bundle-version="1.12.1174" +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-ActivationPolicy: lazy diff --git a/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/build.properties b/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/build.properties new file mode 100644 index 0000000000..15f66d39dc --- /dev/null +++ b/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/build.properties @@ -0,0 +1,6 @@ +source.. = src/ +output.. = bin/ +bin.includes = META-INF/,\ + .,\ + localization/,\ + plugin.xml diff --git a/cave/build/static/common/cave/etc/bundles/CHGHURGuidancePlot.xml b/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/bundles/ncepHydro/CHGHURGuidancePlot.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/CHGHURGuidancePlot.xml rename to cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/bundles/ncepHydro/CHGHURGuidancePlot.xml diff --git a/cave/build/static/common/cave/etc/bundles/CHGQLMGuidancePlot.xml b/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/bundles/ncepHydro/CHGQLMGuidancePlot.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/CHGQLMGuidancePlot.xml rename to cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/bundles/ncepHydro/CHGQLMGuidancePlot.xml diff --git a/cave/build/static/common/cave/etc/bundles/ModelSoundingPlot.xml b/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/bundles/ncepHydro/ModelSoundingPlot.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/ModelSoundingPlot.xml rename to cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/bundles/ncepHydro/ModelSoundingPlot.xml diff --git a/cave/build/static/common/cave/etc/bundles/NOHRSC-SNOW.xml b/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/bundles/ncepHydro/NOHRSC-SNOW.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/NOHRSC-SNOW.xml rename to cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/bundles/ncepHydro/NOHRSC-SNOW.xml diff --git a/cave/build/static/common/cave/etc/bundles/PositionUpdatePlot.xml b/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/bundles/ncepHydro/PositionUpdatePlot.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/PositionUpdatePlot.xml rename to cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/bundles/ncepHydro/PositionUpdatePlot.xml diff --git a/cave/build/static/common/cave/etc/bundles/SPCWatchPlot.xml b/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/bundles/ncepHydro/SPCWatchPlot.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/SPCWatchPlot.xml rename to cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/bundles/ncepHydro/SPCWatchPlot.xml diff --git a/cave/build/static/common/cave/etc/bundles/SvrWxPlot.xml b/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/bundles/ncepHydro/SvrWxPlot.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/SvrWxPlot.xml rename to cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/bundles/ncepHydro/SvrWxPlot.xml diff --git a/cave/build/static/common/cave/etc/bundles/miscGrids/PPAN-PPBN.xml b/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/bundles/ncepHydro/cpc/PPAN-PPBN.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/miscGrids/PPAN-PPBN.xml rename to cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/bundles/ncepHydro/cpc/PPAN-PPBN.xml diff --git a/cave/build/static/common/cave/etc/bundles/miscGrids/PPAN.xml b/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/bundles/ncepHydro/cpc/PPAN.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/miscGrids/PPAN.xml rename to cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/bundles/ncepHydro/cpc/PPAN.xml diff --git a/cave/build/static/common/cave/etc/bundles/miscGrids/PPBN.xml b/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/bundles/ncepHydro/cpc/PPBN.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/miscGrids/PPBN.xml rename to cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/bundles/ncepHydro/cpc/PPBN.xml diff --git a/cave/build/static/common/cave/etc/bundles/miscGrids/PPNN.xml b/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/bundles/ncepHydro/cpc/PPNN.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/miscGrids/PPNN.xml rename to cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/bundles/ncepHydro/cpc/PPNN.xml diff --git a/cave/build/static/common/cave/etc/bundles/miscGrids/PTAN-PTBN.xml b/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/bundles/ncepHydro/cpc/PTAN-PTBN.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/miscGrids/PTAN-PTBN.xml rename to cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/bundles/ncepHydro/cpc/PTAN-PTBN.xml diff --git a/cave/build/static/common/cave/etc/bundles/miscGrids/PTAN.xml b/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/bundles/ncepHydro/cpc/PTAN.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/miscGrids/PTAN.xml rename to cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/bundles/ncepHydro/cpc/PTAN.xml diff --git a/cave/build/static/common/cave/etc/bundles/miscGrids/PTBN.xml b/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/bundles/ncepHydro/cpc/PTBN.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/miscGrids/PTBN.xml rename to cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/bundles/ncepHydro/cpc/PTBN.xml diff --git a/cave/build/static/common/cave/etc/bundles/miscGrids/PTNN.xml b/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/bundles/ncepHydro/cpc/PTNN.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/miscGrids/PTNN.xml rename to cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/bundles/ncepHydro/cpc/PTNN.xml diff --git a/cave/build/static/common/cave/etc/bundles/miscGrids/HPC6hrQPF.xml b/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/bundles/ncepHydro/hpc/HPC6hrQPF.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/miscGrids/HPC6hrQPF.xml rename to cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/bundles/ncepHydro/hpc/HPC6hrQPF.xml diff --git a/cave/build/static/common/cave/etc/bundles/miscGrids/HPCqpfNDFD-PPFFG.xml b/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/bundles/ncepHydro/hpc/HPCqpfNDFD-PPFFG.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/miscGrids/HPCqpfNDFD-PPFFG.xml rename to cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/bundles/ncepHydro/hpc/HPCqpfNDFD-PPFFG.xml diff --git a/cave/build/static/common/cave/etc/bundles/miscGrids/HPCqpfNDFD120hr.xml b/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/bundles/ncepHydro/hpc/HPCqpfNDFD120hr.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/miscGrids/HPCqpfNDFD120hr.xml rename to cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/bundles/ncepHydro/hpc/HPCqpfNDFD120hr.xml diff --git a/cave/build/static/common/cave/etc/bundles/miscGrids/HPCqpfNDFD48hr.xml b/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/bundles/ncepHydro/hpc/HPCqpfNDFD48hr.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/miscGrids/HPCqpfNDFD48hr.xml rename to cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/bundles/ncepHydro/hpc/HPCqpfNDFD48hr.xml diff --git a/cave/build/static/common/cave/etc/bundles/miscGrids/HPCqpfNDFD6hr.xml b/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/bundles/ncepHydro/hpc/HPCqpfNDFD6hr.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/miscGrids/HPCqpfNDFD6hr.xml rename to cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/bundles/ncepHydro/hpc/HPCqpfNDFD6hr.xml diff --git a/cave/build/static/common/cave/etc/menus/ncepHydro/hurricane/index.xml b/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/menus/ncepHydro/awc/baseAWC.xml similarity index 77% rename from cave/build/static/common/cave/etc/menus/ncepHydro/hurricane/index.xml rename to cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/menus/ncepHydro/awc/baseAWC.xml index 64c35a53a5..d44b91a82b 100644 --- a/cave/build/static/common/cave/etc/menus/ncepHydro/hurricane/index.xml +++ b/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/menus/ncepHydro/awc/baseAWC.xml @@ -18,7 +18,9 @@ See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for further_licensing_information. --> - - - \ No newline at end of file + + + + + diff --git a/cave/build/static/common/cave/etc/menus/ncepHydro/hpc/index.xml b/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/menus/ncepHydro/awc/ccfp.xml similarity index 61% rename from cave/build/static/common/cave/etc/menus/ncepHydro/hpc/index.xml rename to cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/menus/ncepHydro/awc/ccfp.xml index 12c56d695c..60418db38a 100644 --- a/cave/build/static/common/cave/etc/menus/ncepHydro/hpc/index.xml +++ b/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/menus/ncepHydro/awc/ccfp.xml @@ -18,7 +18,17 @@ See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for further_licensing_information. --> - - - \ No newline at end of file + + + + + + + + + + + diff --git a/cave/build/static/common/cave/etc/menus/ncepHydro/spc/baseSPC.xml b/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/menus/ncepHydro/cpc/baseCPC.xml similarity index 71% rename from cave/build/static/common/cave/etc/menus/ncepHydro/spc/baseSPC.xml rename to cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/menus/ncepHydro/cpc/baseCPC.xml index 921b18cdaf..e6148b59ee 100644 --- a/cave/build/static/common/cave/etc/menus/ncepHydro/spc/baseSPC.xml +++ b/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/menus/ncepHydro/cpc/baseCPC.xml @@ -18,13 +18,14 @@ See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for further_licensing_information. --> - - - /warning/% - - - /svrwx/% + + + + + + + \ No newline at end of file diff --git a/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/menus/ncepHydro/cpc/outlookGrids.xml b/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/menus/ncepHydro/cpc/outlookGrids.xml new file mode 100644 index 0000000000..ea3ae9fcfd --- /dev/null +++ b/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/menus/ncepHydro/cpc/outlookGrids.xml @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/menus/ncepHydro/cpc/threatCharts.xml b/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/menus/ncepHydro/cpc/threatCharts.xml new file mode 100644 index 0000000000..2159f71bc7 --- /dev/null +++ b/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/menus/ncepHydro/cpc/threatCharts.xml @@ -0,0 +1,98 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/menus/ncepHydro/hpc/baseHPC.xml b/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/menus/ncepHydro/hpc/baseHPC.xml new file mode 100644 index 0000000000..9fa200a592 --- /dev/null +++ b/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/menus/ncepHydro/hpc/baseHPC.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/menus/ncepHydro/hpc/precipitation.xml b/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/menus/ncepHydro/hpc/precipitation.xml new file mode 100644 index 0000000000..55feaf55e9 --- /dev/null +++ b/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/menus/ncepHydro/hpc/precipitation.xml @@ -0,0 +1,140 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/menus/ncepHydro/hpc/tempsAndWeather.xml b/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/menus/ncepHydro/hpc/tempsAndWeather.xml new file mode 100644 index 0000000000..a5de4d2a0d --- /dev/null +++ b/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/menus/ncepHydro/hpc/tempsAndWeather.xml @@ -0,0 +1,91 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/cave/build/static/common/cave/etc/menus/ncepHydro/nco/index.xml b/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/menus/ncepHydro/index.xml similarity index 62% rename from cave/build/static/common/cave/etc/menus/ncepHydro/nco/index.xml rename to cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/menus/ncepHydro/index.xml index 611669ff92..78e5aa1436 100644 --- a/cave/build/static/common/cave/etc/menus/ncepHydro/nco/index.xml +++ b/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/menus/ncepHydro/index.xml @@ -19,6 +19,18 @@ further_licensing_information. --> + + + + + + \ No newline at end of file diff --git a/cave/build/static/common/cave/etc/menus/ncepHydro/cpc/index.xml b/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/menus/ncepHydro/mpc/baseMPC.xml similarity index 76% rename from cave/build/static/common/cave/etc/menus/ncepHydro/cpc/index.xml rename to cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/menus/ncepHydro/mpc/baseMPC.xml index 7a6c0d60d4..17ffb3a624 100644 --- a/cave/build/static/common/cave/etc/menus/ncepHydro/cpc/index.xml +++ b/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/menus/ncepHydro/mpc/baseMPC.xml @@ -18,7 +18,9 @@ See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for further_licensing_information. --> - - - \ No newline at end of file + + + + + \ No newline at end of file diff --git a/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/menus/ncepHydro/mpc/marineGuidance.xml b/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/menus/ncepHydro/mpc/marineGuidance.xml new file mode 100644 index 0000000000..4d91098eae --- /dev/null +++ b/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/menus/ncepHydro/mpc/marineGuidance.xml @@ -0,0 +1,118 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/menus/ncepHydro/nco/baseNCO.xml b/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/menus/ncepHydro/nco/baseNCO.xml new file mode 100644 index 0000000000..0b6d7a4e39 --- /dev/null +++ b/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/menus/ncepHydro/nco/baseNCO.xml @@ -0,0 +1,147 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/menus/ncepHydro/nco/snowImages.xml b/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/menus/ncepHydro/nco/snowImages.xml new file mode 100644 index 0000000000..ce81e53261 --- /dev/null +++ b/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/menus/ncepHydro/nco/snowImages.xml @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/menus/ncepHydro/nco/soundingPlots.xml b/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/menus/ncepHydro/nco/soundingPlots.xml new file mode 100644 index 0000000000..a8c35f2592 --- /dev/null +++ b/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/menus/ncepHydro/nco/soundingPlots.xml @@ -0,0 +1,85 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/menus/ncepHydro/spc/baseSPC.xml b/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/menus/ncepHydro/spc/baseSPC.xml new file mode 100644 index 0000000000..535f7795f2 --- /dev/null +++ b/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/menus/ncepHydro/spc/baseSPC.xml @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/menus/ncepHydro/spc/convectiveOutlooks.xml b/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/menus/ncepHydro/spc/convectiveOutlooks.xml new file mode 100644 index 0000000000..e82455de4d --- /dev/null +++ b/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/menus/ncepHydro/spc/convectiveOutlooks.xml @@ -0,0 +1,82 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/cave/build/static/common/cave/etc/menus/ncepHydro/spc/baseFireWeather.xml b/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/menus/ncepHydro/spc/fireWeather.xml similarity index 91% rename from cave/build/static/common/cave/etc/menus/ncepHydro/spc/baseFireWeather.xml rename to cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/menus/ncepHydro/spc/fireWeather.xml index f34e5c0efa..647e114aa3 100644 --- a/cave/build/static/common/cave/etc/menus/ncepHydro/spc/baseFireWeather.xml +++ b/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/menus/ncepHydro/spc/fireWeather.xml @@ -21,17 +21,14 @@ - /redbook/%/PMWE98/% - /redbook/%/PMWI98/% - /redbook/%/PGNO98/% \ No newline at end of file diff --git a/cave/build/static/common/cave/etc/menus/ncepHydro/mpc/index.xml b/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/menus/ncepHydro/tpc/baseTPC.xml similarity index 76% rename from cave/build/static/common/cave/etc/menus/ncepHydro/mpc/index.xml rename to cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/menus/ncepHydro/tpc/baseTPC.xml index dfb3a8de25..16f576acbd 100644 --- a/cave/build/static/common/cave/etc/menus/ncepHydro/mpc/index.xml +++ b/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/menus/ncepHydro/tpc/baseTPC.xml @@ -18,7 +18,9 @@ See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for further_licensing_information. --> - - - \ No newline at end of file + + + + + \ No newline at end of file diff --git a/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/menus/ncepHydro/tpc/hurricane.xml b/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/menus/ncepHydro/tpc/hurricane.xml new file mode 100644 index 0000000000..a1ffaef8e0 --- /dev/null +++ b/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/menus/ncepHydro/tpc/hurricane.xml @@ -0,0 +1,147 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/cave/build/static/common/cave/etc/plotModels/modelGuidanceDesign.svg b/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/plotModels/modelGuidanceDesign.svg similarity index 100% rename from cave/build/static/common/cave/etc/plotModels/modelGuidanceDesign.svg rename to cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/plotModels/modelGuidanceDesign.svg diff --git a/cave/build/static/common/cave/etc/plotModels/sndrCvDesign.svg b/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/plotModels/sndrCvDesign.svg similarity index 100% rename from cave/build/static/common/cave/etc/plotModels/sndrCvDesign.svg rename to cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/plotModels/sndrCvDesign.svg diff --git a/cave/build/static/common/cave/etc/plotModels/sndrPrecipDesign.svg b/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/plotModels/sndrPrecipDesign.svg similarity index 100% rename from cave/build/static/common/cave/etc/plotModels/sndrPrecipDesign.svg rename to cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/plotModels/sndrPrecipDesign.svg diff --git a/cave/build/static/common/cave/etc/plotModels/sndrSurfaceDesign.svg b/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/plotModels/sndrSurfaceDesign.svg similarity index 100% rename from cave/build/static/common/cave/etc/plotModels/sndrSurfaceDesign.svg rename to cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/plotModels/sndrSurfaceDesign.svg diff --git a/cave/build/static/common/cave/etc/plotModels/stormDesign.svg b/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/plotModels/stormDesign.svg similarity index 100% rename from cave/build/static/common/cave/etc/plotModels/stormDesign.svg rename to cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/plotModels/stormDesign.svg diff --git a/cave/build/static/common/cave/etc/plotModels/svrWxDesign.svg b/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/plotModels/svrWxDesign.svg similarity index 100% rename from cave/build/static/common/cave/etc/plotModels/svrWxDesign.svg rename to cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/plotModels/svrWxDesign.svg diff --git a/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/plugin.xml b/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/plugin.xml new file mode 100644 index 0000000000..1673af5fc7 --- /dev/null +++ b/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/plugin.xml @@ -0,0 +1,114 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/src/com/raytheon/uf/viz/d2d/ui/ncephydro/Activator.java b/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/src/com/raytheon/uf/viz/d2d/ui/ncephydro/Activator.java new file mode 100644 index 0000000000..b4803c6be7 --- /dev/null +++ b/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/src/com/raytheon/uf/viz/d2d/ui/ncephydro/Activator.java @@ -0,0 +1,30 @@ +package com.raytheon.uf.viz.d2d.ui.ncephydro; + +import org.osgi.framework.BundleActivator; +import org.osgi.framework.BundleContext; + +public class Activator implements BundleActivator { + + private static BundleContext context; + + static BundleContext getContext() { + return context; + } + + /* + * (non-Javadoc) + * @see org.osgi.framework.BundleActivator#start(org.osgi.framework.BundleContext) + */ + public void start(BundleContext bundleContext) throws Exception { + Activator.context = bundleContext; + } + + /* + * (non-Javadoc) + * @see org.osgi.framework.BundleActivator#stop(org.osgi.framework.BundleContext) + */ + public void stop(BundleContext bundleContext) throws Exception { + Activator.context = null; + } + +} diff --git a/cave/com.raytheon.uf.viz.d2d.ui.upperair/.classpath b/cave/com.raytheon.uf.viz.d2d.ui.upperair/.classpath new file mode 100644 index 0000000000..ad32c83a78 --- /dev/null +++ b/cave/com.raytheon.uf.viz.d2d.ui.upperair/.classpath @@ -0,0 +1,7 @@ + + + + + + + diff --git a/cave/com.raytheon.uf.viz.d2d.ui.upperair/.project b/cave/com.raytheon.uf.viz.d2d.ui.upperair/.project new file mode 100644 index 0000000000..595937c821 --- /dev/null +++ b/cave/com.raytheon.uf.viz.d2d.ui.upperair/.project @@ -0,0 +1,28 @@ + + + com.raytheon.uf.viz.d2d.ui.upperair + + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.pde.ManifestBuilder + + + + + org.eclipse.pde.SchemaBuilder + + + + + + org.eclipse.pde.PluginNature + org.eclipse.jdt.core.javanature + + diff --git a/cave/com.raytheon.uf.viz.d2d.ui.upperair/.settings/org.eclipse.jdt.core.prefs b/cave/com.raytheon.uf.viz.d2d.ui.upperair/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 0000000000..c537b63063 --- /dev/null +++ b/cave/com.raytheon.uf.viz.d2d.ui.upperair/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,7 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 +org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.6 diff --git a/cave/com.raytheon.uf.viz.d2d.ui.upperair/META-INF/MANIFEST.MF b/cave/com.raytheon.uf.viz.d2d.ui.upperair/META-INF/MANIFEST.MF new file mode 100644 index 0000000000..35c3c6f7b2 --- /dev/null +++ b/cave/com.raytheon.uf.viz.d2d.ui.upperair/META-INF/MANIFEST.MF @@ -0,0 +1,24 @@ +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: D2D Upper Air +Bundle-SymbolicName: com.raytheon.uf.viz.d2d.ui.upperair;singleton:=true +Bundle-Version: 1.0.0.qualifier +Bundle-Activator: com.raytheon.uf.viz.d2d.ui.upperair.Activator +Bundle-Vendor: RAYTHEON +Require-Bundle: org.eclipse.core.runtime, + com.raytheon.uf.viz.d2d.ui;bundle-version="1.12.1174", + com.raytheon.uf.viz.d2d.nsharp;bundle-version="1.0.0", + com.raytheon.uf.viz.profiler;bundle-version="1.12.1174", + com.raytheon.viz.pointdata;bundle-version="1.12.1174", + com.raytheon.uf.viz.aviation.advisory;bundle-version="1.12.1174", + com.raytheon.uf.viz.vaa;bundle-version="1.12.1174", + com.raytheon.uf.viz.cwa;bundle-version="1.12.1174", + com.raytheon.uf.viz.bufrsigwx;bundle-version="1.12.1174", + com.raytheon.viz.radar;bundle-version="1.12.1174", + com.raytheon.viz.grid;bundle-version="1.12.1174", + com.raytheon.viz.redbook;bundle-version="1.12.1174", + com.raytheon.uf.viz.ncwf;bundle-version="1.12.1174", + com.raytheon.viz.lpi;bundle-version="1.12.1174", + com.raytheon.viz.spi;bundle-version="1.12.1174" +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-ActivationPolicy: lazy diff --git a/cave/com.raytheon.uf.viz.d2d.ui.upperair/build.properties b/cave/com.raytheon.uf.viz.d2d.ui.upperair/build.properties new file mode 100644 index 0000000000..15f66d39dc --- /dev/null +++ b/cave/com.raytheon.uf.viz.d2d.ui.upperair/build.properties @@ -0,0 +1,6 @@ +source.. = src/ +output.. = bin/ +bin.includes = META-INF/,\ + .,\ + localization/,\ + plugin.xml diff --git a/cave/build/static/common/cave/etc/bundles/Airmet.xml b/cave/com.raytheon.uf.viz.d2d.ui.upperair/localization/bundles/Airmet.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/Airmet.xml rename to cave/com.raytheon.uf.viz.d2d.ui.upperair/localization/bundles/Airmet.xml diff --git a/cave/build/static/common/cave/etc/bundles/BufrNcwf.xml b/cave/com.raytheon.uf.viz.d2d.ui.upperair/localization/bundles/BufrNcwf.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/BufrNcwf.xml rename to cave/com.raytheon.uf.viz.d2d.ui.upperair/localization/bundles/BufrNcwf.xml diff --git a/cave/build/static/common/cave/etc/bundles/ConvSigmet.xml b/cave/com.raytheon.uf.viz.d2d.ui.upperair/localization/bundles/ConvSigmet.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/ConvSigmet.xml rename to cave/com.raytheon.uf.viz.d2d.ui.upperair/localization/bundles/ConvSigmet.xml diff --git a/cave/build/static/common/cave/etc/bundles/MDCRSPlot.xml b/cave/com.raytheon.uf.viz.d2d.ui.upperair/localization/bundles/MDCRSPlot.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/MDCRSPlot.xml rename to cave/com.raytheon.uf.viz.d2d.ui.upperair/localization/bundles/MDCRSPlot.xml diff --git a/cave/build/static/common/cave/etc/bundles/NPNPlot.xml b/cave/com.raytheon.uf.viz.d2d.ui.upperair/localization/bundles/NPNPlot.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/NPNPlot.xml rename to cave/com.raytheon.uf.viz.d2d.ui.upperair/localization/bundles/NPNPlot.xml diff --git a/cave/build/static/common/cave/etc/bundles/NonConvSigmet.xml b/cave/com.raytheon.uf.viz.d2d.ui.upperair/localization/bundles/NonConvSigmet.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/NonConvSigmet.xml rename to cave/com.raytheon.uf.viz.d2d.ui.upperair/localization/bundles/NonConvSigmet.xml diff --git a/cave/build/static/common/cave/etc/bundles/PirepPlot.xml b/cave/com.raytheon.uf.viz.d2d.ui.upperair/localization/bundles/PirepPlot.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/PirepPlot.xml rename to cave/com.raytheon.uf.viz.d2d.ui.upperair/localization/bundles/PirepPlot.xml diff --git a/cave/build/static/common/cave/etc/bundles/UpperAirProfiler.xml b/cave/com.raytheon.uf.viz.d2d.ui.upperair/localization/bundles/UpperAirProfiler.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/UpperAirProfiler.xml rename to cave/com.raytheon.uf.viz.d2d.ui.upperair/localization/bundles/UpperAirProfiler.xml diff --git a/cave/build/static/common/cave/etc/bundles/UpperAirRaob.xml b/cave/com.raytheon.uf.viz.d2d.ui.upperair/localization/bundles/UpperAirRaob.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/UpperAirRaob.xml rename to cave/com.raytheon.uf.viz.d2d.ui.upperair/localization/bundles/UpperAirRaob.xml diff --git a/cave/build/static/common/cave/etc/bundles/VWP.xml b/cave/com.raytheon.uf.viz.d2d.ui.upperair/localization/bundles/VWP.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/VWP.xml rename to cave/com.raytheon.uf.viz.d2d.ui.upperair/localization/bundles/VWP.xml diff --git a/cave/build/static/common/cave/etc/menus/upperair/baseAddedFeatures.xml b/cave/com.raytheon.uf.viz.d2d.ui.upperair/localization/menus/upperair/baseAddedFeatures.xml similarity index 100% rename from cave/build/static/common/cave/etc/menus/upperair/baseAddedFeatures.xml rename to cave/com.raytheon.uf.viz.d2d.ui.upperair/localization/menus/upperair/baseAddedFeatures.xml diff --git a/cave/build/static/common/cave/etc/menus/upperair/baseAlaska.xml b/cave/com.raytheon.uf.viz.d2d.ui.upperair/localization/menus/upperair/baseAlaska.xml similarity index 100% rename from cave/build/static/common/cave/etc/menus/upperair/baseAlaska.xml rename to cave/com.raytheon.uf.viz.d2d.ui.upperair/localization/menus/upperair/baseAlaska.xml diff --git a/cave/build/static/common/cave/etc/menus/upperair/baseAlaskaNPN.xml b/cave/com.raytheon.uf.viz.d2d.ui.upperair/localization/menus/upperair/baseAlaskaNPN.xml similarity index 100% rename from cave/build/static/common/cave/etc/menus/upperair/baseAlaskaNPN.xml rename to cave/com.raytheon.uf.viz.d2d.ui.upperair/localization/menus/upperair/baseAlaskaNPN.xml diff --git a/cave/build/static/common/cave/etc/menus/upperair/baseAtlantic.xml b/cave/com.raytheon.uf.viz.d2d.ui.upperair/localization/menus/upperair/baseAtlantic.xml similarity index 100% rename from cave/build/static/common/cave/etc/menus/upperair/baseAtlantic.xml rename to cave/com.raytheon.uf.viz.d2d.ui.upperair/localization/menus/upperair/baseAtlantic.xml diff --git a/cave/build/static/common/cave/etc/menus/upperair/baseAustralia.xml b/cave/com.raytheon.uf.viz.d2d.ui.upperair/localization/menus/upperair/baseAustralia.xml similarity index 100% rename from cave/build/static/common/cave/etc/menus/upperair/baseAustralia.xml rename to cave/com.raytheon.uf.viz.d2d.ui.upperair/localization/menus/upperair/baseAustralia.xml diff --git a/cave/build/static/common/cave/etc/menus/upperair/baseAviation.xml b/cave/com.raytheon.uf.viz.d2d.ui.upperair/localization/menus/upperair/baseAviation.xml similarity index 100% rename from cave/build/static/common/cave/etc/menus/upperair/baseAviation.xml rename to cave/com.raytheon.uf.viz.d2d.ui.upperair/localization/menus/upperair/baseAviation.xml diff --git a/cave/build/static/common/cave/etc/menus/upperair/baseCanadaCentral.xml b/cave/com.raytheon.uf.viz.d2d.ui.upperair/localization/menus/upperair/baseCanadaCentral.xml similarity index 100% rename from cave/build/static/common/cave/etc/menus/upperair/baseCanadaCentral.xml rename to cave/com.raytheon.uf.viz.d2d.ui.upperair/localization/menus/upperair/baseCanadaCentral.xml diff --git a/cave/build/static/common/cave/etc/menus/upperair/baseCanadaEastern.xml b/cave/com.raytheon.uf.viz.d2d.ui.upperair/localization/menus/upperair/baseCanadaEastern.xml similarity index 100% rename from cave/build/static/common/cave/etc/menus/upperair/baseCanadaEastern.xml rename to cave/com.raytheon.uf.viz.d2d.ui.upperair/localization/menus/upperair/baseCanadaEastern.xml diff --git a/cave/build/static/common/cave/etc/menus/upperair/baseCanadaNorth.xml b/cave/com.raytheon.uf.viz.d2d.ui.upperair/localization/menus/upperair/baseCanadaNorth.xml similarity index 100% rename from cave/build/static/common/cave/etc/menus/upperair/baseCanadaNorth.xml rename to cave/com.raytheon.uf.viz.d2d.ui.upperair/localization/menus/upperair/baseCanadaNorth.xml diff --git a/cave/build/static/common/cave/etc/menus/upperair/baseCanadaWestern.xml b/cave/com.raytheon.uf.viz.d2d.ui.upperair/localization/menus/upperair/baseCanadaWestern.xml similarity index 100% rename from cave/build/static/common/cave/etc/menus/upperair/baseCanadaWestern.xml rename to cave/com.raytheon.uf.viz.d2d.ui.upperair/localization/menus/upperair/baseCanadaWestern.xml diff --git a/cave/build/static/common/cave/etc/menus/upperair/baseChina.xml b/cave/com.raytheon.uf.viz.d2d.ui.upperair/localization/menus/upperair/baseChina.xml similarity index 100% rename from cave/build/static/common/cave/etc/menus/upperair/baseChina.xml rename to cave/com.raytheon.uf.viz.d2d.ui.upperair/localization/menus/upperair/baseChina.xml diff --git a/cave/build/static/common/cave/etc/menus/upperair/baseEastNPN.xml b/cave/com.raytheon.uf.viz.d2d.ui.upperair/localization/menus/upperair/baseEastNPN.xml similarity index 100% rename from cave/build/static/common/cave/etc/menus/upperair/baseEastNPN.xml rename to cave/com.raytheon.uf.viz.d2d.ui.upperair/localization/menus/upperair/baseEastNPN.xml diff --git a/cave/build/static/common/cave/etc/menus/upperair/baseJapan.xml b/cave/com.raytheon.uf.viz.d2d.ui.upperair/localization/menus/upperair/baseJapan.xml similarity index 100% rename from cave/build/static/common/cave/etc/menus/upperair/baseJapan.xml rename to cave/com.raytheon.uf.viz.d2d.ui.upperair/localization/menus/upperair/baseJapan.xml diff --git a/cave/build/static/common/cave/etc/menus/upperair/baseMDCRS.xml b/cave/com.raytheon.uf.viz.d2d.ui.upperair/localization/menus/upperair/baseMDCRS.xml similarity index 100% rename from cave/build/static/common/cave/etc/menus/upperair/baseMDCRS.xml rename to cave/com.raytheon.uf.viz.d2d.ui.upperair/localization/menus/upperair/baseMDCRS.xml diff --git a/cave/build/static/common/cave/etc/menus/upperair/baseMexico.xml b/cave/com.raytheon.uf.viz.d2d.ui.upperair/localization/menus/upperair/baseMexico.xml similarity index 100% rename from cave/build/static/common/cave/etc/menus/upperair/baseMexico.xml rename to cave/com.raytheon.uf.viz.d2d.ui.upperair/localization/menus/upperair/baseMexico.xml diff --git a/cave/build/static/common/cave/etc/menus/upperair/baseNPNPlot.xml b/cave/com.raytheon.uf.viz.d2d.ui.upperair/localization/menus/upperair/baseNPNPlot.xml similarity index 100% rename from cave/build/static/common/cave/etc/menus/upperair/baseNPNPlot.xml rename to cave/com.raytheon.uf.viz.d2d.ui.upperair/localization/menus/upperair/baseNPNPlot.xml diff --git a/cave/build/static/common/cave/etc/menus/upperair/basePacificEast.xml b/cave/com.raytheon.uf.viz.d2d.ui.upperair/localization/menus/upperair/basePacificEast.xml similarity index 100% rename from cave/build/static/common/cave/etc/menus/upperair/basePacificEast.xml rename to cave/com.raytheon.uf.viz.d2d.ui.upperair/localization/menus/upperair/basePacificEast.xml diff --git a/cave/build/static/common/cave/etc/menus/upperair/basePacificWest.xml b/cave/com.raytheon.uf.viz.d2d.ui.upperair/localization/menus/upperair/basePacificWest.xml similarity index 100% rename from cave/build/static/common/cave/etc/menus/upperair/basePacificWest.xml rename to cave/com.raytheon.uf.viz.d2d.ui.upperair/localization/menus/upperair/basePacificWest.xml diff --git a/cave/build/static/common/cave/etc/menus/upperair/basePirep.xml b/cave/com.raytheon.uf.viz.d2d.ui.upperair/localization/menus/upperair/basePirep.xml similarity index 100% rename from cave/build/static/common/cave/etc/menus/upperair/basePirep.xml rename to cave/com.raytheon.uf.viz.d2d.ui.upperair/localization/menus/upperair/basePirep.xml diff --git a/cave/build/static/common/cave/etc/menus/upperair/baseRAOB.xml b/cave/com.raytheon.uf.viz.d2d.ui.upperair/localization/menus/upperair/baseRAOB.xml similarity index 100% rename from cave/build/static/common/cave/etc/menus/upperair/baseRAOB.xml rename to cave/com.raytheon.uf.viz.d2d.ui.upperair/localization/menus/upperair/baseRAOB.xml diff --git a/cave/build/static/common/cave/etc/menus/upperair/baseRadar.xml b/cave/com.raytheon.uf.viz.d2d.ui.upperair/localization/menus/upperair/baseRadar.xml similarity index 100% rename from cave/build/static/common/cave/etc/menus/upperair/baseRadar.xml rename to cave/com.raytheon.uf.viz.d2d.ui.upperair/localization/menus/upperair/baseRadar.xml diff --git a/cave/build/static/common/cave/etc/menus/upperair/baseRussia.xml b/cave/com.raytheon.uf.viz.d2d.ui.upperair/localization/menus/upperair/baseRussia.xml similarity index 100% rename from cave/build/static/common/cave/etc/menus/upperair/baseRussia.xml rename to cave/com.raytheon.uf.viz.d2d.ui.upperair/localization/menus/upperair/baseRussia.xml diff --git a/cave/build/static/common/cave/etc/menus/upperair/baseUSCentral.xml b/cave/com.raytheon.uf.viz.d2d.ui.upperair/localization/menus/upperair/baseUSCentral.xml similarity index 100% rename from cave/build/static/common/cave/etc/menus/upperair/baseUSCentral.xml rename to cave/com.raytheon.uf.viz.d2d.ui.upperair/localization/menus/upperair/baseUSCentral.xml diff --git a/cave/build/static/common/cave/etc/menus/upperair/baseUSEastern.xml b/cave/com.raytheon.uf.viz.d2d.ui.upperair/localization/menus/upperair/baseUSEastern.xml similarity index 100% rename from cave/build/static/common/cave/etc/menus/upperair/baseUSEastern.xml rename to cave/com.raytheon.uf.viz.d2d.ui.upperair/localization/menus/upperair/baseUSEastern.xml diff --git a/cave/build/static/common/cave/etc/menus/upperair/baseUSWestern.xml b/cave/com.raytheon.uf.viz.d2d.ui.upperair/localization/menus/upperair/baseUSWestern.xml similarity index 100% rename from cave/build/static/common/cave/etc/menus/upperair/baseUSWestern.xml rename to cave/com.raytheon.uf.viz.d2d.ui.upperair/localization/menus/upperair/baseUSWestern.xml diff --git a/cave/build/static/common/cave/etc/menus/upperair/baseUpperAir.xml b/cave/com.raytheon.uf.viz.d2d.ui.upperair/localization/menus/upperair/baseUpperAir.xml similarity index 100% rename from cave/build/static/common/cave/etc/menus/upperair/baseUpperAir.xml rename to cave/com.raytheon.uf.viz.d2d.ui.upperair/localization/menus/upperair/baseUpperAir.xml diff --git a/cave/build/static/common/cave/etc/menus/upperair/baseWestNPN.xml b/cave/com.raytheon.uf.viz.d2d.ui.upperair/localization/menus/upperair/baseWestNPN.xml similarity index 100% rename from cave/build/static/common/cave/etc/menus/upperair/baseWestNPN.xml rename to cave/com.raytheon.uf.viz.d2d.ui.upperair/localization/menus/upperair/baseWestNPN.xml diff --git a/cave/build/static/common/cave/etc/menus/upperair/index.xml b/cave/com.raytheon.uf.viz.d2d.ui.upperair/localization/menus/upperair/index.xml similarity index 100% rename from cave/build/static/common/cave/etc/menus/upperair/index.xml rename to cave/com.raytheon.uf.viz.d2d.ui.upperair/localization/menus/upperair/index.xml diff --git a/cave/com.raytheon.uf.viz.d2d.ui.upperair/plugin.xml b/cave/com.raytheon.uf.viz.d2d.ui.upperair/plugin.xml new file mode 100644 index 0000000000..62cbaea413 --- /dev/null +++ b/cave/com.raytheon.uf.viz.d2d.ui.upperair/plugin.xml @@ -0,0 +1,60 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/cave/com.raytheon.uf.viz.d2d.ui.upperair/src/com/raytheon/uf/viz/d2d/ui/upperair/Activator.java b/cave/com.raytheon.uf.viz.d2d.ui.upperair/src/com/raytheon/uf/viz/d2d/ui/upperair/Activator.java new file mode 100644 index 0000000000..16a65beadb --- /dev/null +++ b/cave/com.raytheon.uf.viz.d2d.ui.upperair/src/com/raytheon/uf/viz/d2d/ui/upperair/Activator.java @@ -0,0 +1,30 @@ +package com.raytheon.uf.viz.d2d.ui.upperair; + +import org.osgi.framework.BundleActivator; +import org.osgi.framework.BundleContext; + +public class Activator implements BundleActivator { + + private static BundleContext context; + + static BundleContext getContext() { + return context; + } + + /* + * (non-Javadoc) + * @see org.osgi.framework.BundleActivator#start(org.osgi.framework.BundleContext) + */ + public void start(BundleContext bundleContext) throws Exception { + Activator.context = bundleContext; + } + + /* + * (non-Javadoc) + * @see org.osgi.framework.BundleActivator#stop(org.osgi.framework.BundleContext) + */ + public void stop(BundleContext bundleContext) throws Exception { + Activator.context = null; + } + +} diff --git a/cave/com.raytheon.uf.viz.d2d.ui/plugin.xml b/cave/com.raytheon.uf.viz.d2d.ui/plugin.xml index 4dc4ddc5c9..dd72ae08eb 100644 --- a/cave/com.raytheon.uf.viz.d2d.ui/plugin.xml +++ b/cave/com.raytheon.uf.viz.d2d.ui/plugin.xml @@ -367,134 +367,10 @@ visible="true"> + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/cave/com.raytheon.uf.viz.displays.feature/feature.xml b/cave/com.raytheon.uf.viz.displays.feature/feature.xml index 06faad812e..460d54efe2 100644 --- a/cave/com.raytheon.uf.viz.displays.feature/feature.xml +++ b/cave/com.raytheon.uf.viz.displays.feature/feature.xml @@ -64,8 +64,7 @@ id="com.raytheon.uf.viz.cwa" download-size="0" install-size="0" - version="0.0.0" - unpack="false"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> * @@ -106,9 +111,24 @@ public class ThinClientLocalizationAdapter extends CAVELocalizationAdapter if (useRemoteFiles) { return super.listDirectory(contexts, path, recursive, filesOnly); } else { + + Set ctxsToSearch = new LinkedHashSet(); + for (LocalizationContext context : contexts) { + ctxsToSearch.add(context); + if (isCaveStaticBase(context) + && context.getContextName() == null) { + for (String bundle : BundleScanner + .getListOfBundles(BUNDLE_LOCALIZATION_DIR)) { + ctxsToSearch.add(new LocalizationContext(context + .getLocalizationType(), context + .getLocalizationLevel(), bundle)); + } + } + } + // TODO: Check for preference to only use locally available files List responses = new ArrayList(); - for (LocalizationContext context : contexts) { + for (LocalizationContext context : ctxsToSearch) { // Scan local file system for files in directory structure File file = getPath(context, ""); if (file == null || file.exists() == false) { diff --git a/cave/com.raytheon.uf.viz.ui.menus/src/com/raytheon/uf/viz/ui/menus/xml/SeparatorMenuContribution.java b/cave/com.raytheon.uf.viz.ui.menus/src/com/raytheon/uf/viz/ui/menus/xml/SeparatorMenuContribution.java index 89a95f0031..49fd896e57 100644 --- a/cave/com.raytheon.uf.viz.ui.menus/src/com/raytheon/uf/viz/ui/menus/xml/SeparatorMenuContribution.java +++ b/cave/com.raytheon.uf.viz.ui.menus/src/com/raytheon/uf/viz/ui/menus/xml/SeparatorMenuContribution.java @@ -24,6 +24,8 @@ import java.util.Set; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; +import org.eclipse.jface.action.AbstractGroupMarker; +import org.eclipse.jface.action.GroupMarker; import org.eclipse.jface.action.IContributionItem; import org.eclipse.jface.action.Separator; @@ -41,6 +43,7 @@ import com.raytheon.uf.viz.core.exception.VizException; * Date Ticket# Engineer Description * ------------ ---------- ----------- -------------------------- * Apr 2, 2009 chammack Initial creation + * Aug 13, 2013 2033 mschenke Made non-visible separators work * * * @@ -66,9 +69,13 @@ public class SeparatorMenuContribution extends if (removals.contains(item.id)) return new IContributionItem[0]; - Separator s = new Separator(item.id); - s.setVisible(item.visible); - return new IContributionItem[] { s }; + AbstractGroupMarker marker; + if (item.visible) { + marker = new Separator(item.id); + } else { + marker = new GroupMarker(item.id); + } + return new IContributionItem[] { marker }; } } diff --git a/cave/build/static/common/cave/etc/bundles/VAA.xml b/cave/com.raytheon.uf.viz.vaa/localization/bundles/VAA.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/VAA.xml rename to cave/com.raytheon.uf.viz.vaa/localization/bundles/VAA.xml diff --git a/cave/build/static/common/cave/etc/bundles/maps/Topo.xml b/cave/com.raytheon.viz.core/localization/bundles/maps/Topo.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/maps/Topo.xml rename to cave/com.raytheon.viz.core/localization/bundles/maps/Topo.xml diff --git a/cave/com.raytheon.viz.feature.awips.developer/feature.xml b/cave/com.raytheon.viz.feature.awips.developer/feature.xml index 29ee99c13d..2c5fe6312c 100644 --- a/cave/com.raytheon.viz.feature.awips.developer/feature.xml +++ b/cave/com.raytheon.viz.feature.awips.developer/feature.xml @@ -174,6 +174,10 @@ id="com.raytheon.uf.viz.archive.feature" version="0.0.0"/> + + diff --git a/cave/build/static/common/cave/etc/bundles/FFGCounty.xml b/cave/com.raytheon.viz.hydro/localization/bundles/FFGCounty.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/FFGCounty.xml rename to cave/com.raytheon.viz.hydro/localization/bundles/FFGCounty.xml diff --git a/cave/build/static/common/cave/etc/bundles/FFGZone.xml b/cave/com.raytheon.viz.hydro/localization/bundles/FFGZone.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/FFGZone.xml rename to cave/com.raytheon.viz.hydro/localization/bundles/FFGZone.xml diff --git a/cave/build/static/common/cave/etc/bundles/run-DamCREST.xml b/cave/com.raytheon.viz.hydro/localization/bundles/run-DamCREST.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/run-DamCREST.xml rename to cave/com.raytheon.viz.hydro/localization/bundles/run-DamCREST.xml diff --git a/cave/build/static/common/cave/etc/bundles/run-FcstService.xml b/cave/com.raytheon.viz.hydro/localization/bundles/run-FcstService.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/run-FcstService.xml rename to cave/com.raytheon.viz.hydro/localization/bundles/run-FcstService.xml diff --git a/cave/build/static/common/cave/etc/bundles/run-HydroGen.xml b/cave/com.raytheon.viz.hydro/localization/bundles/run-HydroGen.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/run-HydroGen.xml rename to cave/com.raytheon.viz.hydro/localization/bundles/run-HydroGen.xml diff --git a/cave/build/static/common/cave/etc/bundles/run-PrecipMonitor.xml b/cave/com.raytheon.viz.hydro/localization/bundles/run-PrecipMonitor.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/run-PrecipMonitor.xml rename to cave/com.raytheon.viz.hydro/localization/bundles/run-PrecipMonitor.xml diff --git a/cave/build/static/common/cave/etc/bundles/run-RiverMonitor.xml b/cave/com.raytheon.viz.hydro/localization/bundles/run-RiverMonitor.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/run-RiverMonitor.xml rename to cave/com.raytheon.viz.hydro/localization/bundles/run-RiverMonitor.xml diff --git a/cave/build/static/common/cave/etc/bundles/run-RiverPro.xml b/cave/com.raytheon.viz.hydro/localization/bundles/run-RiverPro.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/run-RiverPro.xml rename to cave/com.raytheon.viz.hydro/localization/bundles/run-RiverPro.xml diff --git a/cave/build/static/common/cave/etc/bundles/run-SiteSpecific.xml b/cave/com.raytheon.viz.hydro/localization/bundles/run-SiteSpecific.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/run-SiteSpecific.xml rename to cave/com.raytheon.viz.hydro/localization/bundles/run-SiteSpecific.xml diff --git a/cave/build/static/common/cave/etc/bundles/run-TimeSeriesLite.xml b/cave/com.raytheon.viz.hydro/localization/bundles/run-TimeSeriesLite.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/run-TimeSeriesLite.xml rename to cave/com.raytheon.viz.hydro/localization/bundles/run-TimeSeriesLite.xml diff --git a/cave/build/static/common/cave/etc/bundles/run-UnitHydrograph.xml b/cave/com.raytheon.viz.hydro/localization/bundles/run-UnitHydrograph.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/run-UnitHydrograph.xml rename to cave/com.raytheon.viz.hydro/localization/bundles/run-UnitHydrograph.xml diff --git a/cave/build/static/common/cave/etc/bundles/run-ldadScheduler.xml b/cave/com.raytheon.viz.hydro/localization/bundles/run-ldadScheduler.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/run-ldadScheduler.xml rename to cave/com.raytheon.viz.hydro/localization/bundles/run-ldadScheduler.xml diff --git a/cave/build/static/common/cave/etc/bundles/LightningPlot15Min.xml b/cave/com.raytheon.viz.lightning/localization/bundles/LightningPlot15Min.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/LightningPlot15Min.xml rename to cave/com.raytheon.viz.lightning/localization/bundles/LightningPlot15Min.xml diff --git a/cave/build/static/common/cave/etc/bundles/LightningPlot15MinPN.xml b/cave/com.raytheon.viz.lightning/localization/bundles/LightningPlot15MinPN.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/LightningPlot15MinPN.xml rename to cave/com.raytheon.viz.lightning/localization/bundles/LightningPlot15MinPN.xml diff --git a/cave/build/static/common/cave/etc/bundles/LightningPlot5Min.xml b/cave/com.raytheon.viz.lightning/localization/bundles/LightningPlot5Min.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/LightningPlot5Min.xml rename to cave/com.raytheon.viz.lightning/localization/bundles/LightningPlot5Min.xml diff --git a/cave/build/static/common/cave/etc/bundles/LightningPlot60Min.xml b/cave/com.raytheon.viz.lightning/localization/bundles/LightningPlot60Min.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/LightningPlot60Min.xml rename to cave/com.raytheon.viz.lightning/localization/bundles/LightningPlot60Min.xml diff --git a/cave/build/static/common/cave/etc/bundles/LightningSeq.xml b/cave/com.raytheon.viz.lightning/localization/bundles/LightningSeq.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/LightningSeq.xml rename to cave/com.raytheon.viz.lightning/localization/bundles/LightningSeq.xml diff --git a/cave/build/static/common/cave/etc/bundles/maps/88Ds.xml b/cave/com.raytheon.viz.lpi/localization/bundles/maps/88Ds.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/maps/88Ds.xml rename to cave/com.raytheon.viz.lpi/localization/bundles/maps/88Ds.xml diff --git a/cave/build/static/common/cave/etc/bundles/maps/FAA/volcanoes.xml b/cave/com.raytheon.viz.lpi/localization/bundles/maps/FAA/volcanoes.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/maps/FAA/volcanoes.xml rename to cave/com.raytheon.viz.lpi/localization/bundles/maps/FAA/volcanoes.xml diff --git a/cave/build/static/common/cave/etc/bundles/maps/county_names.xml b/cave/com.raytheon.viz.lpi/localization/bundles/maps/county_names.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/maps/county_names.xml rename to cave/com.raytheon.viz.lpi/localization/bundles/maps/county_names.xml diff --git a/cave/build/static/common/cave/etc/bundles/maps/fireWxStations.xml b/cave/com.raytheon.viz.lpi/localization/bundles/maps/fireWxStations.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/maps/fireWxStations.xml rename to cave/com.raytheon.viz.lpi/localization/bundles/maps/fireWxStations.xml diff --git a/cave/build/static/common/cave/etc/bundles/maps/spotters.xml b/cave/com.raytheon.viz.lpi/localization/bundles/maps/spotters.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/maps/spotters.xml rename to cave/com.raytheon.viz.lpi/localization/bundles/maps/spotters.xml diff --git a/cave/build/static/common/cave/etc/bundles/15minSurfacePlot.xml b/cave/com.raytheon.viz.pointdata/localization/bundles/15minSurfacePlot.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/15minSurfacePlot.xml rename to cave/com.raytheon.viz.pointdata/localization/bundles/15minSurfacePlot.xml diff --git a/cave/build/static/common/cave/etc/bundles/BufrMosPlot.xml b/cave/com.raytheon.viz.pointdata/localization/bundles/BufrMosPlot.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/BufrMosPlot.xml rename to cave/com.raytheon.viz.pointdata/localization/bundles/BufrMosPlot.xml diff --git a/cave/build/static/common/cave/etc/bundles/CoopPrecip.xml b/cave/com.raytheon.viz.pointdata/localization/bundles/CoopPrecip.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/CoopPrecip.xml rename to cave/com.raytheon.viz.pointdata/localization/bundles/CoopPrecip.xml diff --git a/cave/build/static/common/cave/etc/bundles/LDADHydroPlot.xml b/cave/com.raytheon.viz.pointdata/localization/bundles/LDADHydroPlot.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/LDADHydroPlot.xml rename to cave/com.raytheon.viz.pointdata/localization/bundles/LDADHydroPlot.xml diff --git a/cave/build/static/common/cave/etc/bundles/LDADMesoPlot.xml b/cave/com.raytheon.viz.pointdata/localization/bundles/LDADMesoPlot.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/LDADMesoPlot.xml rename to cave/com.raytheon.viz.pointdata/localization/bundles/LDADMesoPlot.xml diff --git a/cave/build/static/common/cave/etc/bundles/LDADMesoQCPlot.xml b/cave/com.raytheon.viz.pointdata/localization/bundles/LDADMesoQCPlot.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/LDADMesoQCPlot.xml rename to cave/com.raytheon.viz.pointdata/localization/bundles/LDADMesoQCPlot.xml diff --git a/cave/build/static/common/cave/etc/bundles/MaritimePlot.xml b/cave/com.raytheon.viz.pointdata/localization/bundles/MaritimePlot.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/MaritimePlot.xml rename to cave/com.raytheon.viz.pointdata/localization/bundles/MaritimePlot.xml diff --git a/cave/build/static/common/cave/etc/bundles/MetarPlot.xml b/cave/com.raytheon.viz.pointdata/localization/bundles/MetarPlot.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/MetarPlot.xml rename to cave/com.raytheon.viz.pointdata/localization/bundles/MetarPlot.xml diff --git a/cave/build/static/common/cave/etc/bundles/MetarPrecipPlot.xml b/cave/com.raytheon.viz.pointdata/localization/bundles/MetarPrecipPlot.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/MetarPrecipPlot.xml rename to cave/com.raytheon.viz.pointdata/localization/bundles/MetarPrecipPlot.xml diff --git a/cave/build/static/common/cave/etc/bundles/MsasQCPlot.xml b/cave/com.raytheon.viz.pointdata/localization/bundles/MsasQCPlot.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/MsasQCPlot.xml rename to cave/com.raytheon.viz.pointdata/localization/bundles/MsasQCPlot.xml diff --git a/cave/build/static/common/cave/etc/bundles/Scatterometer.xml b/cave/com.raytheon.viz.pointdata/localization/bundles/Scatterometer.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/Scatterometer.xml rename to cave/com.raytheon.viz.pointdata/localization/bundles/Scatterometer.xml diff --git a/cave/build/static/common/cave/etc/bundles/Scatterometer_quikscat.xml b/cave/com.raytheon.viz.pointdata/localization/bundles/Scatterometer_quikscat.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/Scatterometer_quikscat.xml rename to cave/com.raytheon.viz.pointdata/localization/bundles/Scatterometer_quikscat.xml diff --git a/cave/build/static/common/cave/etc/bundles/SeaStatePlot.xml b/cave/com.raytheon.viz.pointdata/localization/bundles/SeaStatePlot.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/SeaStatePlot.xml rename to cave/com.raytheon.viz.pointdata/localization/bundles/SeaStatePlot.xml diff --git a/cave/build/static/common/cave/etc/bundles/SoundingAvailability.xml b/cave/com.raytheon.viz.pointdata/localization/bundles/SoundingAvailability.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/SoundingAvailability.xml rename to cave/com.raytheon.viz.pointdata/localization/bundles/SoundingAvailability.xml diff --git a/cave/build/static/common/cave/etc/bundles/StationPlot.xml b/cave/com.raytheon.viz.pointdata/localization/bundles/StationPlot.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/StationPlot.xml rename to cave/com.raytheon.viz.pointdata/localization/bundles/StationPlot.xml diff --git a/cave/build/static/common/cave/etc/bundles/SurfacePlot.xml b/cave/com.raytheon.viz.pointdata/localization/bundles/SurfacePlot.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/SurfacePlot.xml rename to cave/com.raytheon.viz.pointdata/localization/bundles/SurfacePlot.xml diff --git a/cave/build/static/common/cave/etc/bundles/SynSurfacePlot.xml b/cave/com.raytheon.viz.pointdata/localization/bundles/SynSurfacePlot.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/SynSurfacePlot.xml rename to cave/com.raytheon.viz.pointdata/localization/bundles/SynSurfacePlot.xml diff --git a/cave/build/static/common/cave/etc/bundles/UpperAirPlot.xml b/cave/com.raytheon.viz.pointdata/localization/bundles/UpperAirPlot.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/UpperAirPlot.xml rename to cave/com.raytheon.viz.pointdata/localization/bundles/UpperAirPlot.xml diff --git a/cave/build/static/common/cave/etc/bundles/maritimeFixedBuoy.xml b/cave/com.raytheon.viz.pointdata/localization/bundles/maritimeFixedBuoy.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/maritimeFixedBuoy.xml rename to cave/com.raytheon.viz.pointdata/localization/bundles/maritimeFixedBuoy.xml diff --git a/cave/build/static/common/cave/etc/bundles/maritimeMAROB.xml b/cave/com.raytheon.viz.pointdata/localization/bundles/maritimeMAROB.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/maritimeMAROB.xml rename to cave/com.raytheon.viz.pointdata/localization/bundles/maritimeMAROB.xml diff --git a/cave/build/static/common/cave/etc/bundles/maritimeMoving.xml b/cave/com.raytheon.viz.pointdata/localization/bundles/maritimeMoving.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/maritimeMoving.xml rename to cave/com.raytheon.viz.pointdata/localization/bundles/maritimeMoving.xml diff --git a/cave/build/static/common/cave/etc/menus/obs/baseLocalData.xml b/cave/com.raytheon.viz.pointdata/localization/menus/obs/baseLocalData.xml similarity index 100% rename from cave/build/static/common/cave/etc/menus/obs/baseLocalData.xml rename to cave/com.raytheon.viz.pointdata/localization/menus/obs/baseLocalData.xml diff --git a/cave/build/static/common/cave/etc/menus/obs/baseMSASObs.xml b/cave/com.raytheon.viz.pointdata/localization/menus/obs/baseMSASObs.xml similarity index 100% rename from cave/build/static/common/cave/etc/menus/obs/baseMSASObs.xml rename to cave/com.raytheon.viz.pointdata/localization/menus/obs/baseMSASObs.xml diff --git a/cave/build/static/common/cave/etc/menus/obs/baseMaritime.xml b/cave/com.raytheon.viz.pointdata/localization/menus/obs/baseMaritime.xml similarity index 100% rename from cave/build/static/common/cave/etc/menus/obs/baseMaritime.xml rename to cave/com.raytheon.viz.pointdata/localization/menus/obs/baseMaritime.xml diff --git a/cave/build/static/common/cave/etc/menus/obs/baseMetar.xml b/cave/com.raytheon.viz.pointdata/localization/menus/obs/baseMetar.xml similarity index 100% rename from cave/build/static/common/cave/etc/menus/obs/baseMetar.xml rename to cave/com.raytheon.viz.pointdata/localization/menus/obs/baseMetar.xml diff --git a/cave/build/static/common/cave/etc/menus/obs/baseSurface.xml b/cave/com.raytheon.viz.pointdata/localization/menus/obs/baseSurface.xml similarity index 100% rename from cave/build/static/common/cave/etc/menus/obs/baseSurface.xml rename to cave/com.raytheon.viz.pointdata/localization/menus/obs/baseSurface.xml diff --git a/cave/build/static/common/cave/etc/menus/obs/baseSynoptic.xml b/cave/com.raytheon.viz.pointdata/localization/menus/obs/baseSynoptic.xml similarity index 100% rename from cave/build/static/common/cave/etc/menus/obs/baseSynoptic.xml rename to cave/com.raytheon.viz.pointdata/localization/menus/obs/baseSynoptic.xml diff --git a/cave/build/static/common/cave/etc/menus/obs/index.xml b/cave/com.raytheon.viz.pointdata/localization/menus/obs/index.xml similarity index 100% rename from cave/build/static/common/cave/etc/menus/obs/index.xml rename to cave/com.raytheon.viz.pointdata/localization/menus/obs/index.xml diff --git a/cave/build/static/common/cave/etc/plotModels/925mbDesign.svg b/cave/com.raytheon.viz.pointdata/localization/plotModels/925mbDesign.svg similarity index 100% rename from cave/build/static/common/cave/etc/plotModels/925mbDesign.svg rename to cave/com.raytheon.viz.pointdata/localization/plotModels/925mbDesign.svg diff --git a/cave/build/static/common/cave/etc/plotModels/Icon.svg b/cave/com.raytheon.viz.pointdata/localization/plotModels/Icon.svg similarity index 100% rename from cave/build/static/common/cave/etc/plotModels/Icon.svg rename to cave/com.raytheon.viz.pointdata/localization/plotModels/Icon.svg diff --git a/cave/build/static/common/cave/etc/plotModels/LargeSpecialSymbols.svg b/cave/com.raytheon.viz.pointdata/localization/plotModels/LargeSpecialSymbols.svg similarity index 100% rename from cave/build/static/common/cave/etc/plotModels/LargeSpecialSymbols.svg rename to cave/com.raytheon.viz.pointdata/localization/plotModels/LargeSpecialSymbols.svg diff --git a/cave/build/static/common/cave/etc/plotModels/PlotModelInterface.py b/cave/com.raytheon.viz.pointdata/localization/plotModels/PlotModelInterface.py similarity index 100% rename from cave/build/static/common/cave/etc/plotModels/PlotModelInterface.py rename to cave/com.raytheon.viz.pointdata/localization/plotModels/PlotModelInterface.py diff --git a/cave/build/static/common/cave/etc/plotModels/SpecialSymbols.svg b/cave/com.raytheon.viz.pointdata/localization/plotModels/SpecialSymbols.svg similarity index 100% rename from cave/build/static/common/cave/etc/plotModels/SpecialSymbols.svg rename to cave/com.raytheon.viz.pointdata/localization/plotModels/SpecialSymbols.svg diff --git a/cave/build/static/common/cave/etc/plotModels/Standard.svg b/cave/com.raytheon.viz.pointdata/localization/plotModels/Standard.svg similarity index 100% rename from cave/build/static/common/cave/etc/plotModels/Standard.svg rename to cave/com.raytheon.viz.pointdata/localization/plotModels/Standard.svg diff --git a/cave/build/static/common/cave/etc/plotModels/WindSymbols.svg b/cave/com.raytheon.viz.pointdata/localization/plotModels/WindSymbols.svg similarity index 100% rename from cave/build/static/common/cave/etc/plotModels/WindSymbols.svg rename to cave/com.raytheon.viz.pointdata/localization/plotModels/WindSymbols.svg diff --git a/cave/build/static/common/cave/etc/plotModels/WxSymbolText.svg b/cave/com.raytheon.viz.pointdata/localization/plotModels/WxSymbolText.svg similarity index 100% rename from cave/build/static/common/cave/etc/plotModels/WxSymbolText.svg rename to cave/com.raytheon.viz.pointdata/localization/plotModels/WxSymbolText.svg diff --git a/cave/build/static/common/cave/etc/plotModels/WxSymbols.svg b/cave/com.raytheon.viz.pointdata/localization/plotModels/WxSymbols.svg similarity index 100% rename from cave/build/static/common/cave/etc/plotModels/WxSymbols.svg rename to cave/com.raytheon.viz.pointdata/localization/plotModels/WxSymbols.svg diff --git a/cave/build/static/common/cave/etc/plotModels/acarsPlotDesign.svg b/cave/com.raytheon.viz.pointdata/localization/plotModels/acarsPlotDesign.svg similarity index 100% rename from cave/build/static/common/cave/etc/plotModels/acarsPlotDesign.svg rename to cave/com.raytheon.viz.pointdata/localization/plotModels/acarsPlotDesign.svg diff --git a/cave/build/static/common/cave/etc/plotModels/airepIcingDesign.svg b/cave/com.raytheon.viz.pointdata/localization/plotModels/airepIcingDesign.svg similarity index 100% rename from cave/build/static/common/cave/etc/plotModels/airepIcingDesign.svg rename to cave/com.raytheon.viz.pointdata/localization/plotModels/airepIcingDesign.svg diff --git a/cave/build/static/common/cave/etc/plotModels/airepTurbDesign.svg b/cave/com.raytheon.viz.pointdata/localization/plotModels/airepTurbDesign.svg similarity index 100% rename from cave/build/static/common/cave/etc/plotModels/airepTurbDesign.svg rename to cave/com.raytheon.viz.pointdata/localization/plotModels/airepTurbDesign.svg diff --git a/cave/build/static/common/cave/etc/plotModels/airep_icing_intens_trans.txt b/cave/com.raytheon.viz.pointdata/localization/plotModels/airep_icing_intens_trans.txt similarity index 100% rename from cave/build/static/common/cave/etc/plotModels/airep_icing_intens_trans.txt rename to cave/com.raytheon.viz.pointdata/localization/plotModels/airep_icing_intens_trans.txt diff --git a/cave/build/static/common/cave/etc/plotModels/airep_turb_intens_trans.txt b/cave/com.raytheon.viz.pointdata/localization/plotModels/airep_turb_intens_trans.txt similarity index 100% rename from cave/build/static/common/cave/etc/plotModels/airep_turb_intens_trans.txt rename to cave/com.raytheon.viz.pointdata/localization/plotModels/airep_turb_intens_trans.txt diff --git a/cave/build/static/common/cave/etc/plotModels/ascatPlotDesign.svg b/cave/com.raytheon.viz.pointdata/localization/plotModels/ascatPlotDesign.svg similarity index 100% rename from cave/build/static/common/cave/etc/plotModels/ascatPlotDesign.svg rename to cave/com.raytheon.viz.pointdata/localization/plotModels/ascatPlotDesign.svg diff --git a/cave/build/static/common/cave/etc/plotModels/bufr_wx_symbol_trans.txt b/cave/com.raytheon.viz.pointdata/localization/plotModels/bufr_wx_symbol_trans.txt similarity index 100% rename from cave/build/static/common/cave/etc/plotModels/bufr_wx_symbol_trans.txt rename to cave/com.raytheon.viz.pointdata/localization/plotModels/bufr_wx_symbol_trans.txt diff --git a/cave/build/static/common/cave/etc/plotModels/bufrmos/CIGV.svg b/cave/com.raytheon.viz.pointdata/localization/plotModels/bufrmos/CIGV.svg similarity index 100% rename from cave/build/static/common/cave/etc/plotModels/bufrmos/CIGV.svg rename to cave/com.raytheon.viz.pointdata/localization/plotModels/bufrmos/CIGV.svg diff --git a/cave/build/static/common/cave/etc/plotModels/bufrmos/freezing.svg b/cave/com.raytheon.viz.pointdata/localization/plotModels/bufrmos/freezing.svg similarity index 100% rename from cave/build/static/common/cave/etc/plotModels/bufrmos/freezing.svg rename to cave/com.raytheon.viz.pointdata/localization/plotModels/bufrmos/freezing.svg diff --git a/cave/build/static/common/cave/etc/plotModels/bufrmos/gfsex_maxmin.svg b/cave/com.raytheon.viz.pointdata/localization/plotModels/bufrmos/gfsex_maxmin.svg similarity index 100% rename from cave/build/static/common/cave/etc/plotModels/bufrmos/gfsex_maxmin.svg rename to cave/com.raytheon.viz.pointdata/localization/plotModels/bufrmos/gfsex_maxmin.svg diff --git a/cave/build/static/common/cave/etc/plotModels/bufrmos/gfsex_stdDesign.svg b/cave/com.raytheon.viz.pointdata/localization/plotModels/bufrmos/gfsex_stdDesign.svg similarity index 100% rename from cave/build/static/common/cave/etc/plotModels/bufrmos/gfsex_stdDesign.svg rename to cave/com.raytheon.viz.pointdata/localization/plotModels/bufrmos/gfsex_stdDesign.svg diff --git a/cave/build/static/common/cave/etc/plotModels/bufrmos/gfslamp_CIGV.svg b/cave/com.raytheon.viz.pointdata/localization/plotModels/bufrmos/gfslamp_CIGV.svg similarity index 100% rename from cave/build/static/common/cave/etc/plotModels/bufrmos/gfslamp_CIGV.svg rename to cave/com.raytheon.viz.pointdata/localization/plotModels/bufrmos/gfslamp_CIGV.svg diff --git a/cave/build/static/common/cave/etc/plotModels/bufrmos/gfslamp_CIG_codes.txt b/cave/com.raytheon.viz.pointdata/localization/plotModels/bufrmos/gfslamp_CIG_codes.txt similarity index 100% rename from cave/build/static/common/cave/etc/plotModels/bufrmos/gfslamp_CIG_codes.txt rename to cave/com.raytheon.viz.pointdata/localization/plotModels/bufrmos/gfslamp_CIG_codes.txt diff --git a/cave/build/static/common/cave/etc/plotModels/bufrmos/gfslamp_VIS_codes.txt b/cave/com.raytheon.viz.pointdata/localization/plotModels/bufrmos/gfslamp_VIS_codes.txt similarity index 100% rename from cave/build/static/common/cave/etc/plotModels/bufrmos/gfslamp_VIS_codes.txt rename to cave/com.raytheon.viz.pointdata/localization/plotModels/bufrmos/gfslamp_VIS_codes.txt diff --git a/cave/build/static/common/cave/etc/plotModels/bufrmos/gfslamp_stdDesign.svg b/cave/com.raytheon.viz.pointdata/localization/plotModels/bufrmos/gfslamp_stdDesign.svg similarity index 100% rename from cave/build/static/common/cave/etc/plotModels/bufrmos/gfslamp_stdDesign.svg rename to cave/com.raytheon.viz.pointdata/localization/plotModels/bufrmos/gfslamp_stdDesign.svg diff --git a/cave/build/static/common/cave/etc/plotModels/bufrmos/maxmin.svg b/cave/com.raytheon.viz.pointdata/localization/plotModels/bufrmos/maxmin.svg similarity index 100% rename from cave/build/static/common/cave/etc/plotModels/bufrmos/maxmin.svg rename to cave/com.raytheon.viz.pointdata/localization/plotModels/bufrmos/maxmin.svg diff --git a/cave/build/static/common/cave/etc/plotModels/bufrmos/mos_clouds_gfs_s2s.txt b/cave/com.raytheon.viz.pointdata/localization/plotModels/bufrmos/mos_clouds_gfs_s2s.txt similarity index 100% rename from cave/build/static/common/cave/etc/plotModels/bufrmos/mos_clouds_gfs_s2s.txt rename to cave/com.raytheon.viz.pointdata/localization/plotModels/bufrmos/mos_clouds_gfs_s2s.txt diff --git a/cave/build/static/common/cave/etc/plotModels/bufrmos/mos_clouds_gfsex_s2s.txt b/cave/com.raytheon.viz.pointdata/localization/plotModels/bufrmos/mos_clouds_gfsex_s2s.txt similarity index 100% rename from cave/build/static/common/cave/etc/plotModels/bufrmos/mos_clouds_gfsex_s2s.txt rename to cave/com.raytheon.viz.pointdata/localization/plotModels/bufrmos/mos_clouds_gfsex_s2s.txt diff --git a/cave/build/static/common/cave/etc/plotModels/bufrmos/mos_eta_gfs_CIG.txt b/cave/com.raytheon.viz.pointdata/localization/plotModels/bufrmos/mos_eta_gfs_CIG.txt similarity index 100% rename from cave/build/static/common/cave/etc/plotModels/bufrmos/mos_eta_gfs_CIG.txt rename to cave/com.raytheon.viz.pointdata/localization/plotModels/bufrmos/mos_eta_gfs_CIG.txt diff --git a/cave/build/static/common/cave/etc/plotModels/bufrmos/mos_eta_gfs_VIS.txt b/cave/com.raytheon.viz.pointdata/localization/plotModels/bufrmos/mos_eta_gfs_VIS.txt similarity index 100% rename from cave/build/static/common/cave/etc/plotModels/bufrmos/mos_eta_gfs_VIS.txt rename to cave/com.raytheon.viz.pointdata/localization/plotModels/bufrmos/mos_eta_gfs_VIS.txt diff --git a/cave/build/static/common/cave/etc/plotModels/bufrmos/mos_gfs_eta_snowamt24.txt b/cave/com.raytheon.viz.pointdata/localization/plotModels/bufrmos/mos_gfs_eta_snowamt24.txt similarity index 100% rename from cave/build/static/common/cave/etc/plotModels/bufrmos/mos_gfs_eta_snowamt24.txt rename to cave/com.raytheon.viz.pointdata/localization/plotModels/bufrmos/mos_gfs_eta_snowamt24.txt diff --git a/cave/build/static/common/cave/etc/plotModels/bufrmos/mos_gfs_gfsex_eta_QPF12hr.txt b/cave/com.raytheon.viz.pointdata/localization/plotModels/bufrmos/mos_gfs_gfsex_eta_QPF12hr.txt similarity index 100% rename from cave/build/static/common/cave/etc/plotModels/bufrmos/mos_gfs_gfsex_eta_QPF12hr.txt rename to cave/com.raytheon.viz.pointdata/localization/plotModels/bufrmos/mos_gfs_gfsex_eta_QPF12hr.txt diff --git a/cave/build/static/common/cave/etc/plotModels/bufrmos/mos_gfs_ngm_eta_QPF6hr.txt b/cave/com.raytheon.viz.pointdata/localization/plotModels/bufrmos/mos_gfs_ngm_eta_QPF6hr.txt similarity index 100% rename from cave/build/static/common/cave/etc/plotModels/bufrmos/mos_gfs_ngm_eta_QPF6hr.txt rename to cave/com.raytheon.viz.pointdata/localization/plotModels/bufrmos/mos_gfs_ngm_eta_QPF6hr.txt diff --git a/cave/build/static/common/cave/etc/plotModels/bufrmos/pop12hr.svg b/cave/com.raytheon.viz.pointdata/localization/plotModels/bufrmos/pop12hr.svg similarity index 100% rename from cave/build/static/common/cave/etc/plotModels/bufrmos/pop12hr.svg rename to cave/com.raytheon.viz.pointdata/localization/plotModels/bufrmos/pop12hr.svg diff --git a/cave/build/static/common/cave/etc/plotModels/bufrmos/pop24hr.svg b/cave/com.raytheon.viz.pointdata/localization/plotModels/bufrmos/pop24hr.svg similarity index 100% rename from cave/build/static/common/cave/etc/plotModels/bufrmos/pop24hr.svg rename to cave/com.raytheon.viz.pointdata/localization/plotModels/bufrmos/pop24hr.svg diff --git a/cave/build/static/common/cave/etc/plotModels/bufrmos/pqpf12hr.svg b/cave/com.raytheon.viz.pointdata/localization/plotModels/bufrmos/pqpf12hr.svg similarity index 100% rename from cave/build/static/common/cave/etc/plotModels/bufrmos/pqpf12hr.svg rename to cave/com.raytheon.viz.pointdata/localization/plotModels/bufrmos/pqpf12hr.svg diff --git a/cave/build/static/common/cave/etc/plotModels/bufrmos/pqpf6hr.svg b/cave/com.raytheon.viz.pointdata/localization/plotModels/bufrmos/pqpf6hr.svg similarity index 100% rename from cave/build/static/common/cave/etc/plotModels/bufrmos/pqpf6hr.svg rename to cave/com.raytheon.viz.pointdata/localization/plotModels/bufrmos/pqpf6hr.svg diff --git a/cave/build/static/common/cave/etc/plotModels/bufrmos/precipMix.svg b/cave/com.raytheon.viz.pointdata/localization/plotModels/bufrmos/precipMix.svg similarity index 100% rename from cave/build/static/common/cave/etc/plotModels/bufrmos/precipMix.svg rename to cave/com.raytheon.viz.pointdata/localization/plotModels/bufrmos/precipMix.svg diff --git a/cave/build/static/common/cave/etc/plotModels/bufrmos/precipRain.svg b/cave/com.raytheon.viz.pointdata/localization/plotModels/bufrmos/precipRain.svg similarity index 100% rename from cave/build/static/common/cave/etc/plotModels/bufrmos/precipRain.svg rename to cave/com.raytheon.viz.pointdata/localization/plotModels/bufrmos/precipRain.svg diff --git a/cave/build/static/common/cave/etc/plotModels/bufrmos/precipSnow.svg b/cave/com.raytheon.viz.pointdata/localization/plotModels/bufrmos/precipSnow.svg similarity index 100% rename from cave/build/static/common/cave/etc/plotModels/bufrmos/precipSnow.svg rename to cave/com.raytheon.viz.pointdata/localization/plotModels/bufrmos/precipSnow.svg diff --git a/cave/build/static/common/cave/etc/plotModels/bufrmos/qpf12hr.svg b/cave/com.raytheon.viz.pointdata/localization/plotModels/bufrmos/qpf12hr.svg similarity index 100% rename from cave/build/static/common/cave/etc/plotModels/bufrmos/qpf12hr.svg rename to cave/com.raytheon.viz.pointdata/localization/plotModels/bufrmos/qpf12hr.svg diff --git a/cave/build/static/common/cave/etc/plotModels/bufrmos/qpf6hr.svg b/cave/com.raytheon.viz.pointdata/localization/plotModels/bufrmos/qpf6hr.svg similarity index 100% rename from cave/build/static/common/cave/etc/plotModels/bufrmos/qpf6hr.svg rename to cave/com.raytheon.viz.pointdata/localization/plotModels/bufrmos/qpf6hr.svg diff --git a/cave/build/static/common/cave/etc/plotModels/bufrmos/severe12hr.svg b/cave/com.raytheon.viz.pointdata/localization/plotModels/bufrmos/severe12hr.svg similarity index 100% rename from cave/build/static/common/cave/etc/plotModels/bufrmos/severe12hr.svg rename to cave/com.raytheon.viz.pointdata/localization/plotModels/bufrmos/severe12hr.svg diff --git a/cave/build/static/common/cave/etc/plotModels/bufrmos/severe6hr.svg b/cave/com.raytheon.viz.pointdata/localization/plotModels/bufrmos/severe6hr.svg similarity index 100% rename from cave/build/static/common/cave/etc/plotModels/bufrmos/severe6hr.svg rename to cave/com.raytheon.viz.pointdata/localization/plotModels/bufrmos/severe6hr.svg diff --git a/cave/build/static/common/cave/etc/plotModels/bufrmos/snowfall24.svg b/cave/com.raytheon.viz.pointdata/localization/plotModels/bufrmos/snowfall24.svg similarity index 100% rename from cave/build/static/common/cave/etc/plotModels/bufrmos/snowfall24.svg rename to cave/com.raytheon.viz.pointdata/localization/plotModels/bufrmos/snowfall24.svg diff --git a/cave/build/static/common/cave/etc/plotModels/bufrmos/stdDesign.svg b/cave/com.raytheon.viz.pointdata/localization/plotModels/bufrmos/stdDesign.svg similarity index 100% rename from cave/build/static/common/cave/etc/plotModels/bufrmos/stdDesign.svg rename to cave/com.raytheon.viz.pointdata/localization/plotModels/bufrmos/stdDesign.svg diff --git a/cave/build/static/common/cave/etc/plotModels/bufrmos/tstorm12hr.svg b/cave/com.raytheon.viz.pointdata/localization/plotModels/bufrmos/tstorm12hr.svg similarity index 100% rename from cave/build/static/common/cave/etc/plotModels/bufrmos/tstorm12hr.svg rename to cave/com.raytheon.viz.pointdata/localization/plotModels/bufrmos/tstorm12hr.svg diff --git a/cave/build/static/common/cave/etc/plotModels/bufrmos/tstorm6hr.svg b/cave/com.raytheon.viz.pointdata/localization/plotModels/bufrmos/tstorm6hr.svg similarity index 100% rename from cave/build/static/common/cave/etc/plotModels/bufrmos/tstorm6hr.svg rename to cave/com.raytheon.viz.pointdata/localization/plotModels/bufrmos/tstorm6hr.svg diff --git a/cave/build/static/common/cave/etc/plotModels/cloud_chars.txt b/cave/com.raytheon.viz.pointdata/localization/plotModels/cloud_chars.txt similarity index 100% rename from cave/build/static/common/cave/etc/plotModels/cloud_chars.txt rename to cave/com.raytheon.viz.pointdata/localization/plotModels/cloud_chars.txt diff --git a/cave/build/static/common/cave/etc/plotModels/cloud_chars2.txt b/cave/com.raytheon.viz.pointdata/localization/plotModels/cloud_chars2.txt similarity index 100% rename from cave/build/static/common/cave/etc/plotModels/cloud_chars2.txt rename to cave/com.raytheon.viz.pointdata/localization/plotModels/cloud_chars2.txt diff --git a/cave/build/static/common/cave/etc/plotModels/cloud_select.txt b/cave/com.raytheon.viz.pointdata/localization/plotModels/cloud_select.txt similarity index 100% rename from cave/build/static/common/cave/etc/plotModels/cloud_select.txt rename to cave/com.raytheon.viz.pointdata/localization/plotModels/cloud_select.txt diff --git a/cave/build/static/common/cave/etc/plotModels/coopPrecipDesign.svg b/cave/com.raytheon.viz.pointdata/localization/plotModels/coopPrecipDesign.svg similarity index 100% rename from cave/build/static/common/cave/etc/plotModels/coopPrecipDesign.svg rename to cave/com.raytheon.viz.pointdata/localization/plotModels/coopPrecipDesign.svg diff --git a/cave/build/static/common/cave/etc/plotModels/ffgPointsDesign.svg b/cave/com.raytheon.viz.pointdata/localization/plotModels/ffgPointsDesign.svg similarity index 100% rename from cave/build/static/common/cave/etc/plotModels/ffgPointsDesign.svg rename to cave/com.raytheon.viz.pointdata/localization/plotModels/ffgPointsDesign.svg diff --git a/cave/build/static/common/cave/etc/plotModels/fractions_lookup.txt b/cave/com.raytheon.viz.pointdata/localization/plotModels/fractions_lookup.txt similarity index 100% rename from cave/build/static/common/cave/etc/plotModels/fractions_lookup.txt rename to cave/com.raytheon.viz.pointdata/localization/plotModels/fractions_lookup.txt diff --git a/cave/build/static/common/cave/etc/plotModels/fssMaritime.svg b/cave/com.raytheon.viz.pointdata/localization/plotModels/fssMaritime.svg similarity index 100% rename from cave/build/static/common/cave/etc/plotModels/fssMaritime.svg rename to cave/com.raytheon.viz.pointdata/localization/plotModels/fssMaritime.svg diff --git a/cave/build/static/common/cave/etc/plotModels/fssMetar.svg b/cave/com.raytheon.viz.pointdata/localization/plotModels/fssMetar.svg similarity index 100% rename from cave/build/static/common/cave/etc/plotModels/fssMetar.svg rename to cave/com.raytheon.viz.pointdata/localization/plotModels/fssMetar.svg diff --git a/cave/build/static/common/cave/etc/plotModels/hdwTypePlotDesign.svg b/cave/com.raytheon.viz.pointdata/localization/plotModels/hdwTypePlotDesign.svg similarity index 100% rename from cave/build/static/common/cave/etc/plotModels/hdwTypePlotDesign.svg rename to cave/com.raytheon.viz.pointdata/localization/plotModels/hdwTypePlotDesign.svg diff --git a/cave/build/static/common/cave/etc/plotModels/hdw_sat_lookup.txt b/cave/com.raytheon.viz.pointdata/localization/plotModels/hdw_sat_lookup.txt similarity index 100% rename from cave/build/static/common/cave/etc/plotModels/hdw_sat_lookup.txt rename to cave/com.raytheon.viz.pointdata/localization/plotModels/hdw_sat_lookup.txt diff --git a/cave/build/static/common/cave/etc/plotModels/icing_intens_trans.txt b/cave/com.raytheon.viz.pointdata/localization/plotModels/icing_intens_trans.txt similarity index 100% rename from cave/build/static/common/cave/etc/plotModels/icing_intens_trans.txt rename to cave/com.raytheon.viz.pointdata/localization/plotModels/icing_intens_trans.txt diff --git a/cave/build/static/common/cave/etc/plotModels/icing_type_trans.txt b/cave/com.raytheon.viz.pointdata/localization/plotModels/icing_type_trans.txt similarity index 100% rename from cave/build/static/common/cave/etc/plotModels/icing_type_trans.txt rename to cave/com.raytheon.viz.pointdata/localization/plotModels/icing_type_trans.txt diff --git a/cave/build/static/common/cave/etc/plotModels/ldadHydro15minPrecipDesign.svg b/cave/com.raytheon.viz.pointdata/localization/plotModels/ldadHydro15minPrecipDesign.svg similarity index 100% rename from cave/build/static/common/cave/etc/plotModels/ldadHydro15minPrecipDesign.svg rename to cave/com.raytheon.viz.pointdata/localization/plotModels/ldadHydro15minPrecipDesign.svg diff --git a/cave/build/static/common/cave/etc/plotModels/ldadHydro1hrPrecipDesign.svg b/cave/com.raytheon.viz.pointdata/localization/plotModels/ldadHydro1hrPrecipDesign.svg similarity index 100% rename from cave/build/static/common/cave/etc/plotModels/ldadHydro1hrPrecipDesign.svg rename to cave/com.raytheon.viz.pointdata/localization/plotModels/ldadHydro1hrPrecipDesign.svg diff --git a/cave/build/static/common/cave/etc/plotModels/ldadHydro30minPrecipDesign.svg b/cave/com.raytheon.viz.pointdata/localization/plotModels/ldadHydro30minPrecipDesign.svg similarity index 100% rename from cave/build/static/common/cave/etc/plotModels/ldadHydro30minPrecipDesign.svg rename to cave/com.raytheon.viz.pointdata/localization/plotModels/ldadHydro30minPrecipDesign.svg diff --git a/cave/build/static/common/cave/etc/plotModels/ldadHydro3hrPrecipDesign.svg b/cave/com.raytheon.viz.pointdata/localization/plotModels/ldadHydro3hrPrecipDesign.svg similarity index 100% rename from cave/build/static/common/cave/etc/plotModels/ldadHydro3hrPrecipDesign.svg rename to cave/com.raytheon.viz.pointdata/localization/plotModels/ldadHydro3hrPrecipDesign.svg diff --git a/cave/build/static/common/cave/etc/plotModels/ldadHydro5minPrecipDesign.svg b/cave/com.raytheon.viz.pointdata/localization/plotModels/ldadHydro5minPrecipDesign.svg similarity index 100% rename from cave/build/static/common/cave/etc/plotModels/ldadHydro5minPrecipDesign.svg rename to cave/com.raytheon.viz.pointdata/localization/plotModels/ldadHydro5minPrecipDesign.svg diff --git a/cave/build/static/common/cave/etc/plotModels/ldadMesoDesign.svg b/cave/com.raytheon.viz.pointdata/localization/plotModels/ldadMesoDesign.svg similarity index 100% rename from cave/build/static/common/cave/etc/plotModels/ldadMesoDesign.svg rename to cave/com.raytheon.viz.pointdata/localization/plotModels/ldadMesoDesign.svg diff --git a/cave/build/static/common/cave/etc/plotModels/ldadMesoHiWcDesign.svg b/cave/com.raytheon.viz.pointdata/localization/plotModels/ldadMesoHiWcDesign.svg similarity index 100% rename from cave/build/static/common/cave/etc/plotModels/ldadMesoHiWcDesign.svg rename to cave/com.raytheon.viz.pointdata/localization/plotModels/ldadMesoHiWcDesign.svg diff --git a/cave/build/static/common/cave/etc/plotModels/ldadQCallDesign.svg b/cave/com.raytheon.viz.pointdata/localization/plotModels/ldadQCallDesign.svg similarity index 100% rename from cave/build/static/common/cave/etc/plotModels/ldadQCallDesign.svg rename to cave/com.raytheon.viz.pointdata/localization/plotModels/ldadQCallDesign.svg diff --git a/cave/build/static/common/cave/etc/plotModels/ldadQCfailDesign.svg b/cave/com.raytheon.viz.pointdata/localization/plotModels/ldadQCfailDesign.svg similarity index 100% rename from cave/build/static/common/cave/etc/plotModels/ldadQCfailDesign.svg rename to cave/com.raytheon.viz.pointdata/localization/plotModels/ldadQCfailDesign.svg diff --git a/cave/build/static/common/cave/etc/plotModels/lsr.svg b/cave/com.raytheon.viz.pointdata/localization/plotModels/lsr.svg similarity index 100% rename from cave/build/static/common/cave/etc/plotModels/lsr.svg rename to cave/com.raytheon.viz.pointdata/localization/plotModels/lsr.svg diff --git a/cave/build/static/common/cave/etc/plotModels/lsr_ascii_strings.txt b/cave/com.raytheon.viz.pointdata/localization/plotModels/lsr_ascii_strings.txt similarity index 100% rename from cave/build/static/common/cave/etc/plotModels/lsr_ascii_strings.txt rename to cave/com.raytheon.viz.pointdata/localization/plotModels/lsr_ascii_strings.txt diff --git a/cave/build/static/common/cave/etc/plotModels/lsr_wx_strings.txt b/cave/com.raytheon.viz.pointdata/localization/plotModels/lsr_wx_strings.txt similarity index 100% rename from cave/build/static/common/cave/etc/plotModels/lsr_wx_strings.txt rename to cave/com.raytheon.viz.pointdata/localization/plotModels/lsr_wx_strings.txt diff --git a/cave/build/static/common/cave/etc/plotModels/madisObsDesign.svg b/cave/com.raytheon.viz.pointdata/localization/plotModels/madisObsDesign.svg similarity index 100% rename from cave/build/static/common/cave/etc/plotModels/madisObsDesign.svg rename to cave/com.raytheon.viz.pointdata/localization/plotModels/madisObsDesign.svg diff --git a/cave/build/static/common/cave/etc/plotModels/maritimeCvDesign.svg b/cave/com.raytheon.viz.pointdata/localization/plotModels/maritimeCvDesign.svg similarity index 100% rename from cave/build/static/common/cave/etc/plotModels/maritimeCvDesign.svg rename to cave/com.raytheon.viz.pointdata/localization/plotModels/maritimeCvDesign.svg diff --git a/cave/build/static/common/cave/etc/plotModels/maritimeDesign.svg b/cave/com.raytheon.viz.pointdata/localization/plotModels/maritimeDesign.svg similarity index 100% rename from cave/build/static/common/cave/etc/plotModels/maritimeDesign.svg rename to cave/com.raytheon.viz.pointdata/localization/plotModels/maritimeDesign.svg diff --git a/cave/build/static/common/cave/etc/plotModels/maritime_base_lookup.txt b/cave/com.raytheon.viz.pointdata/localization/plotModels/maritime_base_lookup.txt similarity index 100% rename from cave/build/static/common/cave/etc/plotModels/maritime_base_lookup.txt rename to cave/com.raytheon.viz.pointdata/localization/plotModels/maritime_base_lookup.txt diff --git a/cave/build/static/common/cave/etc/plotModels/maritime_cloud_chars.txt b/cave/com.raytheon.viz.pointdata/localization/plotModels/maritime_cloud_chars.txt similarity index 100% rename from cave/build/static/common/cave/etc/plotModels/maritime_cloud_chars.txt rename to cave/com.raytheon.viz.pointdata/localization/plotModels/maritime_cloud_chars.txt diff --git a/cave/build/static/common/cave/etc/plotModels/metar24ChgDesign.svg b/cave/com.raytheon.viz.pointdata/localization/plotModels/metar24ChgDesign.svg similarity index 100% rename from cave/build/static/common/cave/etc/plotModels/metar24ChgDesign.svg rename to cave/com.raytheon.viz.pointdata/localization/plotModels/metar24ChgDesign.svg diff --git a/cave/build/static/common/cave/etc/plotModels/metarCvDesign.svg b/cave/com.raytheon.viz.pointdata/localization/plotModels/metarCvDesign.svg similarity index 100% rename from cave/build/static/common/cave/etc/plotModels/metarCvDesign.svg rename to cave/com.raytheon.viz.pointdata/localization/plotModels/metarCvDesign.svg diff --git a/cave/build/static/common/cave/etc/plotModels/metarCvMslDesign.svg b/cave/com.raytheon.viz.pointdata/localization/plotModels/metarCvMslDesign.svg similarity index 100% rename from cave/build/static/common/cave/etc/plotModels/metarCvMslDesign.svg rename to cave/com.raytheon.viz.pointdata/localization/plotModels/metarCvMslDesign.svg diff --git a/cave/build/static/common/cave/etc/plotModels/metarHiWcDesign.svg b/cave/com.raytheon.viz.pointdata/localization/plotModels/metarHiWcDesign.svg similarity index 100% rename from cave/build/static/common/cave/etc/plotModels/metarHiWcDesign.svg rename to cave/com.raytheon.viz.pointdata/localization/plotModels/metarHiWcDesign.svg diff --git a/cave/build/static/common/cave/etc/plotModels/metarPrcp1HrDesign.svg b/cave/com.raytheon.viz.pointdata/localization/plotModels/metarPrcp1HrDesign.svg similarity index 100% rename from cave/build/static/common/cave/etc/plotModels/metarPrcp1HrDesign.svg rename to cave/com.raytheon.viz.pointdata/localization/plotModels/metarPrcp1HrDesign.svg diff --git a/cave/build/static/common/cave/etc/plotModels/metarPrcp24HrDesign.svg b/cave/com.raytheon.viz.pointdata/localization/plotModels/metarPrcp24HrDesign.svg similarity index 100% rename from cave/build/static/common/cave/etc/plotModels/metarPrcp24HrDesign.svg rename to cave/com.raytheon.viz.pointdata/localization/plotModels/metarPrcp24HrDesign.svg diff --git a/cave/build/static/common/cave/etc/plotModels/metarPrcp3HrDesign.svg b/cave/com.raytheon.viz.pointdata/localization/plotModels/metarPrcp3HrDesign.svg similarity index 100% rename from cave/build/static/common/cave/etc/plotModels/metarPrcp3HrDesign.svg rename to cave/com.raytheon.viz.pointdata/localization/plotModels/metarPrcp3HrDesign.svg diff --git a/cave/build/static/common/cave/etc/plotModels/metarPrcp6HrDesign.svg b/cave/com.raytheon.viz.pointdata/localization/plotModels/metarPrcp6HrDesign.svg similarity index 100% rename from cave/build/static/common/cave/etc/plotModels/metarPrcp6HrDesign.svg rename to cave/com.raytheon.viz.pointdata/localization/plotModels/metarPrcp6HrDesign.svg diff --git a/cave/build/static/common/cave/etc/plotModels/msas3hrPressureChangeQcCallDesign.svg b/cave/com.raytheon.viz.pointdata/localization/plotModels/msas3hrPressureChangeQcCallDesign.svg similarity index 100% rename from cave/build/static/common/cave/etc/plotModels/msas3hrPressureChangeQcCallDesign.svg rename to cave/com.raytheon.viz.pointdata/localization/plotModels/msas3hrPressureChangeQcCallDesign.svg diff --git a/cave/build/static/common/cave/etc/plotModels/msas3hrPressureChangeQcFailDesign.svg b/cave/com.raytheon.viz.pointdata/localization/plotModels/msas3hrPressureChangeQcFailDesign.svg similarity index 100% rename from cave/build/static/common/cave/etc/plotModels/msas3hrPressureChangeQcFailDesign.svg rename to cave/com.raytheon.viz.pointdata/localization/plotModels/msas3hrPressureChangeQcFailDesign.svg diff --git a/cave/build/static/common/cave/etc/plotModels/msasAltimeterQcCallDesign.svg b/cave/com.raytheon.viz.pointdata/localization/plotModels/msasAltimeterQcCallDesign.svg similarity index 100% rename from cave/build/static/common/cave/etc/plotModels/msasAltimeterQcCallDesign.svg rename to cave/com.raytheon.viz.pointdata/localization/plotModels/msasAltimeterQcCallDesign.svg diff --git a/cave/build/static/common/cave/etc/plotModels/msasAltimeterQcFailDesign.svg b/cave/com.raytheon.viz.pointdata/localization/plotModels/msasAltimeterQcFailDesign.svg similarity index 100% rename from cave/build/static/common/cave/etc/plotModels/msasAltimeterQcFailDesign.svg rename to cave/com.raytheon.viz.pointdata/localization/plotModels/msasAltimeterQcFailDesign.svg diff --git a/cave/build/static/common/cave/etc/plotModels/msasDewpointDepressionQcCallDesign.svg b/cave/com.raytheon.viz.pointdata/localization/plotModels/msasDewpointDepressionQcCallDesign.svg similarity index 100% rename from cave/build/static/common/cave/etc/plotModels/msasDewpointDepressionQcCallDesign.svg rename to cave/com.raytheon.viz.pointdata/localization/plotModels/msasDewpointDepressionQcCallDesign.svg diff --git a/cave/build/static/common/cave/etc/plotModels/msasDewpointDepressionQcFailDesign.svg b/cave/com.raytheon.viz.pointdata/localization/plotModels/msasDewpointDepressionQcFailDesign.svg similarity index 100% rename from cave/build/static/common/cave/etc/plotModels/msasDewpointDepressionQcFailDesign.svg rename to cave/com.raytheon.viz.pointdata/localization/plotModels/msasDewpointDepressionQcFailDesign.svg diff --git a/cave/build/static/common/cave/etc/plotModels/msasDewpointQcCallDesign.svg b/cave/com.raytheon.viz.pointdata/localization/plotModels/msasDewpointQcCallDesign.svg similarity index 100% rename from cave/build/static/common/cave/etc/plotModels/msasDewpointQcCallDesign.svg rename to cave/com.raytheon.viz.pointdata/localization/plotModels/msasDewpointQcCallDesign.svg diff --git a/cave/build/static/common/cave/etc/plotModels/msasDewpointQcFailDesign.svg b/cave/com.raytheon.viz.pointdata/localization/plotModels/msasDewpointQcFailDesign.svg similarity index 100% rename from cave/build/static/common/cave/etc/plotModels/msasDewpointQcFailDesign.svg rename to cave/com.raytheon.viz.pointdata/localization/plotModels/msasDewpointQcFailDesign.svg diff --git a/cave/build/static/common/cave/etc/plotModels/msasMAPSPressureQcCallDesign.svg b/cave/com.raytheon.viz.pointdata/localization/plotModels/msasMAPSPressureQcCallDesign.svg similarity index 100% rename from cave/build/static/common/cave/etc/plotModels/msasMAPSPressureQcCallDesign.svg rename to cave/com.raytheon.viz.pointdata/localization/plotModels/msasMAPSPressureQcCallDesign.svg diff --git a/cave/build/static/common/cave/etc/plotModels/msasMAPSPressureQcFailDesign.svg b/cave/com.raytheon.viz.pointdata/localization/plotModels/msasMAPSPressureQcFailDesign.svg similarity index 100% rename from cave/build/static/common/cave/etc/plotModels/msasMAPSPressureQcFailDesign.svg rename to cave/com.raytheon.viz.pointdata/localization/plotModels/msasMAPSPressureQcFailDesign.svg diff --git a/cave/build/static/common/cave/etc/plotModels/msasMSLnwsPressureQcCallDesign.svg b/cave/com.raytheon.viz.pointdata/localization/plotModels/msasMSLnwsPressureQcCallDesign.svg similarity index 100% rename from cave/build/static/common/cave/etc/plotModels/msasMSLnwsPressureQcCallDesign.svg rename to cave/com.raytheon.viz.pointdata/localization/plotModels/msasMSLnwsPressureQcCallDesign.svg diff --git a/cave/build/static/common/cave/etc/plotModels/msasMSLnwsPressureQcFailDesign.svg b/cave/com.raytheon.viz.pointdata/localization/plotModels/msasMSLnwsPressureQcFailDesign.svg similarity index 100% rename from cave/build/static/common/cave/etc/plotModels/msasMSLnwsPressureQcFailDesign.svg rename to cave/com.raytheon.viz.pointdata/localization/plotModels/msasMSLnwsPressureQcFailDesign.svg diff --git a/cave/build/static/common/cave/etc/plotModels/msasPotentialTempQcCallDesign.svg b/cave/com.raytheon.viz.pointdata/localization/plotModels/msasPotentialTempQcCallDesign.svg similarity index 100% rename from cave/build/static/common/cave/etc/plotModels/msasPotentialTempQcCallDesign.svg rename to cave/com.raytheon.viz.pointdata/localization/plotModels/msasPotentialTempQcCallDesign.svg diff --git a/cave/build/static/common/cave/etc/plotModels/msasPotentialTempQcFailDesign.svg b/cave/com.raytheon.viz.pointdata/localization/plotModels/msasPotentialTempQcFailDesign.svg similarity index 100% rename from cave/build/static/common/cave/etc/plotModels/msasPotentialTempQcFailDesign.svg rename to cave/com.raytheon.viz.pointdata/localization/plotModels/msasPotentialTempQcFailDesign.svg diff --git a/cave/build/static/common/cave/etc/plotModels/msasWindQcCallDesign.svg b/cave/com.raytheon.viz.pointdata/localization/plotModels/msasWindQcCallDesign.svg similarity index 100% rename from cave/build/static/common/cave/etc/plotModels/msasWindQcCallDesign.svg rename to cave/com.raytheon.viz.pointdata/localization/plotModels/msasWindQcCallDesign.svg diff --git a/cave/build/static/common/cave/etc/plotModels/msasWindQcFailDesign.svg b/cave/com.raytheon.viz.pointdata/localization/plotModels/msasWindQcFailDesign.svg similarity index 100% rename from cave/build/static/common/cave/etc/plotModels/msasWindQcFailDesign.svg rename to cave/com.raytheon.viz.pointdata/localization/plotModels/msasWindQcFailDesign.svg diff --git a/cave/build/static/common/cave/etc/plotModels/output_formats.txt b/cave/com.raytheon.viz.pointdata/localization/plotModels/output_formats.txt similarity index 100% rename from cave/build/static/common/cave/etc/plotModels/output_formats.txt rename to cave/com.raytheon.viz.pointdata/localization/plotModels/output_formats.txt diff --git a/cave/build/static/common/cave/etc/plotModels/pct_cover_chars.txt b/cave/com.raytheon.viz.pointdata/localization/plotModels/pct_cover_chars.txt similarity index 100% rename from cave/build/static/common/cave/etc/plotModels/pct_cover_chars.txt rename to cave/com.raytheon.viz.pointdata/localization/plotModels/pct_cover_chars.txt diff --git a/cave/build/static/common/cave/etc/plotModels/pirepIcingDesign.svg b/cave/com.raytheon.viz.pointdata/localization/plotModels/pirepIcingDesign.svg similarity index 100% rename from cave/build/static/common/cave/etc/plotModels/pirepIcingDesign.svg rename to cave/com.raytheon.viz.pointdata/localization/plotModels/pirepIcingDesign.svg diff --git a/cave/build/static/common/cave/etc/plotModels/pirepPlotDesign.svg b/cave/com.raytheon.viz.pointdata/localization/plotModels/pirepPlotDesign.svg similarity index 100% rename from cave/build/static/common/cave/etc/plotModels/pirepPlotDesign.svg rename to cave/com.raytheon.viz.pointdata/localization/plotModels/pirepPlotDesign.svg diff --git a/cave/build/static/common/cave/etc/plotModels/pirepTurbDesign.svg b/cave/com.raytheon.viz.pointdata/localization/plotModels/pirepTurbDesign.svg similarity index 100% rename from cave/build/static/common/cave/etc/plotModels/pirepTurbDesign.svg rename to cave/com.raytheon.viz.pointdata/localization/plotModels/pirepTurbDesign.svg diff --git a/cave/build/static/common/cave/etc/plotModels/plotModelLoader.svg b/cave/com.raytheon.viz.pointdata/localization/plotModels/plotModelLoader.svg similarity index 100% rename from cave/build/static/common/cave/etc/plotModels/plotModelLoader.svg rename to cave/com.raytheon.viz.pointdata/localization/plotModels/plotModelLoader.svg diff --git a/cave/build/static/common/cave/etc/plotModels/positionUpdate.svg b/cave/com.raytheon.viz.pointdata/localization/plotModels/positionUpdate.svg similarity index 100% rename from cave/build/static/common/cave/etc/plotModels/positionUpdate.svg rename to cave/com.raytheon.viz.pointdata/localization/plotModels/positionUpdate.svg diff --git a/cave/build/static/common/cave/etc/plotModels/prcp_formats.txt b/cave/com.raytheon.viz.pointdata/localization/plotModels/prcp_formats.txt similarity index 100% rename from cave/build/static/common/cave/etc/plotModels/prcp_formats.txt rename to cave/com.raytheon.viz.pointdata/localization/plotModels/prcp_formats.txt diff --git a/cave/build/static/common/cave/etc/plotModels/pres_wx_symbols.txt b/cave/com.raytheon.viz.pointdata/localization/plotModels/pres_wx_symbols.txt similarity index 100% rename from cave/build/static/common/cave/etc/plotModels/pres_wx_symbols.txt rename to cave/com.raytheon.viz.pointdata/localization/plotModels/pres_wx_symbols.txt diff --git a/cave/build/static/common/cave/etc/plotModels/press_change_char_lookup.txt b/cave/com.raytheon.viz.pointdata/localization/plotModels/press_change_char_lookup.txt similarity index 100% rename from cave/build/static/common/cave/etc/plotModels/press_change_char_lookup.txt rename to cave/com.raytheon.viz.pointdata/localization/plotModels/press_change_char_lookup.txt diff --git a/cave/build/static/common/cave/etc/plotModels/profPlotDesign.svg b/cave/com.raytheon.viz.pointdata/localization/plotModels/profPlotDesign.svg similarity index 100% rename from cave/build/static/common/cave/etc/plotModels/profPlotDesign.svg rename to cave/com.raytheon.viz.pointdata/localization/plotModels/profPlotDesign.svg diff --git a/cave/build/static/common/cave/etc/plotModels/qcplot.py b/cave/com.raytheon.viz.pointdata/localization/plotModels/qcplot.py similarity index 100% rename from cave/build/static/common/cave/etc/plotModels/qcplot.py rename to cave/com.raytheon.viz.pointdata/localization/plotModels/qcplot.py diff --git a/cave/build/static/common/cave/etc/plotModels/quikScatPlotDesign.svg b/cave/com.raytheon.viz.pointdata/localization/plotModels/quikScatPlotDesign.svg similarity index 100% rename from cave/build/static/common/cave/etc/plotModels/quikScatPlotDesign.svg rename to cave/com.raytheon.viz.pointdata/localization/plotModels/quikScatPlotDesign.svg diff --git a/cave/build/static/common/cave/etc/plotModels/raobLowerDesign.svg b/cave/com.raytheon.viz.pointdata/localization/plotModels/raobLowerDesign.svg similarity index 100% rename from cave/build/static/common/cave/etc/plotModels/raobLowerDesign.svg rename to cave/com.raytheon.viz.pointdata/localization/plotModels/raobLowerDesign.svg diff --git a/cave/build/static/common/cave/etc/plotModels/raobUpperDesign.svg b/cave/com.raytheon.viz.pointdata/localization/plotModels/raobUpperDesign.svg similarity index 100% rename from cave/build/static/common/cave/etc/plotModels/raobUpperDesign.svg rename to cave/com.raytheon.viz.pointdata/localization/plotModels/raobUpperDesign.svg diff --git a/cave/build/static/common/cave/etc/plotModels/raob_dd_char.txt b/cave/com.raytheon.viz.pointdata/localization/plotModels/raob_dd_char.txt similarity index 100% rename from cave/build/static/common/cave/etc/plotModels/raob_dd_char.txt rename to cave/com.raytheon.viz.pointdata/localization/plotModels/raob_dd_char.txt diff --git a/cave/build/static/common/cave/etc/plotModels/redbookuaDesign.svg b/cave/com.raytheon.viz.pointdata/localization/plotModels/redbookuaDesign.svg similarity index 100% rename from cave/build/static/common/cave/etc/plotModels/redbookuaDesign.svg rename to cave/com.raytheon.viz.pointdata/localization/plotModels/redbookuaDesign.svg diff --git a/cave/build/static/common/cave/etc/plotModels/redbookua_chars.txt b/cave/com.raytheon.viz.pointdata/localization/plotModels/redbookua_chars.txt similarity index 100% rename from cave/build/static/common/cave/etc/plotModels/redbookua_chars.txt rename to cave/com.raytheon.viz.pointdata/localization/plotModels/redbookua_chars.txt diff --git a/cave/build/static/common/cave/etc/plotModels/sat_name_lookup.txt b/cave/com.raytheon.viz.pointdata/localization/plotModels/sat_name_lookup.txt similarity index 100% rename from cave/build/static/common/cave/etc/plotModels/sat_name_lookup.txt rename to cave/com.raytheon.viz.pointdata/localization/plotModels/sat_name_lookup.txt diff --git a/cave/build/static/common/cave/etc/plotModels/sat_type_lookup.txt b/cave/com.raytheon.viz.pointdata/localization/plotModels/sat_type_lookup.txt similarity index 100% rename from cave/build/static/common/cave/etc/plotModels/sat_type_lookup.txt rename to cave/com.raytheon.viz.pointdata/localization/plotModels/sat_type_lookup.txt diff --git a/cave/build/static/common/cave/etc/plotModels/sat_type_lookup_ascat.txt b/cave/com.raytheon.viz.pointdata/localization/plotModels/sat_type_lookup_ascat.txt similarity index 100% rename from cave/build/static/common/cave/etc/plotModels/sat_type_lookup_ascat.txt rename to cave/com.raytheon.viz.pointdata/localization/plotModels/sat_type_lookup_ascat.txt diff --git a/cave/build/static/common/cave/etc/plotModels/seaStateDesign.svg b/cave/com.raytheon.viz.pointdata/localization/plotModels/seaStateDesign.svg similarity index 100% rename from cave/build/static/common/cave/etc/plotModels/seaStateDesign.svg rename to cave/com.raytheon.viz.pointdata/localization/plotModels/seaStateDesign.svg diff --git a/cave/build/static/common/cave/etc/plotModels/sndrAvailabilityDesign.svg b/cave/com.raytheon.viz.pointdata/localization/plotModels/sndrAvailabilityDesign.svg similarity index 100% rename from cave/build/static/common/cave/etc/plotModels/sndrAvailabilityDesign.svg rename to cave/com.raytheon.viz.pointdata/localization/plotModels/sndrAvailabilityDesign.svg diff --git a/cave/build/static/common/cave/etc/plotModels/ssmiPWPlotDesign.svg b/cave/com.raytheon.viz.pointdata/localization/plotModels/ssmiPWPlotDesign.svg similarity index 100% rename from cave/build/static/common/cave/etc/plotModels/ssmiPWPlotDesign.svg rename to cave/com.raytheon.viz.pointdata/localization/plotModels/ssmiPWPlotDesign.svg diff --git a/cave/build/static/common/cave/etc/plotModels/ssmiSTPlotDesign.svg b/cave/com.raytheon.viz.pointdata/localization/plotModels/ssmiSTPlotDesign.svg similarity index 100% rename from cave/build/static/common/cave/etc/plotModels/ssmiSTPlotDesign.svg rename to cave/com.raytheon.viz.pointdata/localization/plotModels/ssmiSTPlotDesign.svg diff --git a/cave/build/static/common/cave/etc/plotModels/ssmiVILPlotDesign.svg b/cave/com.raytheon.viz.pointdata/localization/plotModels/ssmiVILPlotDesign.svg similarity index 100% rename from cave/build/static/common/cave/etc/plotModels/ssmiVILPlotDesign.svg rename to cave/com.raytheon.viz.pointdata/localization/plotModels/ssmiVILPlotDesign.svg diff --git a/cave/build/static/common/cave/etc/plotModels/ssmiVILPlotDesign.txt b/cave/com.raytheon.viz.pointdata/localization/plotModels/ssmiVILPlotDesign.txt similarity index 100% rename from cave/build/static/common/cave/etc/plotModels/ssmiVILPlotDesign.txt rename to cave/com.raytheon.viz.pointdata/localization/plotModels/ssmiVILPlotDesign.txt diff --git a/cave/build/static/common/cave/etc/plotModels/ssmiWindPlotDesign.svg b/cave/com.raytheon.viz.pointdata/localization/plotModels/ssmiWindPlotDesign.svg similarity index 100% rename from cave/build/static/common/cave/etc/plotModels/ssmiWindPlotDesign.svg rename to cave/com.raytheon.viz.pointdata/localization/plotModels/ssmiWindPlotDesign.svg diff --git a/cave/build/static/common/cave/etc/plotModels/stdObsDesign.svg b/cave/com.raytheon.viz.pointdata/localization/plotModels/stdObsDesign.svg similarity index 100% rename from cave/build/static/common/cave/etc/plotModels/stdObsDesign.svg rename to cave/com.raytheon.viz.pointdata/localization/plotModels/stdObsDesign.svg diff --git a/cave/build/static/common/cave/etc/plotModels/stdSynDesign.svg b/cave/com.raytheon.viz.pointdata/localization/plotModels/stdSynDesign.svg similarity index 100% rename from cave/build/static/common/cave/etc/plotModels/stdSynDesign.svg rename to cave/com.raytheon.viz.pointdata/localization/plotModels/stdSynDesign.svg diff --git a/cave/build/static/common/cave/etc/plotModels/storm_type_lookup.txt b/cave/com.raytheon.viz.pointdata/localization/plotModels/storm_type_lookup.txt similarity index 100% rename from cave/build/static/common/cave/etc/plotModels/storm_type_lookup.txt rename to cave/com.raytheon.viz.pointdata/localization/plotModels/storm_type_lookup.txt diff --git a/cave/build/static/common/cave/etc/plotModels/synopticPrcp24Design.svg b/cave/com.raytheon.viz.pointdata/localization/plotModels/synopticPrcp24Design.svg similarity index 100% rename from cave/build/static/common/cave/etc/plotModels/synopticPrcp24Design.svg rename to cave/com.raytheon.viz.pointdata/localization/plotModels/synopticPrcp24Design.svg diff --git a/cave/build/static/common/cave/etc/plotModels/synopticPrcp6Design.svg b/cave/com.raytheon.viz.pointdata/localization/plotModels/synopticPrcp6Design.svg similarity index 100% rename from cave/build/static/common/cave/etc/plotModels/synopticPrcp6Design.svg rename to cave/com.raytheon.viz.pointdata/localization/plotModels/synopticPrcp6Design.svg diff --git a/cave/build/static/common/cave/etc/plotModels/synoptic_wx_chars.txt b/cave/com.raytheon.viz.pointdata/localization/plotModels/synoptic_wx_chars.txt similarity index 100% rename from cave/build/static/common/cave/etc/plotModels/synoptic_wx_chars.txt rename to cave/com.raytheon.viz.pointdata/localization/plotModels/synoptic_wx_chars.txt diff --git a/cave/build/static/common/cave/etc/plotModels/turb_freq_trans.txt b/cave/com.raytheon.viz.pointdata/localization/plotModels/turb_freq_trans.txt similarity index 100% rename from cave/build/static/common/cave/etc/plotModels/turb_freq_trans.txt rename to cave/com.raytheon.viz.pointdata/localization/plotModels/turb_freq_trans.txt diff --git a/cave/build/static/common/cave/etc/plotModels/turb_intens_trans.txt b/cave/com.raytheon.viz.pointdata/localization/plotModels/turb_intens_trans.txt similarity index 100% rename from cave/build/static/common/cave/etc/plotModels/turb_intens_trans.txt rename to cave/com.raytheon.viz.pointdata/localization/plotModels/turb_intens_trans.txt diff --git a/cave/build/static/common/cave/etc/plotModels/vwp.svg b/cave/com.raytheon.viz.pointdata/localization/plotModels/vwp.svg similarity index 100% rename from cave/build/static/common/cave/etc/plotModels/vwp.svg rename to cave/com.raytheon.viz.pointdata/localization/plotModels/vwp.svg diff --git a/cave/build/static/common/cave/etc/plotModels/waveTypeLookup.txt b/cave/com.raytheon.viz.pointdata/localization/plotModels/waveTypeLookup.txt similarity index 100% rename from cave/build/static/common/cave/etc/plotModels/waveTypeLookup.txt rename to cave/com.raytheon.viz.pointdata/localization/plotModels/waveTypeLookup.txt diff --git a/cave/build/static/common/cave/etc/plotModels/wx_symbol_trans.txt b/cave/com.raytheon.viz.pointdata/localization/plotModels/wx_symbol_trans.txt similarity index 100% rename from cave/build/static/common/cave/etc/plotModels/wx_symbol_trans.txt rename to cave/com.raytheon.viz.pointdata/localization/plotModels/wx_symbol_trans.txt diff --git a/cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/PlotModelDataDefinition.java b/cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/PlotModelDataDefinition.java index 170deb5510..4c0128634e 100644 --- a/cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/PlotModelDataDefinition.java +++ b/cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/PlotModelDataDefinition.java @@ -1,7 +1,5 @@ package com.raytheon.viz.pointdata; -import java.io.File; -import java.io.FileFilter; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; @@ -21,9 +19,8 @@ import com.raytheon.uf.common.dataplugin.level.LevelFactory; import com.raytheon.uf.common.dataplugin.level.mapping.LevelMappingFactory; import com.raytheon.uf.common.dataquery.requests.RequestConstraint; import com.raytheon.uf.common.localization.IPathManager; -import com.raytheon.uf.common.localization.LocalizationContext; -import com.raytheon.uf.common.localization.LocalizationContext.LocalizationLevel; import com.raytheon.uf.common.localization.LocalizationContext.LocalizationType; +import com.raytheon.uf.common.localization.LocalizationFile; import com.raytheon.uf.common.localization.PathManagerFactory; import com.raytheon.uf.common.status.IUFStatusHandler; import com.raytheon.uf.common.status.UFStatus; @@ -181,30 +178,12 @@ public class PlotModelDataDefinition extends private void populateModels() { if (models == null) { - models = new HashMap>(); - LocalizationContext ctx = null; + Map> models = new HashMap>(); IPathManager pm = PathManagerFactory.getPathManager(); - - ctx = pm.getContext(LocalizationType.CAVE_STATIC, - LocalizationLevel.BASE); - File dir = pm.getFile(ctx, PLOTLOCATION); - - if (!dir.exists() || !dir.isDirectory()) { - throw new RuntimeException("Cannot find plot model files"); - } - - FileFilter filter = new FileFilter() { - - @Override - public boolean accept(File f) { - return (!f.isHidden() && f.canRead() && f.getName() - .contains("svg")); - } - - }; - - File[] files = dir.listFiles(filter); + LocalizationFile[] files = pm.listFiles( + pm.getLocalSearchHierarchy(LocalizationType.CAVE_STATIC), + PLOTLOCATION, new String[] { ".svg" }, true, true); MapDescriptor fakeDescriptor = null; try { @@ -213,10 +192,11 @@ public class PlotModelDataDefinition extends throw new RuntimeException(e); } - for (File file : files) { - try { + for (LocalizationFile file : files) { + String fileName = file.getName(); + if (models.containsKey(fileName) == false) { List fields = new PlotModelFactory2( - fakeDescriptor, file.getName()).getPlotFields(); + fakeDescriptor, fileName).getPlotFields(); List params = new ArrayList(); for (PlotModelElement p : fields) { if (!p.parameter.equals("") @@ -229,11 +209,10 @@ public class PlotModelDataDefinition extends } } } - models.put(file.getName(), params); - } catch (Exception e) { - ;// + models.put(fileName, params); } } + PlotModelDataDefinition.models = models; } } diff --git a/cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/PlotModelFactory2.java b/cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/PlotModelFactory2.java index 3ba2d1eb37..3c64ab5bc6 100644 --- a/cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/PlotModelFactory2.java +++ b/cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/PlotModelFactory2.java @@ -57,6 +57,7 @@ import org.w3c.dom.Node; import org.w3c.dom.NodeList; import org.w3c.dom.Text; +import com.raytheon.uf.common.localization.IPathManager; import com.raytheon.uf.common.localization.LocalizationContext.LocalizationLevel; import com.raytheon.uf.common.localization.LocalizationContext.LocalizationType; import com.raytheon.uf.common.localization.LocalizationFile; @@ -983,8 +984,9 @@ public class PlotModelFactory2 { case LONG: if (dimensions == 1) { Number n = ob.getNumber(element.parameter); - if((n != null) && (n.doubleValue() != -9999)) { - if((n.doubleValue() != -9999)&&(!Double.isNaN(n.doubleValue()))) { + if ((n != null) && (n.doubleValue() != -9999)) { + if ((n.doubleValue() != -9999) + && (!Double.isNaN(n.doubleValue()))) { display = n.toString(); } } @@ -1007,9 +1009,9 @@ public class PlotModelFactory2 { display = fields[element.index]; } else if (element.ranking != null && fields != null) { display = element.ranking.getRankedField(fields); - } else if ((fields != null)&&(fields.length > 0)) { - StringBuilder sb = new StringBuilder(fields[fields.length-1]); - for(int i = fields.length-2; i >= 0;i--) { + } else if ((fields != null) && (fields.length > 0)) { + StringBuilder sb = new StringBuilder(fields[fields.length - 1]); + for (int i = fields.length - 2; i >= 0; i--) { sb.append(" "); sb.append(fields[i]); } @@ -1196,19 +1198,24 @@ public class PlotModelFactory2 { } /** - * Convert an array of Numbers to their String representation. Note that indexing - * may be used on the return array so the output size must match the input size. - * @param values An array of Number to convert. - * @return The converted data. If the input is null, the return will be null. + * Convert an array of Numbers to their String representation. Note that + * indexing may be used on the return array so the output size must match + * the input size. + * + * @param values + * An array of Number to convert. + * @return The converted data. If the input is null, the return will be + * null. */ private String[] numberToStringArray(Number[] values) { String[] retVal = null; - if(values != null) { + if (values != null) { retVal = new String[values.length]; - Arrays.fill(retVal,""); - for(int i = 0;i < values.length;i++) { + Arrays.fill(retVal, ""); + for (int i = 0; i < values.length; i++) { Number n = values[i]; - if((n.doubleValue() != -9999)&&(!Double.isNaN(n.doubleValue()))) { + if ((n.doubleValue() != -9999) + && (!Double.isNaN(n.doubleValue()))) { retVal[i] = n.toString(); } } @@ -1298,7 +1305,7 @@ public class PlotModelFactory2 { Map map = PathManagerFactory .getPathManager().getTieredLocalizationFile( - LocalizationType.CAVE_STATIC, "plotModels"); + LocalizationType.CAVE_STATIC, plotmodelDir); ArrayList keys = new ArrayList( map.keySet()); Collections.sort(keys); @@ -1312,7 +1319,8 @@ public class PlotModelFactory2 { } File baseFile = PathManagerFactory.getPathManager().getStaticFile( - "plotModels/PlotModelInterface.py"); + plotmodelDir + IPathManager.SEPARATOR + + "PlotModelInterface.py"); script = new PlotPythonScript(baseFile.getAbsolutePath(), includePath.toString(), plotDelegateName); if (scriptText != null) @@ -1359,7 +1367,7 @@ public class PlotModelFactory2 { private File getTableFile(String fileName) { File rval = PathManagerFactory.getPathManager().getStaticFile( - plotmodelDir + File.separator + fileName); + plotmodelDir + IPathManager.SEPARATOR + fileName); return rval; } diff --git a/cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/PointIconFactory.java b/cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/PointIconFactory.java index b6bf42e13b..820f472f2e 100644 --- a/cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/PointIconFactory.java +++ b/cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/PointIconFactory.java @@ -22,7 +22,6 @@ package com.raytheon.viz.pointdata; import java.awt.Graphics2D; import java.awt.image.BufferedImage; import java.awt.image.IndexColorModel; -import java.io.File; import org.apache.batik.bridge.BridgeContext; import org.apache.batik.bridge.GVTBuilder; @@ -35,6 +34,7 @@ import org.eclipse.swt.graphics.RGB; import org.w3c.dom.Document; import org.w3c.dom.Element; +import com.raytheon.uf.common.localization.IPathManager; import com.raytheon.uf.common.localization.PathManagerFactory; import com.raytheon.uf.viz.core.exception.VizException; @@ -73,8 +73,10 @@ public class PointIconFactory { SAXDocumentFactory f = new SAXSVGDocumentFactory(parser); try { - document = f.createDocument(PathManagerFactory.getPathManager() - .getStaticFile("plotModels" + File.separator + "Icon.svg") + document = f.createDocument(PathManagerFactory + .getPathManager() + .getStaticFile( + "plotModels" + IPathManager.SEPARATOR + "Icon.svg") .toURI().toString()); } catch (Exception e) { throw new VizException("Error loading symbol file: Icon.svg", e); @@ -98,8 +100,8 @@ public class PointIconFactory { BufferedImage.TYPE_BYTE_INDEXED, colorModel); Graphics2D g2d = bImage.createGraphics(); document.getElementsByTagName("svg").item(0).getAttributes() - .getNamedItem("viewBox").setNodeValue( - "0 0 " + size + " " + size); + .getNamedItem("viewBox") + .setNodeValue("0 0 " + size + " " + size); Element iconNode = document.getElementById("icon"); iconNode.getFirstChild().setNodeValue(Integer.toString(i)); iconNode.getAttributeNode("x").setNodeValue(String.valueOf(size / 2)); diff --git a/cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/S2N.java b/cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/S2N.java index 55059da087..1cdd084348 100644 --- a/cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/S2N.java +++ b/cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/S2N.java @@ -26,6 +26,7 @@ import java.io.FileReader; import java.io.IOException; import java.util.HashMap; +import com.raytheon.uf.common.localization.IPathManager; import com.raytheon.uf.common.localization.PathManagerFactory; public class S2N { @@ -73,7 +74,7 @@ public class S2N { BufferedReader input = null; S2N lookup = new S2N(s2nFilename); File s2nFile = PathManagerFactory.getPathManager().getStaticFile( - S2N.plotmodelDir + File.separator + s2nFilename); + S2N.plotmodelDir + IPathManager.SEPARATOR + s2nFilename); int counter = 0; int highestValue = -1; try { diff --git a/cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/StaticPlotInfoPV.java b/cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/StaticPlotInfoPV.java index b66c7648b4..1b1d7b309c 100644 --- a/cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/StaticPlotInfoPV.java +++ b/cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/StaticPlotInfoPV.java @@ -38,8 +38,6 @@ public class StaticPlotInfoPV { private static final transient IUFStatusHandler statusHandler = UFStatus .getHandler(StaticPlotInfoPV.class); - private static final String plotmodelDir = "plotModels"; - private static final String REGEX = "^\\s*(\\d+)\\s*(\\S+)\\s*(-?\\d+\\.\\d+)\\s*(-?\\d+\\.\\d+)\\s*(-?\\d+)\\s*(-?\\d+\\.\\d+)\\s*(\\S*)$"; private final HashMap spiList; diff --git a/cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/StringLookup.java b/cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/StringLookup.java index ee3dafb30b..1633a7ecc4 100644 --- a/cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/StringLookup.java +++ b/cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/StringLookup.java @@ -28,6 +28,7 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.TreeMap; +import com.raytheon.uf.common.localization.IPathManager; import com.raytheon.uf.common.localization.PathManagerFactory; public class StringLookup { @@ -245,7 +246,8 @@ public class StringLookup { BufferedReader input = null; StringLookup lookup = new StringLookup(s2nFilename); File s2nFile = PathManagerFactory.getPathManager().getStaticFile( - StringLookup.plotmodelDir + File.separator + s2nFilename); + StringLookup.plotmodelDir + IPathManager.SEPARATOR + + s2nFilename); try { input = new BufferedReader(new FileReader(s2nFile)); String line = null; @@ -297,7 +299,8 @@ public class StringLookup { BufferedReader input = null; StringLookup lookup = new StringLookup(r2nFilename); File r2nFile = PathManagerFactory.getPathManager().getStaticFile( - StringLookup.plotmodelDir + File.separator + r2nFilename); + StringLookup.plotmodelDir + IPathManager.SEPARATOR + + r2nFilename); try { input = new BufferedReader(new FileReader(r2nFile)); String line = null; @@ -333,18 +336,18 @@ public class StringLookup { if (firstEntry) { firstEntry = false; second = Float.parseFloat(lookupValues[1]); - lookup.setRangeEntry(Float - .parseFloat(lookupValues[0]), + lookup.setRangeEntry( + Float.parseFloat(lookupValues[0]), lookupValues[2]); - lookup.setRangeEntry(Float - .parseFloat(lookupValues[1]), + lookup.setRangeEntry( + Float.parseFloat(lookupValues[1]), lookupValues[2]); } else { first = second; second = Float.parseFloat(lookupValues[1]); - lookup.setRangeEntry(Float - .parseFloat(lookupValues[1]), + lookup.setRangeEntry( + Float.parseFloat(lookupValues[1]), lookupValues[2]); } } catch (Exception e) { diff --git a/cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/ui/cmenu/ViewPlotModelAction.java b/cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/ui/cmenu/ViewPlotModelAction.java index f69ec37c79..fc2e81a423 100644 --- a/cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/ui/cmenu/ViewPlotModelAction.java +++ b/cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/ui/cmenu/ViewPlotModelAction.java @@ -29,8 +29,6 @@ import org.eclipse.jface.action.IMenuCreator; import org.eclipse.swt.SWT; import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Menu; -import org.eclipse.ui.IWorkbenchPage; -import org.eclipse.ui.PlatformUI; import com.raytheon.uf.common.localization.LocalizationFile; import com.raytheon.uf.common.localization.PathManagerFactory; @@ -202,12 +200,9 @@ public class ViewPlotModelAction extends AbstractRightClickAction implements .getStaticLocalizationFile( PlotResourceData.PLOT_DIR + plotModelFile); - LocalizationPerspectiveUtils.changeToLocalizationPerspective(); - IWorkbenchPage page = PlatformUI.getWorkbench() - .getActiveWorkbenchWindow().getActivePage(); - if (page != null) { - ILocalizationService service = LocalizationPerspectiveUtils - .getService(page); + ILocalizationService service = LocalizationPerspectiveUtils + .changeToLocalizationPerspective(); + if (service != null) { service.openFile(file); } } diff --git a/cave/build/static/common/cave/etc/bundles/DefaultCellTrend.xml b/cave/com.raytheon.viz.radar/localization/bundles/DefaultCellTrend.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/DefaultCellTrend.xml rename to cave/com.raytheon.viz.radar/localization/bundles/DefaultCellTrend.xml diff --git a/cave/build/static/common/cave/etc/bundles/DefaultRadar.xml b/cave/com.raytheon.viz.radar/localization/bundles/DefaultRadar.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/DefaultRadar.xml rename to cave/com.raytheon.viz.radar/localization/bundles/DefaultRadar.xml diff --git a/cave/build/static/common/cave/etc/bundles/DefaultRadarBestRes.xml b/cave/com.raytheon.viz.radar/localization/bundles/DefaultRadarBestRes.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/DefaultRadarBestRes.xml rename to cave/com.raytheon.viz.radar/localization/bundles/DefaultRadarBestRes.xml diff --git a/cave/build/static/common/cave/etc/bundles/DefaultRadarBlended.xml b/cave/com.raytheon.viz.radar/localization/bundles/DefaultRadarBlended.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/DefaultRadarBlended.xml rename to cave/com.raytheon.viz.radar/localization/bundles/DefaultRadarBlended.xml diff --git a/cave/build/static/common/cave/etc/bundles/DefaultRadarBlendedBestRes.xml b/cave/com.raytheon.viz.radar/localization/bundles/DefaultRadarBlendedBestRes.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/DefaultRadarBlendedBestRes.xml rename to cave/com.raytheon.viz.radar/localization/bundles/DefaultRadarBlendedBestRes.xml diff --git a/cave/build/static/common/cave/etc/bundles/DefaultRadarCodedMessage.xml b/cave/com.raytheon.viz.radar/localization/bundles/DefaultRadarCodedMessage.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/DefaultRadarCodedMessage.xml rename to cave/com.raytheon.viz.radar/localization/bundles/DefaultRadarCodedMessage.xml diff --git a/cave/build/static/common/cave/etc/bundles/DefaultRadarComp05VILMax.xml b/cave/com.raytheon.viz.radar/localization/bundles/DefaultRadarComp05VILMax.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/DefaultRadarComp05VILMax.xml rename to cave/com.raytheon.viz.radar/localization/bundles/DefaultRadarComp05VILMax.xml diff --git a/cave/build/static/common/cave/etc/bundles/DefaultRadarCompRefl.xml b/cave/com.raytheon.viz.radar/localization/bundles/DefaultRadarCompRefl.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/DefaultRadarCompRefl.xml rename to cave/com.raytheon.viz.radar/localization/bundles/DefaultRadarCompRefl.xml diff --git a/cave/build/static/common/cave/etc/bundles/DefaultRadarDualPolBaseData.xml b/cave/com.raytheon.viz.radar/localization/bundles/DefaultRadarDualPolBaseData.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/DefaultRadarDualPolBaseData.xml rename to cave/com.raytheon.viz.radar/localization/bundles/DefaultRadarDualPolBaseData.xml diff --git a/cave/build/static/common/cave/etc/bundles/DefaultRadarDualPolFourPanelZHCML.xml b/cave/com.raytheon.viz.radar/localization/bundles/DefaultRadarDualPolFourPanelZHCML.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/DefaultRadarDualPolFourPanelZHCML.xml rename to cave/com.raytheon.viz.radar/localization/bundles/DefaultRadarDualPolFourPanelZHCML.xml diff --git a/cave/build/static/common/cave/etc/bundles/DefaultRadarDualPolHCA.xml b/cave/com.raytheon.viz.radar/localization/bundles/DefaultRadarDualPolHCA.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/DefaultRadarDualPolHCA.xml rename to cave/com.raytheon.viz.radar/localization/bundles/DefaultRadarDualPolHCA.xml diff --git a/cave/build/static/common/cave/etc/bundles/DefaultRadarDualPolPrecipAnalysis.xml b/cave/com.raytheon.viz.radar/localization/bundles/DefaultRadarDualPolPrecipAnalysis.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/DefaultRadarDualPolPrecipAnalysis.xml rename to cave/com.raytheon.viz.radar/localization/bundles/DefaultRadarDualPolPrecipAnalysis.xml diff --git a/cave/build/static/common/cave/etc/bundles/DefaultRadarFourPanelBlended.xml b/cave/com.raytheon.viz.radar/localization/bundles/DefaultRadarFourPanelBlended.xml similarity index 73% rename from cave/build/static/common/cave/etc/bundles/DefaultRadarFourPanelBlended.xml rename to cave/com.raytheon.viz.radar/localization/bundles/DefaultRadarFourPanelBlended.xml index 10dbb60c8b..1bc36988f8 100644 --- a/cave/build/static/common/cave/etc/bundles/DefaultRadarFourPanelBlended.xml +++ b/cave/com.raytheon.viz.radar/localization/bundles/DefaultRadarFourPanelBlended.xml @@ -19,37 +19,37 @@ further_licensing_information. --> - - - + + + - - + + - - - - - - + + + + + + @@ -70,12 +70,12 @@ - - - + + + - - + + @@ -102,22 +102,22 @@ - - - + + + - - + + - - - + + + - - + + @@ -138,12 +138,12 @@ - - - + + + - - + + @@ -170,22 +170,22 @@ - - - + + + - - + + - - - + + + - - + + @@ -206,12 +206,12 @@ - - - + + + - - + + @@ -237,22 +237,22 @@ - - - + + + - - + + - - - + + + - - + + @@ -273,12 +273,12 @@ - - - + + + - - + + @@ -302,7 +302,5 @@ - - - + \ No newline at end of file diff --git a/cave/build/static/common/cave/etc/bundles/DefaultRadarFourPanelBlendedBestRes.xml b/cave/com.raytheon.viz.radar/localization/bundles/DefaultRadarFourPanelBlendedBestRes.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/DefaultRadarFourPanelBlendedBestRes.xml rename to cave/com.raytheon.viz.radar/localization/bundles/DefaultRadarFourPanelBlendedBestRes.xml diff --git a/cave/build/static/common/cave/etc/bundles/DefaultRadarGraphic.xml b/cave/com.raytheon.viz.radar/localization/bundles/DefaultRadarGraphic.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/DefaultRadarGraphic.xml rename to cave/com.raytheon.viz.radar/localization/bundles/DefaultRadarGraphic.xml diff --git a/cave/build/static/common/cave/etc/bundles/DefaultRadarImageWithGraphic.xml b/cave/com.raytheon.viz.radar/localization/bundles/DefaultRadarImageWithGraphic.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/DefaultRadarImageWithGraphic.xml rename to cave/com.raytheon.viz.radar/localization/bundles/DefaultRadarImageWithGraphic.xml diff --git a/cave/build/static/common/cave/etc/bundles/DefaultRadarLayered.xml b/cave/com.raytheon.viz.radar/localization/bundles/DefaultRadarLayered.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/DefaultRadarLayered.xml rename to cave/com.raytheon.viz.radar/localization/bundles/DefaultRadarLayered.xml diff --git a/cave/build/static/common/cave/etc/bundles/DefaultRadarMosaic.xml b/cave/com.raytheon.viz.radar/localization/bundles/DefaultRadarMosaic.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/DefaultRadarMosaic.xml rename to cave/com.raytheon.viz.radar/localization/bundles/DefaultRadarMosaic.xml diff --git a/cave/build/static/common/cave/etc/bundles/DefaultRadarMosaicVILCompRefl.xml b/cave/com.raytheon.viz.radar/localization/bundles/DefaultRadarMosaicVILCompRefl.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/DefaultRadarMosaicVILCompRefl.xml rename to cave/com.raytheon.viz.radar/localization/bundles/DefaultRadarMosaicVILCompRefl.xml diff --git a/cave/build/static/common/cave/etc/bundles/DefaultRadarSpecWidth.xml b/cave/com.raytheon.viz.radar/localization/bundles/DefaultRadarSpecWidth.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/DefaultRadarSpecWidth.xml rename to cave/com.raytheon.viz.radar/localization/bundles/DefaultRadarSpecWidth.xml diff --git a/cave/build/static/common/cave/etc/bundles/DefaultRadarTot1hr3hrComp.xml b/cave/com.raytheon.viz.radar/localization/bundles/DefaultRadarTot1hr3hrComp.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/DefaultRadarTot1hr3hrComp.xml rename to cave/com.raytheon.viz.radar/localization/bundles/DefaultRadarTot1hr3hrComp.xml diff --git a/cave/build/static/common/cave/etc/bundles/DefaultRadarVILCompMax2Max3.xml b/cave/com.raytheon.viz.radar/localization/bundles/DefaultRadarVILCompMax2Max3.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/DefaultRadarVILCompMax2Max3.xml rename to cave/com.raytheon.viz.radar/localization/bundles/DefaultRadarVILCompMax2Max3.xml diff --git a/cave/build/static/common/cave/etc/bundles/DefaultRadarVILCompRefl.xml b/cave/com.raytheon.viz.radar/localization/bundles/DefaultRadarVILCompRefl.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/DefaultRadarVILCompRefl.xml rename to cave/com.raytheon.viz.radar/localization/bundles/DefaultRadarVILCompRefl.xml diff --git a/cave/build/static/common/cave/etc/bundles/DefaultRadarXY.xml b/cave/com.raytheon.viz.radar/localization/bundles/DefaultRadarXY.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/DefaultRadarXY.xml rename to cave/com.raytheon.viz.radar/localization/bundles/DefaultRadarXY.xml diff --git a/cave/build/static/common/cave/etc/bundles/DefaultTerminalRadar4PanelBlendedBestRes.xml b/cave/com.raytheon.viz.radar/localization/bundles/DefaultTerminalRadar4PanelBlendedBestRes.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/DefaultTerminalRadar4PanelBlendedBestRes.xml rename to cave/com.raytheon.viz.radar/localization/bundles/DefaultTerminalRadar4PanelBlendedBestRes.xml diff --git a/cave/build/static/common/cave/etc/bundles/Redbook.xml b/cave/com.raytheon.viz.redbook/localization/bundles/Redbook.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/Redbook.xml rename to cave/com.raytheon.viz.redbook/localization/bundles/Redbook.xml diff --git a/cave/build/static/common/cave/etc/bundles/RedbookUpperAir.xml b/cave/com.raytheon.viz.redbook/localization/bundles/RedbookUpperAir.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/RedbookUpperAir.xml rename to cave/com.raytheon.viz.redbook/localization/bundles/RedbookUpperAir.xml diff --git a/cave/build/static/common/cave/etc/bundles/Redbook_customLegend.xml b/cave/com.raytheon.viz.redbook/localization/bundles/Redbook_customLegend.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/Redbook_customLegend.xml rename to cave/com.raytheon.viz.redbook/localization/bundles/Redbook_customLegend.xml diff --git a/cave/build/static/common/cave/etc/bundles/POESSatellite.xml b/cave/com.raytheon.viz.satellite/localization/bundles/POESSatellite.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/POESSatellite.xml rename to cave/com.raytheon.viz.satellite/localization/bundles/POESSatellite.xml diff --git a/cave/build/static/common/cave/etc/bundles/SSMIPlot.xml b/cave/com.raytheon.viz.satellite/localization/bundles/SSMIPlot.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/SSMIPlot.xml rename to cave/com.raytheon.viz.satellite/localization/bundles/SSMIPlot.xml diff --git a/cave/build/static/common/cave/etc/bundles/SSMIWindPlot.xml b/cave/com.raytheon.viz.satellite/localization/bundles/SSMIWindPlot.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/SSMIWindPlot.xml rename to cave/com.raytheon.viz.satellite/localization/bundles/SSMIWindPlot.xml diff --git a/cave/build/static/common/cave/etc/bundles/maps/Sounding Locs/gfs.xml b/cave/com.raytheon.viz.spi/localization/bundles/maps/Sounding Locs/gfs.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/maps/Sounding Locs/gfs.xml rename to cave/com.raytheon.viz.spi/localization/bundles/maps/Sounding Locs/gfs.xml diff --git a/cave/build/static/common/cave/etc/bundles/maps/Sounding Locs/goes.xml b/cave/com.raytheon.viz.spi/localization/bundles/maps/Sounding Locs/goes.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/maps/Sounding Locs/goes.xml rename to cave/com.raytheon.viz.spi/localization/bundles/maps/Sounding Locs/goes.xml diff --git a/cave/build/static/common/cave/etc/bundles/maps/Sounding Locs/nam.xml b/cave/com.raytheon.viz.spi/localization/bundles/maps/Sounding Locs/nam.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/maps/Sounding Locs/nam.xml rename to cave/com.raytheon.viz.spi/localization/bundles/maps/Sounding Locs/nam.xml diff --git a/cave/build/static/common/cave/etc/bundles/maps/Sounding Locs/raob.xml b/cave/com.raytheon.viz.spi/localization/bundles/maps/Sounding Locs/raob.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/maps/Sounding Locs/raob.xml rename to cave/com.raytheon.viz.spi/localization/bundles/maps/Sounding Locs/raob.xml diff --git a/cave/build/static/common/cave/etc/bundles/maps/acarsAirports.xml b/cave/com.raytheon.viz.spi/localization/bundles/maps/acarsAirports.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/maps/acarsAirports.xml rename to cave/com.raytheon.viz.spi/localization/bundles/maps/acarsAirports.xml diff --git a/cave/build/static/common/cave/etc/bundles/maps/buoy.xml b/cave/com.raytheon.viz.spi/localization/bundles/maps/buoy.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/maps/buoy.xml rename to cave/com.raytheon.viz.spi/localization/bundles/maps/buoy.xml diff --git a/cave/build/static/common/cave/etc/bundles/maps/ldad.xml b/cave/com.raytheon.viz.spi/localization/bundles/maps/ldad.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/maps/ldad.xml rename to cave/com.raytheon.viz.spi/localization/bundles/maps/ldad.xml diff --git a/cave/build/static/common/cave/etc/bundles/maps/ldadPrecip.xml b/cave/com.raytheon.viz.spi/localization/bundles/maps/ldadPrecip.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/maps/ldadPrecip.xml rename to cave/com.raytheon.viz.spi/localization/bundles/maps/ldadPrecip.xml diff --git a/cave/build/static/common/cave/etc/bundles/maps/metars.xml b/cave/com.raytheon.viz.spi/localization/bundles/maps/metars.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/maps/metars.xml rename to cave/com.raytheon.viz.spi/localization/bundles/maps/metars.xml diff --git a/cave/build/static/common/cave/etc/bundles/maps/profilers.xml b/cave/com.raytheon.viz.spi/localization/bundles/maps/profilers.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/maps/profilers.xml rename to cave/com.raytheon.viz.spi/localization/bundles/maps/profilers.xml diff --git a/cave/build/static/common/cave/etc/bundles/maps/synoptic.xml b/cave/com.raytheon.viz.spi/localization/bundles/maps/synoptic.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/maps/synoptic.xml rename to cave/com.raytheon.viz.spi/localization/bundles/maps/synoptic.xml diff --git a/cave/build/static/common/cave/etc/bundles/volume/500Height.xml b/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/500Height.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/volume/500Height.xml rename to cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/500Height.xml diff --git a/cave/build/static/common/cave/etc/bundles/volume/DefaultFamily.xml b/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/DefaultFamily.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/volume/DefaultFamily.xml rename to cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/DefaultFamily.xml diff --git a/cave/build/static/common/cave/etc/bundles/volume/DefaultFourPanel.xml b/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/DefaultFourPanel.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/volume/DefaultFourPanel.xml rename to cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/DefaultFourPanel.xml diff --git a/cave/build/static/common/cave/etc/bundles/volume/DefaultStdEnv.xml b/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/DefaultStdEnv.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/volume/DefaultStdEnv.xml rename to cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/DefaultStdEnv.xml diff --git a/cave/build/static/common/cave/etc/bundles/volume/DefaultSurface.xml b/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/DefaultSurface.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/volume/DefaultSurface.xml rename to cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/DefaultSurface.xml diff --git a/cave/build/static/common/cave/etc/bundles/volume/ECMWFHiRes.xml b/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ECMWFHiRes.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/volume/ECMWFHiRes.xml rename to cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ECMWFHiRes.xml diff --git a/cave/build/static/common/cave/etc/bundles/volume/ECMWFHiResFourPanel.xml b/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ECMWFHiResFourPanel.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/volume/ECMWFHiResFourPanel.xml rename to cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ECMWFHiResFourPanel.xml diff --git a/cave/build/static/common/cave/etc/bundles/volume/ECMWFLowRes.xml b/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ECMWFLowRes.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/volume/ECMWFLowRes.xml rename to cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ECMWFLowRes.xml diff --git a/cave/build/static/common/cave/etc/bundles/volume/LimitedFamily.xml b/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/LimitedFamily.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/volume/LimitedFamily.xml rename to cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/LimitedFamily.xml diff --git a/cave/build/static/common/cave/etc/bundles/volume/MSLPress.xml b/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/MSLPress.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/volume/MSLPress.xml rename to cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/MSLPress.xml diff --git a/cave/build/static/common/cave/etc/bundles/volume/ModelFamilyA.xml b/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ModelFamilyA.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/volume/ModelFamilyA.xml rename to cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ModelFamilyA.xml diff --git a/cave/build/static/common/cave/etc/bundles/volume/ModelFamilyB.xml b/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ModelFamilyB.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/volume/ModelFamilyB.xml rename to cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ModelFamilyB.xml diff --git a/cave/build/static/common/cave/etc/bundles/volume/ModelFamilyC.xml b/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ModelFamilyC.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/volume/ModelFamilyC.xml rename to cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ModelFamilyC.xml diff --git a/cave/build/static/common/cave/etc/bundles/volume/ModelFamilyD.xml b/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ModelFamilyD.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/volume/ModelFamilyD.xml rename to cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ModelFamilyD.xml diff --git a/cave/build/static/common/cave/etc/bundles/volume/ModelFamilyE.xml b/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ModelFamilyE.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/volume/ModelFamilyE.xml rename to cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ModelFamilyE.xml diff --git a/cave/build/static/common/cave/etc/bundles/volume/ModelFamilyF.xml b/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ModelFamilyF.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/volume/ModelFamilyF.xml rename to cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ModelFamilyF.xml diff --git a/cave/build/static/common/cave/etc/bundles/volume/ModelFamilyH.xml b/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ModelFamilyH.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/volume/ModelFamilyH.xml rename to cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ModelFamilyH.xml diff --git a/cave/build/static/common/cave/etc/bundles/volume/ModelFamilyI.xml b/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ModelFamilyI.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/volume/ModelFamilyI.xml rename to cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ModelFamilyI.xml diff --git a/cave/build/static/common/cave/etc/bundles/volume/ModelFamilyJ.xml b/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ModelFamilyJ.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/volume/ModelFamilyJ.xml rename to cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ModelFamilyJ.xml diff --git a/cave/build/static/common/cave/etc/bundles/volume/ModelFamilyL.xml b/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ModelFamilyL.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/volume/ModelFamilyL.xml rename to cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ModelFamilyL.xml diff --git a/cave/build/static/common/cave/etc/bundles/volume/ModelFamilyM.xml b/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ModelFamilyM.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/volume/ModelFamilyM.xml rename to cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ModelFamilyM.xml diff --git a/cave/build/static/common/cave/etc/bundles/volume/ModelFamilyU.xml b/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ModelFamilyU.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/volume/ModelFamilyU.xml rename to cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ModelFamilyU.xml diff --git a/cave/build/static/common/cave/etc/bundles/volume/ModelFamilyV.xml b/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ModelFamilyV.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/volume/ModelFamilyV.xml rename to cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ModelFamilyV.xml diff --git a/cave/build/static/common/cave/etc/bundles/volume/ModelFamilyW.xml b/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ModelFamilyW.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/volume/ModelFamilyW.xml rename to cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ModelFamilyW.xml diff --git a/cave/build/static/common/cave/etc/bundles/volume/ModelFamilyX.xml b/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ModelFamilyX.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/volume/ModelFamilyX.xml rename to cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ModelFamilyX.xml diff --git a/cave/build/static/common/cave/etc/bundles/volume/ModelFamilyY.xml b/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ModelFamilyY.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/volume/ModelFamilyY.xml rename to cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ModelFamilyY.xml diff --git a/cave/build/static/common/cave/etc/bundles/volume/ModelFamilyYY.xml b/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ModelFamilyYY.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/volume/ModelFamilyYY.xml rename to cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ModelFamilyYY.xml diff --git a/cave/build/static/common/cave/etc/bundles/volume/RaobStdEnv.xml b/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/RaobStdEnv.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/volume/RaobStdEnv.xml rename to cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/RaobStdEnv.xml diff --git a/cave/build/static/common/cave/etc/bundles/volume/UKMET.xml b/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/UKMET.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/volume/UKMET.xml rename to cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/UKMET.xml diff --git a/cave/build/static/common/cave/etc/bundles/volume/UKMETFourPanel.xml b/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/UKMETFourPanel.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/volume/UKMETFourPanel.xml rename to cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/UKMETFourPanel.xml diff --git a/cave/build/static/common/cave/etc/bundles/AllLocalWarnings.xml b/cave/com.raytheon.viz.warnings/localization/bundles/AllLocalWarnings.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/AllLocalWarnings.xml rename to cave/com.raytheon.viz.warnings/localization/bundles/AllLocalWarnings.xml diff --git a/cave/build/static/common/cave/etc/bundles/AllRegionalWarnings.xml b/cave/com.raytheon.viz.warnings/localization/bundles/AllRegionalWarnings.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/AllRegionalWarnings.xml rename to cave/com.raytheon.viz.warnings/localization/bundles/AllRegionalWarnings.xml diff --git a/cave/build/static/common/cave/etc/bundles/LocalCWAFloodWarnings.xml b/cave/com.raytheon.viz.warnings/localization/bundles/LocalCWAFloodWarnings.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/LocalCWAFloodWarnings.xml rename to cave/com.raytheon.viz.warnings/localization/bundles/LocalCWAFloodWarnings.xml diff --git a/cave/build/static/common/cave/etc/bundles/LocalCWASPS.xml b/cave/com.raytheon.viz.warnings/localization/bundles/LocalCWASPS.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/LocalCWASPS.xml rename to cave/com.raytheon.viz.warnings/localization/bundles/LocalCWASPS.xml diff --git a/cave/build/static/common/cave/etc/bundles/LocalCWAWarnings.xml b/cave/com.raytheon.viz.warnings/localization/bundles/LocalCWAWarnings.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/LocalCWAWarnings.xml rename to cave/com.raytheon.viz.warnings/localization/bundles/LocalCWAWarnings.xml diff --git a/cave/build/static/common/cave/etc/bundles/LocalRegionalFloodWarnings.xml b/cave/com.raytheon.viz.warnings/localization/bundles/LocalRegionalFloodWarnings.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/LocalRegionalFloodWarnings.xml rename to cave/com.raytheon.viz.warnings/localization/bundles/LocalRegionalFloodWarnings.xml diff --git a/cave/build/static/common/cave/etc/bundles/LocalRegionalWarnings.xml b/cave/com.raytheon.viz.warnings/localization/bundles/LocalRegionalWarnings.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/LocalRegionalWarnings.xml rename to cave/com.raytheon.viz.warnings/localization/bundles/LocalRegionalWarnings.xml diff --git a/cave/build/static/common/cave/etc/bundles/LocalStormReportsLocal.xml b/cave/com.raytheon.viz.warnings/localization/bundles/LocalStormReportsLocal.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/LocalStormReportsLocal.xml rename to cave/com.raytheon.viz.warnings/localization/bundles/LocalStormReportsLocal.xml diff --git a/cave/build/static/common/cave/etc/bundles/LocalStormReportsOffice.xml b/cave/com.raytheon.viz.warnings/localization/bundles/LocalStormReportsOffice.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/LocalStormReportsOffice.xml rename to cave/com.raytheon.viz.warnings/localization/bundles/LocalStormReportsOffice.xml diff --git a/cave/build/static/common/cave/etc/bundles/LocalStormReportsRegion.xml b/cave/com.raytheon.viz.warnings/localization/bundles/LocalStormReportsRegion.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/LocalStormReportsRegion.xml rename to cave/com.raytheon.viz.warnings/localization/bundles/LocalStormReportsRegion.xml diff --git a/cave/build/static/common/cave/etc/bundles/MarineWarning.xml b/cave/com.raytheon.viz.warnings/localization/bundles/MarineWarning.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/MarineWarning.xml rename to cave/com.raytheon.viz.warnings/localization/bundles/MarineWarning.xml diff --git a/cave/build/static/common/cave/etc/bundles/RegionalCWAWarnings.xml b/cave/com.raytheon.viz.warnings/localization/bundles/RegionalCWAWarnings.xml similarity index 100% rename from cave/build/static/common/cave/etc/bundles/RegionalCWAWarnings.xml rename to cave/com.raytheon.viz.warnings/localization/bundles/RegionalCWAWarnings.xml diff --git a/ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/plotModels/S2N.java b/ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/plotModels/S2N.java index 56ec64be42..96e15eef85 100644 --- a/ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/plotModels/S2N.java +++ b/ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/plotModels/S2N.java @@ -12,8 +12,6 @@ import java.util.HashMap; public class S2N { - private static final String plotmodelDir = "plotModels"; - private final String filename; private final HashMap lookup; @@ -54,9 +52,10 @@ public class S2N { public static S2N readS2NFile(String s2nFilename) { BufferedReader input = null; S2N lookup = new S2N(s2nFilename); - + File s2nFile = NcPathManager.getInstance().getStaticFile( - NcPathConstants.PLOT_PARAMETERS_DIR+File.separator + s2nFilename); + NcPathConstants.PLOT_PARAMETERS_DIR + File.separator + + s2nFilename); int counter = 0; int highestValue = -1;