Commit graph

18 commits

Author SHA1 Message Date
Ben Steffensmeier
a69ec7c7af Omaha #3132 - merge master_14.3.1 into omaha_14.4.1
Former-commit-id: 6090625040 [formerly f92d021e96] [formerly 6090625040 [formerly f92d021e96] [formerly 5b10ac2f36 [formerly 00d314b6b493bc34ccd77f731307b5039e22d844]]]
Former-commit-id: 5b10ac2f36
Former-commit-id: 0724aa4e71 [formerly 107ccbf332]
Former-commit-id: fc49d0bd55
2014-09-29 10:49:14 -05:00
Steve Harris
f4ea796cea 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: da530db540 [formerly 091555cf10] [formerly da530db540 [formerly 091555cf10] [formerly 4c56844e29 [formerly 69c52fb4a22997d0a0f9c620bd20f00b8c5fd4ce]]]
Former-commit-id: 4c56844e29
Former-commit-id: 84a98ec4ca [formerly 214b48dcb8]
Former-commit-id: fdc523a026
2014-09-19 10:28:57 -05:00
Stephen Gilbert
99796454d2 Merge remote branch 'origin/master_14.3.1' into ncep_14.3.1
Former-commit-id: e7d21b0293 [formerly 5bf2ed644a] [formerly e7d21b0293 [formerly 5bf2ed644a] [formerly 440bddda4b [formerly 2cf0da849d50a31d2ca54efeaf6e0258f33ff1d3]]]
Former-commit-id: 440bddda4b
Former-commit-id: 1ceed41334 [formerly eee81971cc]
Former-commit-id: 3106a4006c
2014-09-15 13:20:34 -04:00
Nate Jensen
7336692b85 Omaha #3356 cleanup of unnecessary register buddies and buddy policies
Change-Id: I1d6c279478f38876a8df67d2f9dd186a2efdeca0

Former-commit-id: 253198b5bc [formerly b3083a663e] [formerly 253198b5bc [formerly b3083a663e] [formerly 9b72a1399d [formerly 48536dd79d933508ac54b3b6e9bbd166fd218330]]]
Former-commit-id: 9b72a1399d
Former-commit-id: 58a4cb95c1 [formerly d67083655a]
Former-commit-id: 951feab33d
2014-08-14 10:22:37 -05:00
Stephen Gilbert
50b88872b9 VLab Issue #4001 - NCEP EDEX and EDEX Common delivery for 14.2.1-n
GRIB config, TCM fix, and PWAT calculation for soundings

Change-Id: Ic46db6f57da1446de27693ef3d00c664af6a7431

Former-commit-id: dc8043bf03 [formerly 327f39109e] [formerly dc8043bf03 [formerly 327f39109e] [formerly af9384d8d7 [formerly 598d22b0c943c5de9fc9ab3a56cde717c374fdfe]]]
Former-commit-id: af9384d8d7
Former-commit-id: 432f0ec253 [formerly de62c1fa88]
Former-commit-id: 24cdac509b
2014-08-11 15:47:57 -04:00
Nate Jensen
49dcd538b6 Omaha #3356 remove unreferenced registered buddy policies
Change-Id: Ib3192d9da29129f5ed0db35ed903f33b111a8eb6

Former-commit-id: 69d1481634 [formerly cc56bc4b3b] [formerly 69d1481634 [formerly cc56bc4b3b] [formerly 7fb8a476f7 [formerly 9ff58fb62685fbb2f9322842ecdab40c78a8536e]]]
Former-commit-id: 7fb8a476f7
Former-commit-id: eab34f1fa0 [formerly ae7aa599bb]
Former-commit-id: 6c23f261a2
2014-08-05 09:27:10 -05:00
Nate Jensen
cbf0360401 Omaha #3356 remove unnecessary usage of ext and global buddy policies
Change-Id: I0007eb5bb21bb3a3d7d0757bb53856054b4f380d

Former-commit-id: 41eb72aefd [formerly 06a64080e7] [formerly 41eb72aefd [formerly 06a64080e7] [formerly 857f1b70cc [formerly 41306351920aee44bdf2d9648616ddc8a4511632]]]
Former-commit-id: 857f1b70cc
Former-commit-id: 94399b57de [formerly a920937cb5]
Former-commit-id: f51d409d97
2014-08-04 12:30:55 -05:00
Ana Rivera
462749040d VLab Issue #4154 - DR_14068, DCS_53 Add 3 RTMA parms, add AK RTMA 3km; closes #4154
Change-Id: If6af5c54b31911a954295ce4ae60c9d9449d4b55

Former-commit-id: 9670521c07 [formerly c10b50d0b2] [formerly 9670521c07 [formerly c10b50d0b2] [formerly 088ebd2ca2 [formerly 9c3460d34513dd2f54643b87cb8afd122d94ea9c]]]
Former-commit-id: 088ebd2ca2
Former-commit-id: 5a764dff66 [formerly 752bc11851]
Former-commit-id: 0eb194e2bb
2014-07-21 21:41:17 +00:00
Stephen Gilbert
47658e4f9b VLab Issue #3720 - NCEP EDEX and EDEX Common delivery for 14.3.1
Table updates for GRIB decoding; Updates to gpd, mcidas, pafm, and pgen
plugins

Change-Id: Ic6874210998d7f5a6b164ef45c6918246388ee68

