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

Merge branch 'omaha_13.3.1' into development

Browse source 
Conflicts:
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ZoneCombinerComp.java
	edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java

Former-commit-id: 67b25fa95817acafd25818c825656236597b6e09
This commit is contained in:
Steve Harris 2013-03-20 16:09:26 -05:00
commit 0379be06d2
433 changed files with 5590 additions and 3674 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

0
edexOsgi/build.edex/esb/data/utility/common_static/base/colormaps/GFE/BV_Change1.cmap → cave/build/static/common/cave/etc/colormaps/GFE/BV_Change1.cmap
View file

0
edexOsgi/build.edex/esb/data/utility/common_static/base/colormaps/GFE/BV_Change2.cmap → cave/build/static/common/cave/etc/colormaps/GFE/BV_Change2.cmap
View file

0
edexOsgi/build.edex/esb/data/utility/common_static/base/colormaps/GFE/Cloud.cmap → cave/build/static/common/cave/etc/colormaps/GFE/Cloud.cmap
View file

0
edexOsgi/build.edex/esb/data/utility/common_static/base/colormaps/GFE/DEFAULT.cmap → cave/build/static/common/cave/etc/colormaps/GFE/DEFAULT.cmap
View file

0
edexOsgi/build.edex/esb/data/utility/common_static/base/colormaps/GFE/Discrepancy.cmap → cave/build/static/common/cave/etc/colormaps/GFE/Discrepancy.cmap
View file

0
edexOsgi/build.edex/esb/data/utility/common_static/base/colormaps/GFE/Gridded Data.cmap → cave/build/static/common/cave/etc/colormaps/GFE/Gridded Data.cmap
View file

0
edexOsgi/build.edex/esb/data/utility/common_static/base/colormaps/GFE/Hazards.cmap → cave/build/static/common/cave/etc/colormaps/GFE/Hazards.cmap
View file

0
edexOsgi/build.edex/esb/data/utility/common_static/base/colormaps/GFE/Hi Range Enhanced.cmap → cave/build/static/common/cave/etc/colormaps/GFE/Hi Range Enhanced.cmap
View file

0
edexOsgi/build.edex/esb/data/utility/common_static/base/colormaps/GFE/Linear.cmap → cave/build/static/common/cave/etc/colormaps/GFE/Linear.cmap
View file

0
edexOsgi/build.edex/esb/data/utility/common_static/base/colormaps/GFE/Low Range Enhanced.cmap → cave/build/static/common/cave/etc/colormaps/GFE/Low Range Enhanced.cmap
View file

0
edexOsgi/build.edex/esb/data/utility/common_static/base/colormaps/GFE/Mid Range Enhanced.cmap → cave/build/static/common/cave/etc/colormaps/GFE/Mid Range Enhanced.cmap
View file

0
edexOsgi/build.edex/esb/data/utility/common_static/base/colormaps/GFE/NHC.cmap → cave/build/static/common/cave/etc/colormaps/GFE/NHC.cmap
View file

0
edexOsgi/build.edex/esb/data/utility/common_static/base/colormaps/GFE/Prob Precip.cmap → cave/build/static/common/cave/etc/colormaps/GFE/Prob Precip.cmap
View file

0
edexOsgi/build.edex/esb/data/utility/common_static/base/colormaps/GFE/QPF.cmap → cave/build/static/common/cave/etc/colormaps/GFE/QPF.cmap
View file

0
edexOsgi/build.edex/esb/data/utility/common_static/base/colormaps/GFE/SLCWV.cmap → cave/build/static/common/cave/etc/colormaps/GFE/SLCWV.cmap
View file

0
edexOsgi/build.edex/esb/data/utility/common_static/base/colormaps/GFE/Sat_DKCloud_CATop_CAHeight.cmap → cave/build/static/common/cave/etc/colormaps/GFE/Sat_DKCloud_CATop_CAHeight.cmap
View file

0
edexOsgi/build.edex/esb/data/utility/common_static/base/colormaps/GFE/Sat_DKIR_DKCIRA_CA_CIIR_CADefault_CJ.cmap → cave/build/static/common/cave/etc/colormaps/GFE/Sat_DKIR_DKCIRA_CA_CIIR_CADefault_CJ.cmap
View file

