Commit graph

294 commits

Author SHA1 Message Date
mjames-upc
0b01029e68 cleaning up unidata_15.1.1 enough to launch in eclipse 2015-12-29 20:15:31 -07:00
AWIPS User
3986948487 MRMS submenu moved to radar menu; gfe viz plugins turned off; product browser added to d2d toolbar
Former-commit-id: 455a42ec86
2015-10-23 13:05:00 -06:00
AWIPS User
1c682e0af1 sat and radar menu organization
Former-commit-id: affd4212ed [formerly 698c0b5166] [formerly 8f8b9dd16ea8ae10522f0f5092dcc20a9676444f [formerly 0943c3edd5]]
Former-commit-id: fe06833d7f0b88c2fd77bec7b274dfbdaa6ab9cd [formerly 4c91c17326]
Former-commit-id: d3b35a2e3a
2015-07-22 10:31:01 -06:00
mjames-upc
5fbb381419 FNEXRAD menu config changes, labeling rule and colormap updates.
Former-commit-id: ac7ae413d6 [formerly ca188dd577] [formerly 6b86850d998657483ef8cce38bfa4163e72fa6c7 [formerly a5e9391e16]]
Former-commit-id: 51a6be2ce13b111b12a8ec1d4c6007df11276969 [formerly 749eef0c44]
Former-commit-id: d4eacc8497
2015-06-25 14:41:12 -06:00
AWIPS User
933f773bd3 FNEXRAD colormap updates and sat plugin style rule additions for labeling and scaling.
Former-commit-id: f2686ee818 [formerly 12671eeb72] [formerly 8649b7addd8eb1a89c378e6c9f62d6d27140ae0b [formerly 4fe8043de6]]
Former-commit-id: d4fda9d5ab85f0cba5a47539b0329c106488d457 [formerly 941abfbb43]
Former-commit-id: 698a833291
2015-06-24 20:31:12 -06:00
AWIPS User
025140281f begin 2-panel
Former-commit-id: 8ca2df2d9a [formerly fe5d6b1a65] [formerly 6c8438aafb6c192434d78d7bdab4e2dcdc7f773b [formerly 801bc8f96e]]
Former-commit-id: 100d3b6d9f954a34bacc0a60e25e617b8ea47550 [formerly 6370b56276]
Former-commit-id: 008922e706
2015-05-09 00:38:51 -05:00
AWIPS User
c02444fc90 if all radar stations are localized then no radar stations are localized pt 2
Former-commit-id: 67dbd65694 [formerly f5d6e70fc1] [formerly 5a1d329f0fb5dcb06db5f4d178298a1be09a3c39 [formerly cac9357045]]
Former-commit-id: 13487885209935c8e800a7c10c4e6076d6c2f6fc [formerly aceefa8715]
Former-commit-id: 651fe231bb
2015-04-22 17:17:32 -06:00
AWIPS User
26978b0d35 File menu reorg + radar menu fix + renaming in bundle delete
Former-commit-id: 07c918b72e [formerly 16520fd68f] [formerly 4286609de3875bd8c298549695db8c2cbfa64f5f [formerly ff5add010b]]
Former-commit-id: fc5f790c5cd280828b3f43a841b8422a5186ec56 [formerly 1c75b81943]
Former-commit-id: 89cf3a574d
2015-04-22 15:02:34 -06:00
mjames-upc
d33cf5cbc8 Merge branch upc_14.4.1 into master_14.4.1
Former-commit-id: a2e6b5e6ed [formerly f71c396cef] [formerly 8624f9707276ae6bc8c638a057eaf9e7e1d2716a [formerly 2288995260]]
Former-commit-id: 7a2ac36eca3df270f4afc658f6f3530848347ee4 [formerly cd4cb8eb1d]
Former-commit-id: 93b22eeb17
2015-04-22 15:11:19 -06:00
AWIPS User
fc206a7919 d2d radar menus
Former-commit-id: 80f9b83794 [formerly b62741733e] [formerly 0a260fd1822c766049733a4a8d4d37ac8654953c [formerly 0a0496f549]]
Former-commit-id: 97fd20431ed8f85a101a68c85b7fab6402f32915 [formerly 93bc0e3be6]
Former-commit-id: 50d3bb6627
2015-04-18 22:11:14 -06:00
AWIPS User
5f6a72ac75 tdwr menu initial add
Former-commit-id: 2fe128be79 [formerly f6474a0a1b] [formerly e3d3ff7ca83160c94a7300603e89df350555ae1f [formerly fb63ce429c]]
Former-commit-id: 297f91df1b2129708c28a1dcd4c502ac60b6a51e [formerly ded7ca2c0f]
Former-commit-id: ac16f7fd47
2015-04-18 22:10:52 -06:00
mjames-upc
ba80d4303b modified code CAVE - merge remotes/origin/ncep_14.4.1 to upc development
Former-commit-id: e104fc35e2
2015-01-12 14:07:28 -07:00
mjames-upc
886cd5940f Additions and deletions - merge remotes/origin/ncep_14.4.1 to upc development
Former-commit-id: 7eacf4dc1c
2015-01-12 14:02:58 -07:00
Zihou Wang
e9c3965738 VLab Issue #5020 - DCS_16776 Ingest and display MBA; fixes #5020
Change-Id: I5206e4efa240924caf07c4499bfb3b4cdf5aee5d