Former-commit-id: 4602f86f47 [formerly bd2dad11b5] [formerly 4602f86f47 [formerly bd2dad11b5] [formerly ca9b7c8dfc [formerly 3c904361e7176592cc873a3414c18ad5107aea54]]]
Former-commit-id: ca9b7c8dfc
Former-commit-id: da02372ba6 [formerly 4e5968d7b6]
Former-commit-id: 7730224fe9
2014-05-15 17:20:52 -04:00
Stephen Gilbert
53cf0c9d35 VLab Issue #3720 - NCEP EDEX and EDEX Common delivery for 14.3.1
Table updates for GRIB decoding; Updates to gpd, mcidas, pafm, and pgen
plugins

Change-Id: Ic6874210998d7f5a6b164ef45c6918246388ee68

Former-commit-id: 7acac4244f [formerly ff4da2f31e] [formerly 7acac4244f [formerly ff4da2f31e] [formerly 67b526b9ff [formerly ff3f1d5997b1a87d3dddc7ca3b3893602eba510e]]]
Former-commit-id: 67b526b9ff
Former-commit-id: 26843256a6 [formerly 952cabb05b]
Former-commit-id: f43b96d202
2014-05-15 14:50:35 -04:00
Stephen Gilbert
e75a572abf VLab Issue #2866 - EDEX and EDEX Common delivery for 14.2.1
Updates to GRIB decoder tables.
Changes to some decoder plugins to support data ingest through qpid.

Change-Id: Id42e993b1ac76040ad19c970c43036d3f852def0

Former-commit-id: 185f06495f [formerly a12b83ddfb] [formerly 185f06495f [formerly a12b83ddfb] [formerly 2bd1588ad4 [formerly f64ce96da2871e55b40b6fe4ba0e77eaed266103]]]
Former-commit-id: 2bd1588ad4
Former-commit-id: 081ef1a246 [formerly cfa9fdb6cf]
Former-commit-id: 6ef117ac7d
2014-01-24 10:14:17 -05:00
Steve Harris
b41118326c 13.4.1-10 baseline
Former-commit-id: 68fe2134b8 [formerly 9a403b3615] [formerly 68fe2134b8 [formerly 9a403b3615] [formerly 92152778b9 [formerly bed40bd4ff0cc20bdbc63f97f4d68d11dc1fa3f4]]]
Former-commit-id: 92152778b9
Former-commit-id: 7e04d8cd13 [formerly b1fc4e625b]
Former-commit-id: 322036ea82
2013-05-20 10:52:47 -04:00
Steve Harris
8c828dbd75 13.3.1-1 baseline
Former-commit-id: 8ae397085e [formerly 71e8990021] [formerly 8ae397085e [formerly 71e8990021] [formerly d2a654625f [formerly 34684c71436ce4c395ea523eb34ded6792476816]]]
Former-commit-id: d2a654625f
Former-commit-id: e4435815c9 [formerly 46d28be4a4]
Former-commit-id: b3b56830b0
2013-02-20 16:19:40 -06:00
Steve Harris
5ae95b956b 13.2.1-4 baseline
Former-commit-id: ae2859d5a2 [formerly 8f2e7d4437] [formerly ae2859d5a2 [formerly 8f2e7d4437] [formerly 0d7f53b6f4 [formerly d4fd198979dbc5d77a6bf836685cb658e7ac6cfe]]]
Former-commit-id: 0d7f53b6f4
Former-commit-id: 3f25b862c8 [formerly 2998f750f4]
Former-commit-id: 0a4ef8c084
2013-01-31 11:40:31 -06:00
Steve Harris
2779f5c6d9 13.2.1-2 baseline
Former-commit-id: 33bc5fd816 [formerly 83e9157df7] [formerly 33bc5fd816 [formerly 83e9157df7] [formerly 328c6dccad [formerly bd9eec1d4e6fd843c7bb594b8adb882d72edc6cf]]]
Former-commit-id: 328c6dccad
Former-commit-id: d9be4dce21 [formerly 47cc08ac79]
Former-commit-id: 547c1dedd1
2013-01-23 11:18:44 -05:00
Steve Harris
08bf724a6c 13.2.1-1 baseline
Former-commit-id: 48d1aa7732 [formerly 9771dfae6b] [formerly 48d1aa7732 [formerly 9771dfae6b] [formerly c63f9bcae0 [formerly 6831a29efca54cfde39ab6a462f76ca2ac206f49]]]
Former-commit-id: c63f9bcae0
Former-commit-id: 8ed6a53113 [formerly f6670806bf]
Former-commit-id: 9146e727f9
2013-01-23 11:13:03 -05:00
Steve Harris
18b7633b70 13.1.2-10 baseline
Former-commit-id: 683193255d [formerly 68dde17de2] [formerly 683193255d [formerly 68dde17de2] [formerly 86ea0b666e [formerly 5a6d030d358519ca30fc37bf4a090a00557422a3]]]
Former-commit-id: 86ea0b666e
Former-commit-id: 39f9dc931a [formerly d148beb4ca]
Former-commit-id: 5c488932d9
2013-01-18 10:37:25 -05:00
Steve Harris
f52ec0b0a0 13.1.2-2 baseline
Former-commit-id: 51208e5515 [formerly c0c1d56f3a] [formerly 51208e5515 [formerly c0c1d56f3a] [formerly 4ba416aeb3 [formerly 221d0aaf0e19a054387134e72a76a278159bf4d0]]]
Former-commit-id: 4ba416aeb3
Former-commit-id: cd4185ef5c [formerly 941337c553]
Former-commit-id: b6fa9b4858
2013-01-06 14:32:24 -06:00