0
edexOsgi/build.edex/esb/data/utility/common_static/base/colormaps/GFE/Sat_DKIR_DKFog.cmap → cave/build/static/common/cave/etc/colormaps/GFE/Sat_DKIR_DKFog.cmap
View file

0
edexOsgi/build.edex/esb/data/utility/common_static/base/colormaps/GFE/Sat_DKIR_DKIR_CPWV.cmap → cave/build/static/common/cave/etc/colormaps/GFE/Sat_DKIR_DKIR_CPWV.cmap
View file

0
edexOsgi/build.edex/esb/data/utility/common_static/base/colormaps/GFE/Sat_DKLifted_CAIndex.cmap → cave/build/static/common/cave/etc/colormaps/GFE/Sat_DKLifted_CAIndex.cmap
View file

0
edexOsgi/build.edex/esb/data/utility/common_static/base/colormaps/GFE/Sat_DKPrecip_CAWater.cmap → cave/build/static/common/cave/etc/colormaps/GFE/Sat_DKPrecip_CAWater.cmap
View file

0
edexOsgi/build.edex/esb/data/utility/common_static/base/colormaps/GFE/Sat_DKSkin_CATemp.cmap → cave/build/static/common/cave/etc/colormaps/GFE/Sat_DKSkin_CATemp.cmap
View file

0
edexOsgi/build.edex/esb/data/utility/common_static/base/colormaps/GFE/Sat_DKVIS_DKCA_CA_CILow_CALight_CAVis_CJ.cmap → cave/build/static/common/cave/etc/colormaps/GFE/Sat_DKVIS_DKCA_CA_CILow_CALight_CAVis_CJ.cmap
View file

0
edexOsgi/build.edex/esb/data/utility/common_static/base/colormaps/GFE/Sat_DKVIS_DKLinear.cmap → cave/build/static/common/cave/etc/colormaps/GFE/Sat_DKVIS_DKLinear.cmap
View file

0
edexOsgi/build.edex/esb/data/utility/common_static/base/colormaps/GFE/Sat_DKVIS_DKZA_CA_CIVis_CADefault_CJ.cmap → cave/build/static/common/cave/etc/colormaps/GFE/Sat_DKVIS_DKZA_CA_CIVis_CADefault_CJ.cmap
View file

0
edexOsgi/build.edex/esb/data/utility/common_static/base/colormaps/GFE/Sat_DKWV_DKGray_CAScale_CAWater_CAVapor.cmap → cave/build/static/common/cave/etc/colormaps/GFE/Sat_DKWV_DKGray_CAScale_CAWater_CAVapor.cmap
View file

0
edexOsgi/build.edex/esb/data/utility/common_static/base/colormaps/GFE/Sat_DKWV_DKNSSL_CAVAS_CA_CIWV_CAAlternate_CJ.cmap → cave/build/static/common/cave/etc/colormaps/GFE/Sat_DKWV_DKNSSL_CAVAS_CA_CIWV_CAAlternate_CJ.cmap
View file

0
edexOsgi/build.edex/esb/data/utility/common_static/base/colormaps/GFE/Sat_DKWV_DKSLC_CAWV.cmap → cave/build/static/common/cave/etc/colormaps/GFE/Sat_DKWV_DKSLC_CAWV.cmap
View file

0
edexOsgi/build.edex/esb/data/utility/common_static/base/colormaps/GFE/Steps.cmap → cave/build/static/common/cave/etc/colormaps/GFE/Steps.cmap
View file

0
edexOsgi/build.edex/esb/data/utility/common_static/base/colormaps/GFE/TempHaz.cmap → cave/build/static/common/cave/etc/colormaps/GFE/TempHaz.cmap
View file

0
edexOsgi/build.edex/esb/data/utility/common_static/base/colormaps/GFE/WCLHazards.cmap → cave/build/static/common/cave/etc/colormaps/GFE/WCLHazards.cmap
View file