Former-commit-id: 3ea0e0d218 [formerly 8d24be996a] [formerly 4fe74892ea] [formerly 3ea0e0d218 [formerly 8d24be996a] [formerly 4fe74892ea] [formerly 5c86a177b7 [formerly 4fe74892ea [formerly e5e15da2f57e336d8f23444ab0932b710ad2c033]]]]
Former-commit-id: 5c86a177b7
Former-commit-id: c754ac5448 [formerly 30be251dc9] [formerly 973f3734dffa4498dfb2ae9312c2b68cc51c9bcd [formerly d4ca49f01d]]
Former-commit-id: e3714090e20a831caf11746053ae333eb208870b [formerly a47f4908e7]
Former-commit-id: de979397f4
2014-11-21 15:42:48 +00:00
Zihou Wang
4fe74892ea VLab Issue #5020 - DCS_16776 Ingest and display MBA; fixes #5020
Change-Id: I5206e4efa240924caf07c4499bfb3b4cdf5aee5d

Former-commit-id: e5e15da2f57e336d8f23444ab0932b710ad2c033
2014-11-21 15:42:48 +00:00
Ana Rivera
ad4a87da6e Merge branch 'omaha_14.4.1' into field_14.4.1
Former-commit-id: 147ea30ebb [formerly 69832d1fe3] [formerly 999c66b3e4] [formerly 147ea30ebb [formerly 69832d1fe3] [formerly 999c66b3e4] [formerly 86648e0a20 [formerly 999c66b3e4 [formerly 875c825320bdfb0e051b6d0ad2e530f7a7a16d19]]]]
Former-commit-id: 86648e0a20
Former-commit-id: 6c35db8d4d [formerly aa06e38595] [formerly 82e20f8fa6aa3851192c68860e5e7f1c90601c75 [formerly 0a2ecb9beb]]
Former-commit-id: 12a6d9a20deebb092f64f070247578918326d56d [formerly 8770ba8303]
Former-commit-id: fc74bce6b8
2014-10-22 12:58:09 +00:00
Ana Rivera
999c66b3e4 Merge branch 'omaha_14.4.1' into field_14.4.1
Former-commit-id: 875c825320bdfb0e051b6d0ad2e530f7a7a16d19
2014-10-22 12:58:09 +00:00
David Lovely
bad100f9df Omaha #3418 Fixed NPE for cell trends. Fixed possible NPE in PointsDataManager catch block.
Change-Id: Ice45220f2798e4004d41fa8fe78ccad8b5737f0d

Former-commit-id: 7b66037194 [formerly f83eb3e69b] [formerly d7cd4cc845] [formerly 7b66037194 [formerly f83eb3e69b] [formerly d7cd4cc845] [formerly 2e7cade8d6 [formerly d7cd4cc845 [formerly 68d3cede303b82dd3fde23255d830289f967a889]]]]
Former-commit-id: 2e7cade8d6
Former-commit-id: 4044f76e3c [formerly 1eac8ddbe8] [formerly 01bc0440f5e4d8f0aaf9707d9b22d8b27b08328c [formerly 9e1b263569]]
Former-commit-id: cd51c7b044b380ed845833050ac954706860e142 [formerly a9b97bbd58]
Former-commit-id: 8487137803
2014-10-20 14:42:39 -05:00
David Lovely
d7cd4cc845 Omaha #3418 Fixed NPE for cell trends. Fixed possible NPE in PointsDataManager catch block.
Change-Id: Ice45220f2798e4004d41fa8fe78ccad8b5737f0d