0
edexOsgi/build.edex/esb/data/utility/common_static/base/colormaps/GFE/Warm To Cold.cmap → cave/build/static/common/cave/etc/colormaps/GFE/Warm To Cold.cmap
View file

0
edexOsgi/build.edex/esb/data/utility/common_static/base/colormaps/GFE/WarmNoseTemp.cmap → cave/build/static/common/cave/etc/colormaps/GFE/WarmNoseTemp.cmap
View file

0
edexOsgi/build.edex/esb/data/utility/common_static/base/colormaps/GFE/WaterColor.cmap → cave/build/static/common/cave/etc/colormaps/GFE/WaterColor.cmap
View file

0
edexOsgi/build.edex/esb/data/utility/common_static/base/colormaps/GFE/WetBulbTemp.cmap → cave/build/static/common/cave/etc/colormaps/GFE/WetBulbTemp.cmap
View file

0
edexOsgi/build.edex/esb/data/utility/common_static/base/colormaps/GFE/YesNo.cmap → cave/build/static/common/cave/etc/colormaps/GFE/YesNo.cmap
View file

0
edexOsgi/build.edex/esb/data/utility/common_static/base/colormaps/GFE/ndfdMaxMinT.cmap → cave/build/static/common/cave/etc/colormaps/GFE/ndfdMaxMinT.cmap
View file

0
edexOsgi/build.edex/esb/data/utility/common_static/base/colormaps/GFE/ndfdMaxTall.cmap → cave/build/static/common/cave/etc/colormaps/GFE/ndfdMaxTall.cmap
View file

0
edexOsgi/build.edex/esb/data/utility/common_static/base/colormaps/GFE/ndfdMinTall.cmap → cave/build/static/common/cave/etc/colormaps/GFE/ndfdMinTall.cmap
View file

0
edexOsgi/build.edex/esb/data/utility/common_static/base/colormaps/GFE/ndfdPoP12.cmap → cave/build/static/common/cave/etc/colormaps/GFE/ndfdPoP12.cmap
View file

0
edexOsgi/build.edex/esb/data/utility/common_static/base/colormaps/GFE/ndfdPoP12all.cmap → cave/build/static/common/cave/etc/colormaps/GFE/ndfdPoP12all.cmap
View file

0
edexOsgi/build.edex/esb/data/utility/common_static/base/colormaps/Grid/aviation_turbulence_index.cmap → cave/build/static/common/cave/etc/colormaps/Grid/aviation_turbulence_index.cmap
View file

0
edexOsgi/build.edex/esb/data/utility/common_static/base/colormaps/Grid/gridded data.cmap → cave/build/static/common/cave/etc/colormaps/Grid/gridded data.cmap
View file

0
edexOsgi/build.edex/esb/data/utility/common_static/base/colormaps/Grid/hirange enhanced.cmap → cave/build/static/common/cave/etc/colormaps/Grid/hirange enhanced.cmap
View file

0
edexOsgi/build.edex/esb/data/utility/common_static/base/colormaps/Grid/icing_severity.cmap → cave/build/static/common/cave/etc/colormaps/Grid/icing_severity.cmap
View file

0
edexOsgi/build.edex/esb/data/utility/common_static/base/colormaps/Grid/icing_sld.cmap → cave/build/static/common/cave/etc/colormaps/Grid/icing_sld.cmap
View file

0
edexOsgi/build.edex/esb/data/utility/common_static/base/colormaps/Grid/lowrange enhanced.cmap → cave/build/static/common/cave/etc/colormaps/Grid/lowrange enhanced.cmap
View file

0
edexOsgi/build.edex/esb/data/utility/common_static/base/colormaps/Grid/midrange enhanced.cmap → cave/build/static/common/cave/etc/colormaps/Grid/midrange enhanced.cmap
View file

0
edexOsgi/build.edex/esb/data/utility/common_static/base/colormaps/Grid/sat gridded data.cmap → cave/build/static/common/cave/etc/colormaps/Grid/sat gridded data.cmap
View file

0
edexOsgi/build.edex/esb/data/utility/common_static/base/colormaps/Grid/truncated gridded data.cmap → cave/build/static/common/cave/etc/colormaps/Grid/truncated gridded data.cmap
View file