Former-commit-id: 68d3cede303b82dd3fde23255d830289f967a889
2014-10-20 14:42:39 -05:00
Ana Rivera
7f6d4599e9 Merge branch 'omaha_14.4.1' into field_14.4.1
Former-commit-id: 056592daa1 [formerly 9c54ea5b56] [formerly 5894102a1b] [formerly 056592daa1 [formerly 9c54ea5b56] [formerly 5894102a1b] [formerly ec6502df64 [formerly 5894102a1b [formerly 972e3d5117a3df147eaa83429f3649b1c1fb7a3f]]]]
Former-commit-id: ec6502df64
Former-commit-id: 916f0bbe49 [formerly 71fbcb1537] [formerly b54f72b4007bdc1417b21cfad790d8cdfa05ef2a [formerly e1a4a48258]]
Former-commit-id: 7ce6d020324fb4838133cfb05fe3af33466efd1b [formerly 73f7caea8b]
Former-commit-id: ab39d4d2a5
2014-10-17 17:42:56 +00:00
Ana Rivera
5894102a1b Merge branch 'omaha_14.4.1' into field_14.4.1
Former-commit-id: 972e3d5117a3df147eaa83429f3649b1c1fb7a3f
2014-10-17 17:42:56 +00:00
Steve Harris
118c19a83d Merge tag 'OB_14.3.1-25m' into omaha_14.4.1
Conflicts:
	cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/ui/actions/FogAreaConfigAction.java
	cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/ui/dialogs/FogMonitoringAreaConfigDlg.java
	cave/com.raytheon.uf.viz.monitor.safeseas/src/com/raytheon/uf/viz/monitor/safeseas/ui/actions/SafeseasAreaConfigAction.java
	cave/com.raytheon.uf.viz.monitor.safeseas/src/com/raytheon/uf/viz/monitor/safeseas/ui/dialogs/SSMonitoringAreaConfigDlg.java
	cave/com.raytheon.uf.viz.monitor.snow/src/com/raytheon/uf/viz/monitor/snow/ui/actions/SnowAreaConfigAction.java
	cave/com.raytheon.uf.viz.monitor.snow/src/com/raytheon/uf/viz/monitor/snow/ui/dialogs/SnowMonitoringAreaConfigDlg.java
	cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/MonitoringAreaConfigDlg.java
	cave/com.raytheon.viz.core/src/com/raytheon/viz/core/rsc/AbstractSpatialEnabler.java
	cave/com.raytheon.viz.core/src/com/raytheon/viz/core/rsc/BestResResourceData.java
	edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/config/FogMonitorConfigurationManager.java
	edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/config/MonitorConfigurationManager.java
	edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/config/SSMonitorConfigurationManager.java
	edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/config/SnowMonitorConfigurationManager.java

Former-commit-id: c0c1ce7700 [formerly 39b2199cec] [formerly ad4393bea3] [formerly c0c1ce7700 [formerly 39b2199cec] [formerly ad4393bea3] [formerly c9e37bf440 [formerly ad4393bea3 [formerly 6bb7a7312a22a9585d2f5981d873751879082cb1]]]]
Former-commit-id: c9e37bf440
Former-commit-id: e80527ade2 [formerly fc424d7336] [formerly 669e99e1efdfc40962f1589446fe9efe4b3f8b52 [formerly fc35b7313d]]
Former-commit-id: 292297ad70be43ccc935b96eca7a8409d4033fc4 [formerly f370a2f54e]
Former-commit-id: 7c4bb336e1
2014-10-07 13:35:58 -05:00
Steve Harris
ad4393bea3 Merge tag 'OB_14.3.1-25m' into omaha_14.4.1
Conflicts:
	cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/ui/actions/FogAreaConfigAction.java
	cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/ui/dialogs/FogMonitoringAreaConfigDlg.java
	cave/com.raytheon.uf.viz.monitor.safeseas/src/com/raytheon/uf/viz/monitor/safeseas/ui/actions/SafeseasAreaConfigAction.java
	cave/com.raytheon.uf.viz.monitor.safeseas/src/com/raytheon/uf/viz/monitor/safeseas/ui/dialogs/SSMonitoringAreaConfigDlg.java
	cave/com.raytheon.uf.viz.monitor.snow/src/com/raytheon/uf/viz/monitor/snow/ui/actions/SnowAreaConfigAction.java
	cave/com.raytheon.uf.viz.monitor.snow/src/com/raytheon/uf/viz/monitor/snow/ui/dialogs/SnowMonitoringAreaConfigDlg.java
	cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/MonitoringAreaConfigDlg.java
	cave/com.raytheon.viz.core/src/com/raytheon/viz/core/rsc/AbstractSpatialEnabler.java
	cave/com.raytheon.viz.core/src/com/raytheon/viz/core/rsc/BestResResourceData.java
	edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/config/FogMonitorConfigurationManager.java
	edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/config/MonitorConfigurationManager.java
	edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/config/SSMonitorConfigurationManager.java
	edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/config/SnowMonitorConfigurationManager.java

Former-commit-id: 6bb7a7312a22a9585d2f5981d873751879082cb1
2014-10-07 13:35:58 -05:00
Ana Rivera
094d18d1ac Merge branch 'omaha_14.4.1' into field_14.4.1
Change-Id: I04cb8478a05b157e4acfc5f9ef02a9fd9186fe22

Former-commit-id: a96df6d6ad [formerly 0c11f99805] [formerly 796380dd53] [formerly a96df6d6ad [formerly 0c11f99805] [formerly 796380dd53] [formerly adfeb13067 [formerly 796380dd53 [formerly 56dc338129ed46612df4db1926e0b7e91551b60d]]]]
Former-commit-id: adfeb13067
Former-commit-id: 0371accc47 [formerly 60f9feed3e] [formerly f6e448879003172c3aafecc16e87e7783e176970 [formerly 12c854e7cc]]
Former-commit-id: f350b0f60c1e207b1fc2e10edfcd604fb4c9e1cb [formerly baf0eb6291]
Former-commit-id: cb21a22731
2014-09-30 19:59:19 +00:00
Ana Rivera
796380dd53 Merge branch 'omaha_14.4.1' into field_14.4.1
Change-Id: I04cb8478a05b157e4acfc5f9ef02a9fd9186fe22

Former-commit-id: 56dc338129ed46612df4db1926e0b7e91551b60d
2014-09-30 19:59:19 +00:00
Ben Steffensmeier
51d14fe247 Issue #3669 Ensure best res does not parse alert messages.
Former-commit-id: ed401f7250 [formerly b333960362] [formerly c573db2918] [formerly ed401f7250 [formerly b333960362] [formerly c573db2918] [formerly 95b096192b [formerly c573db2918 [formerly e93157375f90c6cc2038db9a78346592e4d46b0e]]]]
Former-commit-id: 95b096192b
Former-commit-id: 33ac3fa012 [formerly 923ead3167] [formerly b5b30fb554ce5a1662f9e0a71423cb921b5a5de4 [formerly 3c55b8166c]]
Former-commit-id: 44ec49710bc32dea4a3a15c9fafa5ec79198f50b [formerly dc7966cdec]
Former-commit-id: 41b2311008
2014-09-29 11:20:33 -05:00
Ben Steffensmeier
c573db2918 Issue #3669 Ensure best res does not parse alert messages.
Former-commit-id: e93157375f90c6cc2038db9a78346592e4d46b0e
2014-09-29 11:20:33 -05:00
Steve Harris
07c7b38a12 Merge tag 'OB_14.3.1-19m' into omaha_14.4.1
Conflicts:
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/ext/imaging/GLColormappedImageExtension.java
	cave/com.raytheon.viz.satellite/src/com/raytheon/viz/satellite/rsc/SatResource.java
	cave/com.raytheon.viz.volumebrowser/localization/menus/xml/planesMenusPlanView.xml
	edexOsgi/com.raytheon.edex.plugin.satellite/src/com/raytheon/edex/util/satellite/SatSpatialFactory.java
	edexOsgi/com.raytheon.uf.common.colormap/src/com/raytheon/uf/common/colormap/prefs/DataMappingPreferences.java
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/mmp.xml
	nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.pproc.so
	nativeLib/files.native/edex/lib/native/linux32/library.ohd.pproc.so
	ohd/gov.noaa.nws.ohd.edex.plugin.hydrodualpol/src/gov/noaa/nws/ohd/edex/plugin/hydrodualpol/DSAProductProcessor.java

Former-commit-id: db4aa1cebe [formerly 2e2072a963] [formerly 7692e3f21d] [formerly db4aa1cebe [formerly 2e2072a963] [formerly 7692e3f21d] [formerly b979960b7b [formerly 7692e3f21d [formerly 72f387d2802c12eedfe5643616fe5a54420aef66]]]]
Former-commit-id: b979960b7b
Former-commit-id: 4c7af33eee [formerly e5f8a8f74f] [formerly bb2bf4306deda494aadd9b7efdffeebf393b4e15 [formerly 50d6dccd09]]
Former-commit-id: 0542ccaca6c476485c13ff1fd290c8c34213e7a0 [formerly f831536854]
Former-commit-id: d3169a96b0
2014-09-23 11:41:10 -05:00
Steve Harris
7692e3f21d Merge tag 'OB_14.3.1-19m' into omaha_14.4.1
Conflicts:
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/ext/imaging/GLColormappedImageExtension.java
	cave/com.raytheon.viz.satellite/src/com/raytheon/viz/satellite/rsc/SatResource.java
	cave/com.raytheon.viz.volumebrowser/localization/menus/xml/planesMenusPlanView.xml
	edexOsgi/com.raytheon.edex.plugin.satellite/src/com/raytheon/edex/util/satellite/SatSpatialFactory.java
	edexOsgi/com.raytheon.uf.common.colormap/src/com/raytheon/uf/common/colormap/prefs/DataMappingPreferences.java
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/mmp.xml
	nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.pproc.so
	nativeLib/files.native/edex/lib/native/linux32/library.ohd.pproc.so
	ohd/gov.noaa.nws.ohd.edex.plugin.hydrodualpol/src/gov/noaa/nws/ohd/edex/plugin/hydrodualpol/DSAProductProcessor.java