0
edexOsgi/build.edex/esb/data/utility/common_static/base/colormaps/Grid/truncated warm to cold.cmap → cave/build/static/common/cave/etc/colormaps/Grid/truncated warm to cold.cmap
View file

0
edexOsgi/build.edex/esb/data/utility/common_static/base/colormaps/Grid/warm to cold.cmap → cave/build/static/common/cave/etc/colormaps/Grid/warm to cold.cmap
View file

0
edexOsgi/build.edex/esb/data/utility/common_static/base/colormaps/LAMP/CTSTM Best Category.cmap → cave/build/static/common/cave/etc/colormaps/LAMP/CTSTM Best Category.cmap
View file

0
edexOsgi/build.edex/esb/data/utility/common_static/base/colormaps/LAMP/Gridded Data.cmap → cave/build/static/common/cave/etc/colormaps/LAMP/Gridded Data.cmap
View file

0
edexOsgi/build.edex/esb/data/utility/common_static/base/colormaps/LAMP/QPF Best Category.cmap → cave/build/static/common/cave/etc/colormaps/LAMP/QPF Best Category.cmap
View file

0
edexOsgi/build.edex/esb/data/utility/common_static/base/colormaps/MDL/Fog Monitor Levels.cmap → cave/build/static/common/cave/etc/colormaps/MDL/Fog Monitor Levels.cmap
View file

0
edexOsgi/build.edex/esb/data/utility/common_static/base/colormaps/MDL/VIL Density.cmap → cave/build/static/common/cave/etc/colormaps/MDL/VIL Density.cmap
View file

0
edexOsgi/build.edex/esb/data/utility/common_static/base/colormaps/NCWF Convective Grid.cmap → cave/build/static/common/cave/etc/colormaps/NCWF Convective Grid.cmap
View file

0
edexOsgi/build.edex/esb/data/utility/common_static/base/colormaps/Profiler/Wind Modes.cmap → cave/build/static/common/cave/etc/colormaps/Profiler/Wind Modes.cmap
View file

0
edexOsgi/build.edex/esb/data/utility/common_static/base/colormaps/Profiler/Wind Speed.cmap → cave/build/static/common/cave/etc/colormaps/Profiler/Wind Speed.cmap
View file

0
edexOsgi/build.edex/esb/data/utility/common_static/base/colormaps/Radar/8 bit Refl.cmap → cave/build/static/common/cave/etc/colormaps/Radar/8 bit Refl.cmap
View file

0
edexOsgi/build.edex/esb/data/utility/common_static/base/colormaps/Radar/8 bit Vel.cmap → cave/build/static/common/cave/etc/colormaps/Radar/8 bit Vel.cmap
View file

0
edexOsgi/build.edex/esb/data/utility/common_static/base/colormaps/Radar/8 lvl Vel.cmap → cave/build/static/common/cave/etc/colormaps/Radar/8 lvl Vel.cmap
View file

0
edexOsgi/build.edex/esb/data/utility/common_static/base/colormaps/Radar/8-bit STP.cmap → cave/build/static/common/cave/etc/colormaps/Radar/8-bit STP.cmap
View file

0
edexOsgi/build.edex/esb/data/utility/common_static/base/colormaps/Radar/8-bit Vel.cmap → cave/build/static/common/cave/etc/colormaps/Radar/8-bit Vel.cmap
View file

0
edexOsgi/build.edex/esb/data/utility/common_static/base/colormaps/Radar/CWB Z - Reflectivity.cmap → cave/build/static/common/cave/etc/colormaps/Radar/CWB Z - Reflectivity.cmap
View file

0
edexOsgi/build.edex/esb/data/utility/common_static/base/colormaps/Radar/Clutter Filter Control.cmap → cave/build/static/common/cave/etc/colormaps/Radar/Clutter Filter Control.cmap
View file

0
edexOsgi/build.edex/esb/data/utility/common_static/base/colormaps/Radar/Digital VIL.cmap → cave/build/static/common/cave/etc/colormaps/Radar/Digital VIL.cmap
View file