Former-commit-id: 72f387d2802c12eedfe5643616fe5a54420aef66
2014-09-23 11:41:10 -05:00
Ben Steffensmeier
4da44448cf Omaha #3300 Fix component and mosaic merge problems
Former-commit-id: 6d8b9df40b [formerly 766fdd80a8] [formerly 72f5799c44] [formerly 6d8b9df40b [formerly 766fdd80a8] [formerly 72f5799c44] [formerly 217caaba15 [formerly 72f5799c44 [formerly 201854ac4154dc8526bf99bde69674ad51ec50ad]]]]
Former-commit-id: 217caaba15
Former-commit-id: b62ee08912 [formerly 66eae6f360] [formerly ec74e812030fb60e345e49ac2a36b44449679873 [formerly c02072c2e2]]
Former-commit-id: 08bdb8041735914d320d51b3c5c4fa03ae2647bd [formerly f4fef04e89]
Former-commit-id: 4e6c331288
2014-09-19 15:08:21 -05:00
Ben Steffensmeier
72f5799c44 Omaha #3300 Fix component and mosaic merge problems
Former-commit-id: 201854ac4154dc8526bf99bde69674ad51ec50ad
2014-09-19 15:08:21 -05:00
Steve Harris
b316e73f24 Merge branch 'omaha_14.3.1' into omaha_14.4.1
Conflicts:
	cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/ArchiveRetentionDlg.java
	cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/Cities.xml
	cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/FAA/Airports.xml
	cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/FAA/Fix.xml
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/reflect/BundleReflections.java
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/reflect/SubClassLocator.java
	cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/ui/dialogs/FogMonitoringAreaConfigDlg.java
	cave/com.raytheon.uf.viz.monitor.safeseas/src/com/raytheon/uf/viz/monitor/safeseas/ui/dialogs/SSMonitoringAreaConfigDlg.java
	cave/com.raytheon.uf.viz.monitor.snow/src/com/raytheon/uf/viz/monitor/snow/ui/dialogs/SnowMonitoringAreaConfigDlg.java
	cave/com.raytheon.uf.viz.ui.menus/src/com/raytheon/uf/viz/ui/menus/widgets/tearoff/MenuItemComposite.java
	cave/com.raytheon.uf.viz.ui.menus/src/com/raytheon/uf/viz/ui/menus/widgets/tearoff/TearOffMenuDialog.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/ext/imaging/GLDataMappingFactory.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/DataManager.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/ParmManager.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/textformatter/CombinationsFileUtil.java
	cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/graphic/RadarGraphicsPage.java
	cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/mosaic/RadarMosaicResource.java
	cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/ui/xy/RadarGSMResource.java
	cave/com.raytheon.viz.ui.personalities.awips/src/com/raytheon/viz/ui/personalities/awips/AbstractCAVEComponent.java
	cave/com.raytheon.viz.ui/META-INF/MANIFEST.MF
	cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/colormap/ColorMapTree.java
	cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/dialogs/ColormapComp.java
	cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/dialogs/ImagingDialog.java
	cave/com.raytheon.viz.volumebrowser/localization/menus/xml/fieldsMenus.xml
	cave/com.raytheon.viz.volumebrowser/localization/menus/xml/planesMenusPlanView.xml
	cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
	edexOsgi/com.raytheon.uf.common.datadelivery.registry/src/com/raytheon/uf/common/datadelivery/registry/web/IRegistryFederationManager.java
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TP.xml
	edexOsgi/com.raytheon.uf.common.localization/src/com/raytheon/uf/common/localization/IPathManager.java
	edexOsgi/com.raytheon.uf.common.localization/src/com/raytheon/uf/common/localization/PathManager.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.registry/src/com/raytheon/uf/edex/datadelivery/registry/dao/ReplicationEventDao.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.registry/src/com/raytheon/uf/edex/datadelivery/registry/federation/RegistryFederationManager.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/src/com/raytheon/uf/edex/datadelivery/retrieval/util/WfsConnectionUtil.java