0
edexOsgi/build.edex/esb/data/utility/common_static/base/colormaps/Radar/DualPol/Correlation Coeff.cmap → cave/build/static/common/cave/etc/colormaps/Radar/DualPol/Correlation Coeff.cmap
View file

0
edexOsgi/build.edex/esb/data/utility/common_static/base/colormaps/Radar/DualPol/Differential Refl.cmap → cave/build/static/common/cave/etc/colormaps/Radar/DualPol/Differential Refl.cmap
View file

0
edexOsgi/build.edex/esb/data/utility/common_static/base/colormaps/Radar/DualPol/Hydrometeor Class.cmap → cave/build/static/common/cave/etc/colormaps/Radar/DualPol/Hydrometeor Class.cmap
View file

0
edexOsgi/build.edex/esb/data/utility/common_static/base/colormaps/Radar/DualPol/Precip Accumulation.cmap → cave/build/static/common/cave/etc/colormaps/Radar/DualPol/Precip Accumulation.cmap
View file

0
edexOsgi/build.edex/esb/data/utility/common_static/base/colormaps/Radar/DualPol/Precip Rate.cmap → cave/build/static/common/cave/etc/colormaps/Radar/DualPol/Precip Rate.cmap
View file

0
edexOsgi/build.edex/esb/data/utility/common_static/base/colormaps/Radar/DualPol/Spec Differential Phase.cmap → cave/build/static/common/cave/etc/colormaps/Radar/DualPol/Spec Differential Phase.cmap
View file

0
edexOsgi/build.edex/esb/data/utility/common_static/base/colormaps/Radar/Enhanced Echo Tops.cmap → cave/build/static/common/cave/etc/colormaps/Radar/Enhanced Echo Tops.cmap
View file

0
edexOsgi/build.edex/esb/data/utility/common_static/base/colormaps/Radar/GSD/3 bit Vel.cmap → cave/build/static/common/cave/etc/colormaps/Radar/GSD/3 bit Vel.cmap
View file

0
edexOsgi/build.edex/esb/data/utility/common_static/base/colormaps/Radar/GSD/8 bit Refl.cmap → cave/build/static/common/cave/etc/colormaps/Radar/GSD/8 bit Refl.cmap
View file

0
edexOsgi/build.edex/esb/data/utility/common_static/base/colormaps/Radar/GSD/8 bit Vel.cmap → cave/build/static/common/cave/etc/colormaps/Radar/GSD/8 bit Vel.cmap
View file

0
edexOsgi/build.edex/esb/data/utility/common_static/base/colormaps/Radar/GSD/Layer Max Refl.cmap → cave/build/static/common/cave/etc/colormaps/Radar/GSD/Layer Max Refl.cmap
View file

0
edexOsgi/build.edex/esb/data/utility/common_static/base/colormaps/Radar/GSD/Packed (Z - V) - Reflectivity.cmap → cave/build/static/common/cave/etc/colormaps/Radar/GSD/Packed (Z - V) - Reflectivity.cmap
View file

0
edexOsgi/build.edex/esb/data/utility/common_static/base/colormaps/Radar/GSD/Packed (Z - V) - Velocity.cmap → cave/build/static/common/cave/etc/colormaps/Radar/GSD/Packed (Z - V) - Velocity.cmap
View file

0
edexOsgi/build.edex/esb/data/utility/common_static/base/colormaps/Radar/GSD/Spectrum Width.cmap → cave/build/static/common/cave/etc/colormaps/Radar/GSD/Spectrum Width.cmap
View file

0
edexOsgi/build.edex/esb/data/utility/common_static/base/colormaps/Radar/GSD/Storm Clear Reflectivity.cmap → cave/build/static/common/cave/etc/colormaps/Radar/GSD/Storm Clear Reflectivity.cmap
View file

0
edexOsgi/build.edex/esb/data/utility/common_static/base/colormaps/Radar/Hi-Res Ref (SGF).cmap → cave/build/static/common/cave/etc/colormaps/Radar/Hi-Res Ref (SGF).cmap
View file