Former-commit-id: e3a7796362 [formerly da530db540] [formerly 091555cf10] [formerly e3a7796362 [formerly da530db540] [formerly 091555cf10] [formerly 4c56844e29 [formerly 091555cf10 [formerly 69c52fb4a22997d0a0f9c620bd20f00b8c5fd4ce]]]]
Former-commit-id: 4c56844e29
Former-commit-id: a1bf8ecdb1 [formerly 84a98ec4ca] [formerly 275a024694cc566f868a949d844ab91490e424f6 [formerly 214b48dcb8]]
Former-commit-id: 9adb015794435a13e656ce09cd891bfd9e4d53db [formerly fdc523a026]
Former-commit-id: f4ea796cea
2014-09-19 10:28:57 -05:00
Steve Harris
091555cf10 Merge branch 'omaha_14.3.1' into omaha_14.4.1
Conflicts:
	cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/ArchiveRetentionDlg.java
	cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/Cities.xml
	cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/FAA/Airports.xml
	cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/FAA/Fix.xml
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/reflect/BundleReflections.java
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/reflect/SubClassLocator.java
	cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/ui/dialogs/FogMonitoringAreaConfigDlg.java
	cave/com.raytheon.uf.viz.monitor.safeseas/src/com/raytheon/uf/viz/monitor/safeseas/ui/dialogs/SSMonitoringAreaConfigDlg.java
	cave/com.raytheon.uf.viz.monitor.snow/src/com/raytheon/uf/viz/monitor/snow/ui/dialogs/SnowMonitoringAreaConfigDlg.java
	cave/com.raytheon.uf.viz.ui.menus/src/com/raytheon/uf/viz/ui/menus/widgets/tearoff/MenuItemComposite.java
	cave/com.raytheon.uf.viz.ui.menus/src/com/raytheon/uf/viz/ui/menus/widgets/tearoff/TearOffMenuDialog.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/ext/imaging/GLDataMappingFactory.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/DataManager.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/ParmManager.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/textformatter/CombinationsFileUtil.java
	cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/graphic/RadarGraphicsPage.java
	cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/mosaic/RadarMosaicResource.java
	cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/ui/xy/RadarGSMResource.java
	cave/com.raytheon.viz.ui.personalities.awips/src/com/raytheon/viz/ui/personalities/awips/AbstractCAVEComponent.java
	cave/com.raytheon.viz.ui/META-INF/MANIFEST.MF
	cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/colormap/ColorMapTree.java
	cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/dialogs/ColormapComp.java
	cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/dialogs/ImagingDialog.java
	cave/com.raytheon.viz.volumebrowser/localization/menus/xml/fieldsMenus.xml
	cave/com.raytheon.viz.volumebrowser/localization/menus/xml/planesMenusPlanView.xml
	cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
	edexOsgi/com.raytheon.uf.common.datadelivery.registry/src/com/raytheon/uf/common/datadelivery/registry/web/IRegistryFederationManager.java
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TP.xml
	edexOsgi/com.raytheon.uf.common.localization/src/com/raytheon/uf/common/localization/IPathManager.java
	edexOsgi/com.raytheon.uf.common.localization/src/com/raytheon/uf/common/localization/PathManager.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.registry/src/com/raytheon/uf/edex/datadelivery/registry/dao/ReplicationEventDao.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.registry/src/com/raytheon/uf/edex/datadelivery/registry/federation/RegistryFederationManager.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/src/com/raytheon/uf/edex/datadelivery/retrieval/util/WfsConnectionUtil.java

Former-commit-id: 69c52fb4a22997d0a0f9c620bd20f00b8c5fd4ce
2014-09-19 10:28:57 -05:00
Brian.Dyke
845a9cb390 Merge branch 'ops_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: 80f677e1e3 [formerly 1c0d6624a3] [formerly e1c88f287a] [formerly 80f677e1e3 [formerly 1c0d6624a3] [formerly e1c88f287a] [formerly 57a361073d [formerly e1c88f287a [formerly 5703d4fbb0fa5e422e3fbd62529928091a2bdb1f]]]]
Former-commit-id: 57a361073d
Former-commit-id: bf6931a113 [formerly 47feda6450] [formerly 56e8b90c211d77cd58bb224d0ec60bd67aba968d [formerly 4476b9d19e]]
Former-commit-id: ef186b2221b07e34cc32e9dc0106aff32d72736c [formerly 7e53a1d558]
Former-commit-id: c95be437eb
2014-09-17 15:50:13 -04:00
Brian.Dyke
e1c88f287a Merge branch 'ops_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: 5703d4fbb0fa5e422e3fbd62529928091a2bdb1f
2014-09-17 15:50:13 -04:00
Steve Harris
db4a42911e Merge branch 'master_14.3.1' (14.3.1-17) into omaha_14.3.1
Former-commit-id: 04006bdb7a [formerly eb0a05ab81] [formerly d5c0049ba2] [formerly 04006bdb7a [formerly eb0a05ab81] [formerly d5c0049ba2] [formerly 57f0a992d9 [formerly d5c0049ba2 [formerly 74d4b836dd8b2eb9a70cf772127d9b7eee23c1bf]]]]
Former-commit-id: 57f0a992d9
Former-commit-id: a53c582a0c [formerly 12f78cfbb7] [formerly ae2f34c34836bd3771f0b0d1706683f11666e489 [formerly e8b733fc93]]
Former-commit-id: 80db01bac579c366b32b4c48f2f8f38121e4a01a [formerly 9d32386e33]
Former-commit-id: ac2e3f00d3
2014-09-15 21:13:56 -05:00
Steve Harris
d5c0049ba2 Merge branch 'master_14.3.1' (14.3.1-17) into omaha_14.3.1
Former-commit-id: 74d4b836dd8b2eb9a70cf772127d9b7eee23c1bf
2014-09-15 21:13:56 -05:00
Ben Steffensmeier
d187ae9c4a Issue #3604 Fix NPE in Imaging Dialog.
Former-commit-id: 189380f33c [formerly 3c4285fea1] [formerly 15f35e6dcc] [formerly 189380f33c [formerly 3c4285fea1] [formerly 15f35e6dcc] [formerly ed7b816989 [formerly 15f35e6dcc [formerly e2043fd8034dde47963a32108b1475ee7db1ea18]]]]
Former-commit-id: ed7b816989
Former-commit-id: 4d10d757b8 [formerly c0072ab394] [formerly bcc4c5e09a938aa597b5af43fced5dfa0d0df1a2 [formerly dca7627c1e]]
Former-commit-id: ad78a84e5fe66a6c6a8219fa20a9457df7bb3918 [formerly 2fdb8409e5]
Former-commit-id: 0fd5d397d3
2014-09-10 14:43:23 -05:00
Ben Steffensmeier
15f35e6dcc Issue #3604 Fix NPE in Imaging Dialog.
Former-commit-id: e2043fd8034dde47963a32108b1475ee7db1ea18
2014-09-10 14:43:23 -05:00
Brian.Dyke
74f3dd287f Merge branch 'master_14.2.4' into master_14.3.1 CM-MERGE:14.2.4-6-7-8 into 14.3.1
Conflicts:
	cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/ArchiveRetentionDlg.java
	cave/com.raytheon.uf.viz.ui.menus/src/com/raytheon/uf/viz/ui/menus/widgets/tearoff/MenuItemComposite.java

Former-commit-id: d8271549ff [formerly fe85eb9f70] [formerly 3d9a3de6e4] [formerly d8271549ff [formerly fe85eb9f70] [formerly 3d9a3de6e4] [formerly 01dfe503f5 [formerly 3d9a3de6e4 [formerly a3365943e7b7972a5c86f8cb1ad39667ab9e0695]]]]
Former-commit-id: 01dfe503f5
Former-commit-id: 3319853886 [formerly 29364e2b9f] [formerly 3c59646613e08582e0a259ecdec538060ca047c5 [formerly c42733eb39]]
Former-commit-id: 582e8cd843a57e8f4ac7a6572a5b3e23cd3b4f25 [formerly a31d3d702e]
Former-commit-id: 0f9fe8301a
2014-09-09 11:44:30 -04:00
Brian.Dyke
3d9a3de6e4 Merge branch 'master_14.2.4' into master_14.3.1 CM-MERGE:14.2.4-6-7-8 into 14.3.1
Conflicts:
	cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/ArchiveRetentionDlg.java
	cave/com.raytheon.uf.viz.ui.menus/src/com/raytheon/uf/viz/ui/menus/widgets/tearoff/MenuItemComposite.java

Former-commit-id: a3365943e7b7972a5c86f8cb1ad39667ab9e0695
2014-09-09 11:44:30 -04:00
Brian.Dyke
a6019667cc Merge branch 'master_14.2.3' into master_14.2.4
Former-commit-id: 4b84db346d [formerly 4220590613] [formerly 9e1ee22146] [formerly 4b84db346d [formerly 4220590613] [formerly 9e1ee22146] [formerly 702dd65aa7 [formerly 9e1ee22146 [formerly 876c6fc4db3901fdcd8dd9a6fb343d2f65254569]]]]
Former-commit-id: 702dd65aa7
Former-commit-id: 04ec788c46 [formerly 901ed0dca8] [formerly 8d7d10230b30c894cb57741468e90fccc83202bb [formerly ebf9ad1299]]
Former-commit-id: 234e9640a89e67374198a73344fce2d5694831c8 [formerly c868172449]
Former-commit-id: 9f0254ee22
2014-09-05 11:13:12 -04:00
Brian.Dyke
9e1ee22146 Merge branch 'master_14.2.3' into master_14.2.4
Former-commit-id: 876c6fc4db3901fdcd8dd9a6fb343d2f65254569
2014-09-05 11:13:12 -04:00
Nate Jensen
2587255db1 Issue #3574 Properly dispose radar graphics graphics objects.
Change-Id: Ica8c630325bada6fd508eeb6b1b4d881a5169320