0
edexOsgi/build.edex/esb/data/utility/common_static/base/colormaps/Radar/Hi-Res Vel (SGF).cmap → cave/build/static/common/cave/etc/colormaps/Radar/Hi-Res Vel (SGF).cmap
View file

0
edexOsgi/build.edex/esb/data/utility/common_static/base/colormaps/Radar/Layer Max Refl.cmap → cave/build/static/common/cave/etc/colormaps/Radar/Layer Max Refl.cmap
View file

0
edexOsgi/build.edex/esb/data/utility/common_static/base/colormaps/Radar/MDL/0-3Hr Radar-Based Categorical.cmap → cave/build/static/common/cave/etc/colormaps/Radar/MDL/0-3Hr Radar-Based Categorical.cmap
View file

0
edexOsgi/build.edex/esb/data/utility/common_static/base/colormaps/Radar/MDL/0-3Hr Radar-Based Probabilities.cmap → cave/build/static/common/cave/etc/colormaps/Radar/MDL/0-3Hr Radar-Based Probabilities.cmap
View file

0
edexOsgi/build.edex/esb/data/utility/common_static/base/colormaps/Radar/MDL/10 km Radar Coded Message.cmap → cave/build/static/common/cave/etc/colormaps/Radar/MDL/10 km Radar Coded Message.cmap
View file

0
edexOsgi/build.edex/esb/data/utility/common_static/base/colormaps/Radar/OSF/1 → cave/build/static/common/cave/etc/colormaps/Radar/OSF/1, 3 Hr Precip Accumulation.cmap
View file

0
edexOsgi/build.edex/esb/data/utility/common_static/base/colormaps/Radar/OSF/16 Level Composite Reflectivity.cmap → cave/build/static/common/cave/etc/colormaps/Radar/OSF/16 Level Composite Reflectivity.cmap
View file

0
edexOsgi/build.edex/esb/data/utility/common_static/base/colormaps/Radar/OSF/16 Level Reflectivity.cmap → cave/build/static/common/cave/etc/colormaps/Radar/OSF/16 Level Reflectivity.cmap
View file

0
edexOsgi/build.edex/esb/data/utility/common_static/base/colormaps/Radar/OSF/16 Level Velocity.cmap → cave/build/static/common/cave/etc/colormaps/Radar/OSF/16 Level Velocity.cmap
View file

0
edexOsgi/build.edex/esb/data/utility/common_static/base/colormaps/Radar/OSF/256 Level Reflectivity.cmap → cave/build/static/common/cave/etc/colormaps/Radar/OSF/256 Level Reflectivity.cmap
View file

0
edexOsgi/build.edex/esb/data/utility/common_static/base/colormaps/Radar/OSF/256 Level Velocity.cmap → cave/build/static/common/cave/etc/colormaps/Radar/OSF/256 Level Velocity.cmap
View file

0
edexOsgi/build.edex/esb/data/utility/common_static/base/colormaps/Radar/OSF/8 Level Reflectivity.cmap → cave/build/static/common/cave/etc/colormaps/Radar/OSF/8 Level Reflectivity.cmap
View file

0
edexOsgi/build.edex/esb/data/utility/common_static/base/colormaps/Radar/OSF/8 Level Velocity.cmap → cave/build/static/common/cave/etc/colormaps/Radar/OSF/8 Level Velocity.cmap
View file

0
edexOsgi/build.edex/esb/data/utility/common_static/base/colormaps/Radar/OSF/Combined Shear.cmap → cave/build/static/common/cave/etc/colormaps/Radar/OSF/Combined Shear.cmap
View file

0
edexOsgi/build.edex/esb/data/utility/common_static/base/colormaps/Radar/OSF/Digital VIL.cmap → cave/build/static/common/cave/etc/colormaps/Radar/OSF/Digital VIL.cmap
View file

0
edexOsgi/build.edex/esb/data/utility/common_static/base/colormaps/Radar/OSF/Echo Tops.cmap → cave/build/static/common/cave/etc/colormaps/Radar/OSF/Echo Tops.cmap
View file

Some files were not shown because too many files have changed in this diff Show more