Former-commit-id: 8cad8cb257 [formerly a1bccdc57f] [formerly 2cfbfc1dc4] [formerly 8cad8cb257 [formerly a1bccdc57f] [formerly 2cfbfc1dc4] [formerly 87d507313b [formerly 2cfbfc1dc4 [formerly 78172a4ac0b9ece26cdc07da3a8f9a70bbc11782]]]]
Former-commit-id: 87d507313b
Former-commit-id: 62c34f3978 [formerly 6d47c3c987] [formerly 1827159999737e3992f042bc4bf2d5f168d0040c [formerly b1619c055a]]
Former-commit-id: 89ccc177eba1c91fcf03533fc346258ea333dac7 [formerly 0e6c455b42]
Former-commit-id: 680fa77b9d
2014-09-04 10:10:37 -05:00
Nate Jensen
2cfbfc1dc4 Issue #3574 Properly dispose radar graphics graphics objects.
Change-Id: Ica8c630325bada6fd508eeb6b1b4d881a5169320

Former-commit-id: 78172a4ac0b9ece26cdc07da3a8f9a70bbc11782
2014-09-04 10:10:37 -05:00
Zihou Wang
acbfe1c1d5 VLab Issue #4464 - DR_17214 RADAR: NEXRAD Unit Status display problem due to the GSM change; fixes #4464
Change-Id: I0ca330e385000e04ef21142e75adfc55d4615a89

Former-commit-id: 4d1413888c [formerly dde3ee4904] [formerly 3ffac397db] [formerly 4d1413888c [formerly dde3ee4904] [formerly 3ffac397db] [formerly a2a2a8cdf9 [formerly 3ffac397db [formerly 288dc7c439995a8ab48680832b63f7d6974885b4]]]]
Former-commit-id: a2a2a8cdf9
Former-commit-id: 79a8578e66 [formerly 698321896d] [formerly f2f1588b1c6b769b07f0455787bd95832d5a280f [formerly 0785965b62]]
Former-commit-id: d1164f57476b696b329fdb6874a8a95d5fbaf063 [formerly a7a47a11ca]
Former-commit-id: 7c6cf0642f
2014-08-21 12:04:30 +00:00
Zihou Wang
3ffac397db VLab Issue #4464 - DR_17214 RADAR: NEXRAD Unit Status display problem due to the GSM change; fixes #4464
Change-Id: I0ca330e385000e04ef21142e75adfc55d4615a89

Former-commit-id: 288dc7c439995a8ab48680832b63f7d6974885b4
2014-08-21 12:04:30 +00:00
Zihou Wang
a6e7bd5fae VLab Issue #3990 - DR_17356 Enhancement to Radar Display of SAILS 0.5 degree products; closes #3990
Change-Id: I2af5cb375294163d9c20ac7342ef72ebaa6c51ce

Former-commit-id: d71def2617 [formerly 2fd6278cf3] [formerly e9f78d8f52] [formerly d71def2617 [formerly 2fd6278cf3] [formerly e9f78d8f52] [formerly f54da5f6ae [formerly e9f78d8f52 [formerly f61e935c0372ee19768f2080da1f8fa21fb9aeb1]]]]
Former-commit-id: f54da5f6ae
Former-commit-id: d88eba846f [formerly cac176920d] [formerly 8e188c48a6b64c228ad8f7ee3d55a6814a9e87a5 [formerly 065f2d9996]]
Former-commit-id: 27642fe140d1a84db5df0745cc1a89b25dfda084 [formerly 11e5523112]
Former-commit-id: e222fa4eda
2014-08-15 11:04:39 -05:00
Zihou Wang
e9f78d8f52 VLab Issue #3990 - DR_17356 Enhancement to Radar Display of SAILS 0.5 degree products; closes #3990
Change-Id: I2af5cb375294163d9c20ac7342ef72ebaa6c51ce

Former-commit-id: f61e935c0372ee19768f2080da1f8fa21fb9aeb1
2014-08-15 11:04:39 -05:00
Mark Peters
46a7c253cf Omaha #3523 Replace Raytheon usage of IGraphicsTarget.TextStyle.NORMAL and directly assigning the text style
Change-Id: Idcc31d11251df8de949bd1bd9bf8c402a5d47f4f

Former-commit-id: 3b4f4394be [formerly f6799659ea] [formerly 308ada356b] [formerly 3b4f4394be [formerly f6799659ea] [formerly 308ada356b] [formerly 4011a4392c [formerly 308ada356b [formerly e409b578fcb15caadf28da57d2cb1860e1ea246c]]]]
Former-commit-id: 4011a4392c
Former-commit-id: d44f96faf7 [formerly c36257683c] [formerly 36239d6a2b4b192a959b7634eec27016d32ed009 [formerly 03229efe86]]
Former-commit-id: 7bf2fb8b62683087abeeff26f6dac51b1f68e787 [formerly b7209bee6e]
Former-commit-id: d63684feaa
2014-08-14 15:43:17 -05:00