Commit graph

3845 commits

Author SHA1 Message Date
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
Baoyu Yin
26f4bd04aa VLab Issue #4608 - AWIPS2_DR_16259 Minor Typo in Volume Menu of D2D 4-PanelFamilies ; fixes #4608
Change-Id: I73a3f5a441e33dffe3dc7f3962c3fceec930ce3a

Former-commit-id: aceb692669 [formerly 5ad996e60e] [formerly 9e110936e8] [formerly aceb692669 [formerly 5ad996e60e] [formerly 9e110936e8] [formerly 73f7935f46 [formerly 9e110936e8 [formerly cb4e2e652ba3763725b8ec7e6d528748d2472a6b]]]]
Former-commit-id: 73f7935f46
Former-commit-id: cec7bad844 [formerly 83de62e506] [formerly 08092bf5876e0c0b56e12a04b44ff0b43c21ecf5 [formerly 17268bb5dd]]
Former-commit-id: 07fa330aad6758c7fa29e8c5c776b8c54e5e0a87 [formerly 8a9ec04c80]
Former-commit-id: 6a427f968c
2014-09-04 08:23:53 -04:00
Baoyu Yin
ef369b24a3 VLab Issue #4567 - AWIPS2_DR_16933: Text Script Editor Edit Menu Delete Line Option; fixes #4567
Change-Id: I10e1dbdd6352adcfa39ae8980230a95afdc8cec1

Former-commit-id: 579a4febdd [formerly 7f80279179] [formerly fd229c716d] [formerly 579a4febdd [formerly 7f80279179] [formerly fd229c716d] [formerly 309e1bc684 [formerly fd229c716d [formerly d9f69c85c6432a937f70c16053f45d5214ce5147]]]]
Former-commit-id: 309e1bc684
Former-commit-id: 25c77a8f43 [formerly cbd1062ca8] [formerly cc3c4d39edd3db94e7b89cecdecf3a3520c9664b [formerly ba01db8d69]]
Former-commit-id: 452fe3d219b64489b37b72f7dfa6e35f13a297af [formerly beb0b09e77]
Former-commit-id: 3ce032aa35
2014-09-04 07:53:38 -04:00
Nate Jensen
8c08ca9d46 Omaha #3356 remove unnecessary register buddy to uf.viz.core
Change-Id: I95915b6f1d458a5bb581eec79d40af8bc94122f4

Former-commit-id: 08436d362e [formerly 0967e25c67] [formerly 20251fc3e3] [formerly 08436d362e [formerly 0967e25c67] [formerly 20251fc3e3] [formerly b332434b49 [formerly 20251fc3e3 [formerly a46d5914ae58ad1c3410cdf8d7e67cf856e4c2bd]]]]
Former-commit-id: b332434b49
Former-commit-id: 7202989e20 [formerly ccb7d4a797] [formerly c5ffe60a278df83df6f474d73bc3568e24b73017 [formerly 6285cc9893]]
Former-commit-id: 94091205e390dc206b61ad189761b3b2ea7d40c7 [formerly 9e1336de40]
Former-commit-id: 364295639c
2014-09-03 16:10:53 -05:00
Steve Harris
e938f3b297 Merge branch 'master_14.2.4' (14.2.4-7) into omaha_14.2.4
Former-commit-id: 197e5ad6ff [formerly 0ea6b72088] [formerly 0e869fa6c1] [formerly 197e5ad6ff [formerly 0ea6b72088] [formerly 0e869fa6c1] [formerly afa45bf919 [formerly 0e869fa6c1 [formerly 2391bc928e8798f022c3ca5ad8a1d5619ae4e2a4]]]]
Former-commit-id: afa45bf919
Former-commit-id: ea7d9a009a [formerly 550eb6e3ac] [formerly 76a150860a6752d36b9f2a8e4ce9b2e048e62694 [formerly e3d99832ec]]
Former-commit-id: 4a24c3d6d81ccc702abc4792ab9a533e6f9f0355 [formerly 49a48c4874]
Former-commit-id: 67969a5118
2014-09-03 15:22:00 -05:00
Nate Jensen
b9e7dd0aa8 Omaha #3356 remove more unnecessary register buddies and policies
Change-Id: I3e39f9b8274b2b9104f3b3d037601c1553c43e13

Former-commit-id: 0fb9fc4f59 [formerly 2c74d90cc4] [formerly c0dab26b92] [formerly 0fb9fc4f59 [formerly 2c74d90cc4] [formerly c0dab26b92] [formerly 9d462e1dd9 [formerly c0dab26b92 [formerly b535d54c52c3e38bb9fa083ba911ad49c090f214]]]]
Former-commit-id: 9d462e1dd9
Former-commit-id: 25000511be [formerly d5e948b7e2] [formerly 50853652fc8d12a23e8399b69c56c2269a0b8e23 [formerly 05a73b1e4b]]
Former-commit-id: 9728aa8c5981d6ffdaa1baa487fe07048ea977fa [formerly d87cfb8131]
Former-commit-id: 3188cd0af2
2014-09-03 11:34:10 -05:00
Nate Jensen
7d810b58b9 Omaha #3356 remove unnecessary dependency
Change-Id: I59503f01e8c7ec451c7dcb725bf9fecd0209fba2

Former-commit-id: 66cdeaed25 [formerly a7984f6dde] [formerly 4b5d5ab6cc] [formerly 66cdeaed25 [formerly a7984f6dde] [formerly 4b5d5ab6cc] [formerly 362fee1984 [formerly 4b5d5ab6cc [formerly c60ca3a16e348216c582f30bc95d8d35ef81e312]]]]
Former-commit-id: 362fee1984
Former-commit-id: 2f10eb95a5 [formerly 9e5c92de45] [formerly fca77baaefd11acced64b8509f216b18f6846746 [formerly de4472f76b]]
Former-commit-id: 98bcb1258fee6524d31f0474de7faf6409684467 [formerly 5a2a700085]
Former-commit-id: 64c23a487d
2014-09-03 10:53:30 -05:00
Nate Jensen
b21f03757a Omaha #3356 remove OBE register buddies from collaboration
Change-Id: I49099386a48b650c9e6ea1a96b519fbc178f769f

Former-commit-id: 8b55dfa980 [formerly b690c360ac] [formerly 8e74892cd6] [formerly 8b55dfa980 [formerly b690c360ac] [formerly 8e74892cd6] [formerly 40d4abe4cd [formerly 8e74892cd6 [formerly 89de611bd1abdd016ae8a96db4c820004c52b406]]]]
Former-commit-id: 40d4abe4cd
Former-commit-id: b4b5642b58 [formerly f78e7fe79c] [formerly fcfeaf6b76dea8640f9825d4afaf45c9001ac3e4 [formerly 5b2e410c6c]]
Former-commit-id: 967d00b58b43570744b7d6d9b09ff846327cd9f1 [formerly 54e9b04c3d]
Former-commit-id: 22fa9cc6d9
2014-09-03 10:00:11 -05:00
Mark Peters
9af2093ebf Omaha #3467 Error occurs when loading/editing the Range Rings tool multiple times
Change-Id: I68642e05ce970545a516d4fab1492a860c530032

Former-commit-id: 9259187266 [formerly 447986eed3] [formerly 06b98bb48a] [formerly 9259187266 [formerly 447986eed3] [formerly 06b98bb48a] [formerly ee36d09cb0 [formerly 06b98bb48a [formerly 725354074d54112c8658dc34a8ac564739acbebb]]]]
Former-commit-id: ee36d09cb0
Former-commit-id: cda9e678ce [formerly 8ace5b852c] [formerly 77c8cf7908b9938669d07f1218c604ca9a22cca8 [formerly a3feb0de78]]
Former-commit-id: 2f22b952a1904df9821cbfd7543994a5d0efe440 [formerly e7e58b4e78]
Former-commit-id: 72184dbcaf
2014-09-02 16:31:44 -05:00
Ben Steffensmeier
afd34c4e2a Omaha #3390 Remove references to deprecated API.
Former-commit-id: 59e6ec282f [formerly 950075dc59] [formerly 1d2144e840] [formerly 59e6ec282f [formerly 950075dc59] [formerly 1d2144e840] [formerly e32037b42a [formerly 1d2144e840 [formerly ec7eeeb08af2cbad5d7880ae17ba7b351de23dc3]]]]
Former-commit-id: e32037b42a
Former-commit-id: 31f58cc68e [formerly 068653ac95] [formerly 978887cb907a630899b357400937ea888e94a9f4 [formerly b77166c26e]]
Former-commit-id: 7c80d8b87912c05d70384388c8b2a77908c257b7 [formerly 6e1981d6f6]
Former-commit-id: 5b35e526f4
2014-09-02 15:39:45 -05:00
Brian.Dyke
67d4a5f91b Merge branch 'master_14.2.3' into master_14.2.4 CM-MERGE:14.2.3-1 (14.2.2-30,-31) into 14.2.4
Former-commit-id: bdba05f6b1 [formerly 9e156775e5] [formerly fd8ad016ef] [formerly bdba05f6b1 [formerly 9e156775e5] [formerly fd8ad016ef] [formerly 14e64881a1 [formerly fd8ad016ef [formerly bc9f03426304e3bb194fbf7f356d8dd3816cd836]]]]
Former-commit-id: 14e64881a1
Former-commit-id: 00175029c5 [formerly 75fccb7361] [formerly 1eb2f1f9e0f92550688af61f814e53ebcd21e85a [formerly 43c9dfa397]]
Former-commit-id: 481daae46a50a3916d1fdb63ccaf21ee51a408cd [formerly 2d9a8a8b40]
Former-commit-id: e8143081cb
2014-09-02 16:32:54 -04:00
Brian.Dyke
3539b14e3b Merge branch 'field_14.2.4' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.2.4
Former-commit-id: 9105ef9aa2 [formerly e425e5bf8c] [formerly f0875e724f] [formerly 9105ef9aa2 [formerly e425e5bf8c] [formerly f0875e724f] [formerly 611e036e75 [formerly f0875e724f [formerly 40efe51cafd5589ef0a640041ad0539e454b6f8d]]]]
Former-commit-id: 611e036e75
Former-commit-id: 0015f2440e [formerly 3b9653ef00] [formerly c73653650f9ff8397fc5371a4686056fcc738000 [formerly caf5f778e9]]
Former-commit-id: 8382ee6ae605cca7bbd88f333d4d1875fc119a63 [formerly 4425e3db61]
Former-commit-id: 0d6ef0345d
2014-09-02 16:30:51 -04:00
Brian.Dyke
c794f123cf Merge branch 'master_14.2.2' into master_14.2.3
Former-commit-id: a76150b1a7 [formerly 65f8fc89f0] [formerly 368f80f220] [formerly a76150b1a7 [formerly 65f8fc89f0] [formerly 368f80f220] [formerly b1dbaa0b50 [formerly 368f80f220 [formerly f9daf7d6e906904e96438fabc510e24ff66536d4]]]]
Former-commit-id: b1dbaa0b50
Former-commit-id: 8f03fd0274 [formerly 045647bb37] [formerly 43f0dc59c33b7743e63ed6a533b0ca2012370c82 [formerly a1889cd15e]]
Former-commit-id: c433f75ba5ca6d60a2ce55518254ef98b080caa8 [formerly efb7dcb397]
Former-commit-id: cd6bf05d34
2014-09-02 15:09:06 -04:00
Qinglu.Lin
175af9a9d3 ASM #15551 - WarnGen: only WCN should be used while including TOR/SVR watches in WarnGen products
Change-Id: I286bc4cc809fcc9257f72051f1bb74f8acc24c05

Former-commit-id: dda32f85e9 [formerly b32ea40289] [formerly 2374673f8d] [formerly dda32f85e9 [formerly b32ea40289] [formerly 2374673f8d] [formerly ae13ea419e [formerly 2374673f8d [formerly 59890eef397f3282ef26f259ca85ffea3db7b710]]]]
Former-commit-id: ae13ea419e
Former-commit-id: 5c521a214c [formerly 3fcdc279ea] [formerly 153a4d5b66ab5d399ab180ca9af559bd33c0b1bf [formerly 075df9d234]]
Former-commit-id: 04e6c13acdb23e049d0e8a380998b12c7056105a [formerly 415af39911]
Former-commit-id: 7ec0ec8877
2014-09-02 14:37:19 -04:00
Ron Anderson
dd329dbd57 Issue #3572 Fixed getNumpy errors for Grid2DFloat
Change-Id: I6caf979c1d531a842f77d23dbd7f8e0865afecce

Former-commit-id: c5a32980d6 [formerly c7fbca0298] [formerly 46c62a1db6] [formerly c5a32980d6 [formerly c7fbca0298] [formerly 46c62a1db6] [formerly 434d412882 [formerly 46c62a1db6 [formerly e2ecb91569c2f622d45f7301c1eb4e058a2ab641]]]]
Former-commit-id: 434d412882
Former-commit-id: 215d5f262e [formerly 19ce2bb34e] [formerly d4fadbd148424d34474cdcf3ba53cd32ad36b1f0 [formerly 24fba5cc20]]
Former-commit-id: 00a79119c6c0303cfa622498ee2804eb04c1903f [formerly cad80d1060]
Former-commit-id: 699fe1637e
2014-09-02 12:21:42 -05:00
Ron Anderson
10e9ad4ca8 Merge "Omaha #3527 Error occurs when attempting to reset or customize the Localization perspective" into omaha_14.4.1
Former-commit-id: 63ab6bd9a9 [formerly 8d9741bd83] [formerly 6a5d4acf7c] [formerly 63ab6bd9a9 [formerly 8d9741bd83] [formerly 6a5d4acf7c] [formerly aa6835147b [formerly 6a5d4acf7c [formerly 31578a50044053da2ecf14697764bfac2ee8ac8d]]]]
Former-commit-id: aa6835147b
Former-commit-id: ac506c4706 [formerly f27986f541] [formerly b1cd47a3d83b85b71256a99afa990cb682a5acff [formerly 017378f646]]
Former-commit-id: 9af96902654c0f6e23f6c8bc3a8528d55566d1b3 [formerly 8ab30a7e02]
Former-commit-id: c13e748b6c
2014-09-02 12:08:44 -05:00
Nate Jensen
817ef8e8db Merge "Omaha #3356 fix cave startup" into omaha_14.4.1
Former-commit-id: 8b646ba31d [formerly 3258b9a2b2] [formerly 5247f4833f] [formerly 8b646ba31d [formerly 3258b9a2b2] [formerly 5247f4833f] [formerly 653d594382 [formerly 5247f4833f [formerly e3c3d979ba7dcb46d2af716aa73e05c67f0dd2ba]]]]
Former-commit-id: 653d594382
Former-commit-id: 9fe09a5a4a [formerly 9067556a0e] [formerly 16cdf4e9bf10ff7dd7304857d8a8edd3a9887132 [formerly a63f5ee67b]]
Former-commit-id: a4957d53386d3437cf9be10914fe20459ec96bed [formerly 8078915092]
Former-commit-id: 0c55719688
2014-09-02 10:14:08 -05:00
Nate Jensen
55b8cace97 Merge "Omaha #3569 Split Volume Browser planes menus into multiple reusable components." into omaha_14.4.1
Former-commit-id: 2d5df2705f [formerly e673ed62bd] [formerly 2c209af1fa] [formerly 2d5df2705f [formerly e673ed62bd] [formerly 2c209af1fa] [formerly fe457e89a7 [formerly 2c209af1fa [formerly 09d7406f13949cf6a90164b06742c80ba2e18110]]]]
Former-commit-id: fe457e89a7
Former-commit-id: 23e2185306 [formerly 675bf92355] [formerly d45ff0db4fb7b24b0d0dac7dd89e774e93c37f76 [formerly 5661124038]]
Former-commit-id: d73ffe2ac6152190335275c8b09eca38523eb2c5 [formerly 84a107c8fa]
Former-commit-id: 070ef331b9
2014-09-02 09:53:25 -05:00
Nate Jensen
8fce75eb4c Merge "Omaha #3459 Ensure font is initialized before queryJob runs, Additional refactoring to someday allow ZoneSelectorResource to use more common code." into omaha_14.4.1
Former-commit-id: 9911f52bba [formerly 3efe4cf3b0] [formerly c4333e030c] [formerly 9911f52bba [formerly 3efe4cf3b0] [formerly c4333e030c] [formerly 13f1a5a8ab [formerly c4333e030c [formerly 172d733902e6430de4f776eed3ad4cd6a94164a5]]]]
Former-commit-id: 13f1a5a8ab
Former-commit-id: 8ce67a74fc [formerly ce408af16d] [formerly d4c7add5b764b550d58d33f2f4196259ef2e45ee [formerly d7a2ff8336]]
Former-commit-id: eeef362c82e91dc32f6c0c742ffa9f5f3910e7e0 [formerly f913771eb0]
Former-commit-id: 037859fb38
2014-09-02 09:52:38 -05:00
Nate Jensen
11a7a988e0 Omaha #3356 fix cave startup
Change-Id: Id05d1439ba4f3b5064887b46256f4ade4523f595

Former-commit-id: c77003fe38 [formerly 9bf9e3a658] [formerly 4395ab6f11] [formerly c77003fe38 [formerly 9bf9e3a658] [formerly 4395ab6f11] [formerly ef99d43451 [formerly 4395ab6f11 [formerly d326ee1a73a852e5534e76bf2148afd7646adb7e]]]]
Former-commit-id: ef99d43451
Former-commit-id: 52c35a13e4 [formerly b2d1d16230] [formerly 0df3a1960400546ca8de64d6de8790e6692bf51e [formerly fe789cce26]]
Former-commit-id: 125156870dc75ed8a982849f77f0d35a67186be9 [formerly 20aa52b2ed]
Former-commit-id: 9f908d764c
2014-09-02 09:50:08 -05:00
Richard Peter
ec4e085fbe Merge "Omaha #3567 Merge conflict VbSources.xml changes placed in volume.xml." into omaha_14.4.1
Former-commit-id: 7a17f81e58 [formerly 5db143cd92] [formerly 6f66071eca] [formerly 7a17f81e58 [formerly 5db143cd92] [formerly 6f66071eca] [formerly 40917b6118 [formerly 6f66071eca [formerly f7aa38e6092e59e314fedad22829eed9e5c22ad2]]]]
Former-commit-id: 40917b6118
Former-commit-id: a464a6a8d4 [formerly 0f7e216834] [formerly 0aee5e24eab0cab12c41ad64d2f52c7f99e993be [formerly 59ad20bac3]]
Former-commit-id: 5d4edf0dcaa2380e6bf39a71eb3a7400382619b1 [formerly c1fcdcfde2]
Former-commit-id: 5496419cc9
2014-09-02 09:23:58 -05:00
Steve Harris
a8dce1da7e Merge branch 'master_14.2.4' (14.2.4-6) into omaha_14.2.4
Former-commit-id: 9e79ff1cff [formerly f7e39c9d6f] [formerly 3b6a003884] [formerly 9e79ff1cff [formerly f7e39c9d6f] [formerly 3b6a003884] [formerly e7705c328e [formerly 3b6a003884 [formerly 09b94266f1f3aeaaa7fcf622487d751097d271a4]]]]
Former-commit-id: e7705c328e
Former-commit-id: 6184a8ef57 [formerly 79c7e0b492] [formerly 5cde04894fc320a0e396dcbcda7917b88bf7faf3 [formerly 92a45c76fb]]
Former-commit-id: d186fe408ae810a2d706db3817a1118abbd73681 [formerly 6279cdb55c]
Former-commit-id: f1c77c42ed
2014-09-02 08:12:49 -05:00
Mark Peters
ae538ff95a Omaha #3527 Error occurs when attempting to reset or customize the Localization perspective
Change-Id: Ie029b1aff905b57b5a353e0acf60c5137014c473

Former-commit-id: fc72ed828c [formerly 966879b8a1] [formerly e35a7451c6] [formerly fc72ed828c [formerly 966879b8a1] [formerly e35a7451c6] [formerly 045746ec21 [formerly e35a7451c6 [formerly 8099cbe2359334d6718761046a1475fca687af35]]]]
Former-commit-id: 045746ec21
Former-commit-id: b42885a2af [formerly c850f6b6cd] [formerly 9f5aeecba1c51e5935aa53069c6d888c3c64a904 [formerly cc96e1fb1f]]
Former-commit-id: 0b0b06ddbbc00314f09e4d3b441fcbf71cfea7d0 [formerly 264c5afa15]
Former-commit-id: aa58dab103
2014-08-29 16:17:22 -05:00
Ben Steffensmeier
558702d535 Issue #3543 Fix gl datamapping of data with NaN conversions.
Former-commit-id: 0f79692cd7 [formerly 9c2c00c71e] [formerly 22f93b6905] [formerly 0f79692cd7 [formerly 9c2c00c71e] [formerly 22f93b6905] [formerly 190893e807 [formerly 22f93b6905 [formerly bc12be9bb6e8c7f63550602f51bca3448c21d4c6]]]]
Former-commit-id: 190893e807
Former-commit-id: 87b89383ca [formerly cb95c6ee3a] [formerly 04fff4eb5df11c24613d82008d0394fbb5a28291 [formerly 6f9dca57e8]]
Former-commit-id: 013af04b82aaefd3f096dba9591f50ee5169e021 [formerly 16561bb4c7]
Former-commit-id: 7476405193
2014-08-29 15:08:03 -05:00
Mark Peters
d1154bbe63 Omaha #3569 Split Volume Browser planes menus into multiple reusable components.
Change-Id: Idb7fa5d1b5cd5a53db38545c942c4c0bae19c3c9

Former-commit-id: b906c8054b [formerly 86b9016338] [formerly 097ce54969] [formerly b906c8054b [formerly 86b9016338] [formerly 097ce54969] [formerly 91f2b365a1 [formerly 097ce54969 [formerly a0864eff6efa679cdc0f58cd408102e32145f22c]]]]
Former-commit-id: 91f2b365a1
Former-commit-id: adae10c2d0 [formerly abd256ab93] [formerly b7fb901b9427a42706a36a3d4c34c6103d17ca1a [formerly 54f9a37e6c]]
Former-commit-id: 7ce1fb859b9af8c7ab75518422673df67174e57b [formerly a3c382c0f7]
Former-commit-id: 9cab14d5b6
2014-08-29 15:05:29 -05:00
Kiran.Shrestha
7b8e3b5390 ASM #506 - TextWS: Unable to save unofficial text products from text editor.
Change-Id: I969cd9ddaa9adc83d5e65571fbb4f45ea89002a6

Former-commit-id: b4a897c5a7 [formerly 3abf28f856] [formerly a285439c08] [formerly b4a897c5a7 [formerly 3abf28f856] [formerly a285439c08] [formerly d8bd6a9c70 [formerly a285439c08 [formerly 1681bea10870df58b3f2cc0d0a59f21c596e9e95]]]]
Former-commit-id: d8bd6a9c70
Former-commit-id: 8ad4aa78a8 [formerly f278d7edbf] [formerly c3bd761b7a4aa4335ef9629b9656cb7ddd1bdbd2 [formerly 2687526cec]]
Former-commit-id: 31f923783e15681c3e9248f3dec8597494a3ecce [formerly 022a4dc4dc]
Former-commit-id: df635b2a58
2014-08-29 13:50:55 -04:00
Ron Anderson
c317ab5eef Omaha #3459 Ensure font is initialized before queryJob runs,
Additional refactoring to someday allow ZoneSelectorResource to use more common code.

Change-Id: I87e4d1a16b6086f4241e67bb1058bb096eb5e062

Former-commit-id: 0bb6076cdc [formerly f3f2ec8843] [formerly 8583386e5f] [formerly 0bb6076cdc [formerly f3f2ec8843] [formerly 8583386e5f] [formerly de490ea582 [formerly 8583386e5f [formerly a1896437f432bcb360365d28a0ee7377cec565af]]]]
Former-commit-id: de490ea582
Former-commit-id: 06dbcd69d6 [formerly ae69665e50] [formerly 39b07ee71f914fcb7284dbe4733a3b9645faf975 [formerly 338672c03f]]
Former-commit-id: e0bb2a385f25bd2eb5b08e0b6f5f02ee58b77b3c [formerly 3954787487]
Former-commit-id: 4a821c89b7
2014-08-29 12:04:52 -05:00
Nate Jensen
a14acec7da Merge "Omaha #3561 Yet another attempt to fix combinations file updating" into omaha_14.4.1
Former-commit-id: 1f087e5f0c [formerly 47261a4ac4] [formerly 16191b10ab] [formerly 1f087e5f0c [formerly 47261a4ac4] [formerly 16191b10ab] [formerly c60dfb889c [formerly 16191b10ab [formerly 3482282527df3ffd13c93d1a5d63d52ce79f8b2b]]]]
Former-commit-id: c60dfb889c
Former-commit-id: e994012d79 [formerly 6647ce3111] [formerly d6db0ba4036aa9711953caa0d0cd0c0456216e6e [formerly b61f93a2e4]]
Former-commit-id: bb0004636a214383e71c110406009e82fd42ff09 [formerly 08a9210cce]
Former-commit-id: 5e78fb700b
2014-08-29 11:16:16 -05:00
Steve Harris
d6571dcf19 Omaha #3132 - removing duplicated com.raytheon.uf.viz.core
Former-commit-id: 12cd8db99b [formerly f51ceee718] [formerly aedf89c00b] [formerly 12cd8db99b [formerly f51ceee718] [formerly aedf89c00b] [formerly c49eabbb45 [formerly aedf89c00b [formerly 94468f09bd626bd2ff26e7312ceede154f427664]]]]
Former-commit-id: c49eabbb45
Former-commit-id: 703098364e [formerly 113bcace66] [formerly a225c040ed3b1662d147a0f61eb11c429834a4a4 [formerly d24b29f7b2]]
Former-commit-id: e88047a01ace8ac3938d2a3d8316418ec4655cc7 [formerly aed5540042]
Former-commit-id: a7e18342d9
2014-08-29 11:05:34 -05:00
Ron Anderson
cb4ecaae1f Omaha #3561 Yet another attempt to fix combinations file updating
Change-Id: I4131ed6043e4bbfa2955024b5e3ce4508734585f

Former-commit-id: 30ef2a7667 [formerly 89cde78ea6] [formerly bd52b5a924] [formerly 30ef2a7667 [formerly 89cde78ea6] [formerly bd52b5a924] [formerly 9f37d7914a [formerly bd52b5a924 [formerly b1c067fe33d1fe09f89e981b03ef178bcc3a5f93]]]]
Former-commit-id: 9f37d7914a
Former-commit-id: d7f3e42548 [formerly b58479dc0b] [formerly 6362bc55a2ad3ebcea3f99623c5d126d5e3a486e [formerly b489928744]]
Former-commit-id: 7a0b93268eac3e1d8ed6c872ab795d04b56a0b9d [formerly 7158207736]
Former-commit-id: acc6079444
2014-08-29 10:45:54 -05:00
Steve Harris
3c8bfc8160 Merge branch 'master_14.3.1' (14.3.1-16) into omaha_14.4.1
Conflicts:
	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/BundleRepositoryGetter.java
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/reflect/SubClassLocator.java
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
	cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/StormTrackDisplay.java
	cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java
	cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
	edexOsgi/com.raytheon.edex.plugin.binlightning/src/com/raytheon/edex/plugin/binlightning/BinLightningDecoder.java
	edexOsgi/com.raytheon.uf.common.comm/src/com/raytheon/uf/common/comm/HttpClient.java
	edexOsgi/com.raytheon.uf.tools.cli/impl/capture
	ldm/src/pqact/pqact.c

Former-commit-id: 3619a11a8a [formerly bddf9c0f27] [formerly 793064063b] [formerly 3619a11a8a [formerly bddf9c0f27] [formerly 793064063b] [formerly 5d58625abc [formerly 793064063b [formerly 8793dca41f756ba812206b48391caea6e593a657]]]]
Former-commit-id: 5d58625abc
Former-commit-id: 10070d2762 [formerly 66b485c000] [formerly db0dcd3c8aec6653a2b81e49b72319049b73eb54 [formerly d984dd538f]]
Former-commit-id: ecf6e2073b4dd08f6ed165eae9b0647f2d0b9dc4 [formerly e681e0a457]
Former-commit-id: ecf26b3ac5
2014-08-29 10:17:52 -05:00
Brian.Dyke
42e17418ed Merge branch 'master_14.3.1' into asm_14.3.1
Former-commit-id: 8f69c4b855 [formerly cbe59aded5] [formerly 6f3d0508e4] [formerly 8f69c4b855 [formerly cbe59aded5] [formerly 6f3d0508e4] [formerly 2c25f68437 [formerly 6f3d0508e4 [formerly f34bc4f81eb5ac92ef306f73f8c34243d3f78e31]]]]
Former-commit-id: 2c25f68437
Former-commit-id: 4afabdfb18 [formerly 07ffb04445] [formerly a36a933e1051f5ac6e37163907155d158df993b0 [formerly 2abed9c0eb]]
Former-commit-id: 1bf17b8d14f9883ca968441daded2fdc1e43f653 [formerly 8d7b13548f]
Former-commit-id: b01c60ca50
2014-08-29 10:19:02 -04:00
Brian.Dyke
a784936b10 Merge branch 'master_14.2.4' into asm_14.2.4
Former-commit-id: 31c13bf0bf [formerly a5519a28d9] [formerly 37c926973c] [formerly 31c13bf0bf [formerly a5519a28d9] [formerly 37c926973c] [formerly a2f66c8d97 [formerly 37c926973c [formerly cff9bfd2697a73ccc18642d8dc057b6a27aa2991]]]]
Former-commit-id: a2f66c8d97
Former-commit-id: d805faa88c [formerly d14d2b9a30] [formerly 39e8d8ffde8b1fa357b628c70cca02439f025ba2 [formerly f3eba57747]]
Former-commit-id: d89b641dbae4734fb3a72f403f69b6fe21f7e7ae [formerly 24a0b8457e]
Former-commit-id: 85d763def5
2014-08-29 10:07:14 -04:00
Brian Clements
a3fa77d796 Issue #3500 moved ProcedureXMLManager initialization to CAVE component subclass
Change-Id: Ie8a509a5f5b6b0a358460f0218925458106fd040

Former-commit-id: c0b132d6ee [formerly 981390eb22] [formerly b352bd3944] [formerly c0b132d6ee [formerly 981390eb22] [formerly b352bd3944] [formerly cfeb16eff8 [formerly b352bd3944 [formerly b3482522860408c2d052261e845899cf73c2ce96]]]]
Former-commit-id: cfeb16eff8
Former-commit-id: 3015aef7b9 [formerly c337087043] [formerly da0614500f744bdca9a9cd20f1050898018e3164 [formerly a2010c729a]]
Former-commit-id: 378c8cc0cd2c0288760022a651b07b1c9c74ada1 [formerly 139466b9ef]
Former-commit-id: e9eb97a8fb
2014-08-29 08:55:58 -05:00
Juliya Dynina
abb33a7cdd Merge "ASM #15682 - D-2D: SPC Watches display: Watches do not disappear when expired" into asm_14.2.3
Former-commit-id: d911b87c7e [formerly 5f001b7ad7] [formerly 169dc0ba43] [formerly d911b87c7e [formerly 5f001b7ad7] [formerly 169dc0ba43] [formerly 58a3df78a8 [formerly 169dc0ba43 [formerly bb260c4003b477ca51cf5fd9c8d54275af906772]]]]
Former-commit-id: 58a3df78a8
Former-commit-id: f1332a37cc [formerly 62d2e61a75] [formerly d8e22d556662dfb3ac872fc696a556d59c038540 [formerly 07b6109b5f]]
Former-commit-id: 6ab8833ed6da018338872e3739e186b679f1bcf8 [formerly 9a5eb28213]
Former-commit-id: 95f1799dc6
2014-08-28 15:52:11 -05:00
Ana Rivera
e57246c6ce VLab Issue #3617 - RMDR_16720 Updates to HRRR DCS_266; fixes #3617
Change-Id: I159cbaed918fc48c31d115314e29ad9c2128a7f1

Former-commit-id: b03dd41331 [formerly e033ed5546] [formerly 160dabc4d1] [formerly b03dd41331 [formerly e033ed5546] [formerly 160dabc4d1] [formerly 9af77831a6 [formerly 160dabc4d1 [formerly 2df117a7aec644e6964da6c36326ab3b29b9f378]]]]
Former-commit-id: 9af77831a6
Former-commit-id: ae4ea166aa [formerly 2045699212] [formerly 55222fba76e6458ccc65b959b86f2e7bff061cbc [formerly fbe4d57f6b]]
Former-commit-id: f1c71d002deedd0c02aa5622f474ac29e9b2dd09 [formerly dee335f370]
Former-commit-id: aec8eba1a7
2014-08-28 18:38:26 +00:00
Roger Ferrel
9322cc494f Issue #3553 - Force redisplay of data set table after all labels are generated.
Change-Id: Ie8c0195414102d046e5348e778ba8d5e1053e5ec

Former-commit-id: 60d6b770aa [formerly 15c73be56c] [formerly 6f8c6d6aa1] [formerly 60d6b770aa [formerly 15c73be56c] [formerly 6f8c6d6aa1] [formerly ef5dfb1f93 [formerly 6f8c6d6aa1 [formerly bcc9b0a6352151dfdf3ba75063bb87308cb162b4]]]]
Former-commit-id: ef5dfb1f93
Former-commit-id: 6fcac050be [formerly ffa95bce90] [formerly a75847a14ce68662ce3ae2487c06dcc0a6e1e748 [formerly fe50853adb]]
Former-commit-id: 8abe9b8b145e7dc278af60c6258a58d392c001a0 [formerly 86d4730538]
Former-commit-id: 89f66db462
2014-08-28 13:10:11 -05:00
David Friedman
3dbc4239e9 ASM #15682 - D-2D: SPC Watches display: Watches do not disappear when expired
Change-Id: I3a29b5b0bb5c75dd5ac5f508391f5806cabf47fa

Former-commit-id: 16c903e2c5 [formerly 9c2545ed64] [formerly de6e79f9e3] [formerly 16c903e2c5 [formerly 9c2545ed64] [formerly de6e79f9e3] [formerly d5c086a022 [formerly de6e79f9e3 [formerly aca832a81bc18d954eadb51755ce04597cd264df]]]]
Former-commit-id: d5c086a022
Former-commit-id: 182df433a9 [formerly b2cc41f3de] [formerly a179ad829ac12e1773af11cae397893e6b1617b6 [formerly 6209bbc36f]]
Former-commit-id: 73ae135681bf633630b5cc3958129e68b1071732 [formerly 41b4886743]
Former-commit-id: e42ffa0ad4
2014-08-28 18:08:23 +00:00
Daniel.Huffman
6aa67f4588 ASM #16715 - Reverted and augmented Airports.xml and Fix.xml
Change-Id: Icd15e1947ec7d71b22d621b452d9e1c74767898e

Former-commit-id: 39f7795b7c [formerly c3731d5622] [formerly c89a7169b0] [formerly 39f7795b7c [formerly c3731d5622] [formerly c89a7169b0] [formerly ca2aa8811b [formerly c89a7169b0 [formerly 09e0b79b25ec4f8854dde331469b0e7d6c4ffa1f]]]]
Former-commit-id: ca2aa8811b
Former-commit-id: eab387d780 [formerly eb9b743c46] [formerly 4e8f9df5152a35ae2d89acc7ab6ad942931f615c [formerly dc2bc16bcc]]
Former-commit-id: 228c90a329fdf4dbbc995cb3df98fa83f3fcfc66 [formerly b97ea429c3]
Former-commit-id: ff850b4cf0
2014-08-28 17:20:30 +00:00
steve.naples
33e95d1e49 ASM #14578 - Added Hydrologic date field ti Choose Hour dialog for Daily QC
Change-Id: I954833e37c579ab1eaddf95347ba53d73909b138

Former-commit-id: bf9924b0e9 [formerly 4205d83452] [formerly 1856a05319] [formerly bf9924b0e9 [formerly 4205d83452] [formerly 1856a05319] [formerly ff52f1dc0a [formerly 1856a05319 [formerly 2e8fb864f410b9b08ccc6de6c0d75666931da3a2]]]]
Former-commit-id: ff52f1dc0a
Former-commit-id: 899ff32548 [formerly 1532c683a1] [formerly 2916716519dd7ee38032637d8a99f6fb81e1e7ba [formerly 211e9f7546]]
Former-commit-id: cc4eaa9f2dd1e8e914858e1e4828f637b78454d8 [formerly 3f11e82772]
Former-commit-id: 03f50a48f1
2014-08-28 16:08:17 +00:00
Ron Anderson
7cc1ad7088 Omaha #3563 Fixed GFE site activation to not regenerate edit areas unnecessarily
Change-Id: Ifaa654758e51c64cec552e3c76ee0e3c660a4a34

Former-commit-id: 1e05b981fa [formerly dc185b8dd1] [formerly bb1e80b844] [formerly 1e05b981fa [formerly dc185b8dd1] [formerly bb1e80b844] [formerly 2b88ade974 [formerly bb1e80b844 [formerly e7acedd733e4f1acc89f6287fe74ff116376a4ca]]]]
Former-commit-id: 2b88ade974
Former-commit-id: c6eb33afcc [formerly 39d00a72ce] [formerly 36188db03ab5afd51b2833d61639eaa10519a6f7 [formerly 0962c75d18]]
Former-commit-id: 86f00e159c29c3c94d7aa9fffb6a0183327a64c0 [formerly 56b56ea4f3]
Former-commit-id: 932d9e2783
2014-08-28 10:43:54 -05:00
David Friedman
64b66c9dde ASM #15658 - WarnGen: inclusion of watch information in marine products
Change-Id: I9f99e6136027f1a6419800f87e5a5709fe5be6b9

Former-commit-id: bb421fd3e4 [formerly ea1e9feb1d] [formerly a2dfe8e8f6] [formerly bb421fd3e4 [formerly ea1e9feb1d] [formerly a2dfe8e8f6] [formerly ea9230b37c [formerly a2dfe8e8f6 [formerly 6bfa1d6662b00925814be7126592bbe340651649]]]]
Former-commit-id: ea9230b37c
Former-commit-id: 25e0bcdc6f [formerly 10114b0bd1] [formerly 74a7d88387ec143a88a15084374737200a0e031a [formerly bc22f7309c]]
Former-commit-id: 2553d508e5b2d1bb6b928ee04f40220c66d897ac [formerly bfc3fa98b4]
Former-commit-id: 39c7024668
2014-08-28 15:43:32 +00:00
Brian.Dyke
0ae9b53ca6 Merge branch 'field_14.2.4' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.2.4
Former-commit-id: cbfd380b43 [formerly 76bd6575b6] [formerly 47ae6015e5] [formerly cbfd380b43 [formerly 76bd6575b6] [formerly 47ae6015e5] [formerly a24794ca7b [formerly 47ae6015e5 [formerly 3909fa46a4efffabb09303f139bc36accc064a6d]]]]
Former-commit-id: a24794ca7b
Former-commit-id: 7288e9be2a [formerly 065b05e38c] [formerly d87cfe22daebbd0f64708e2b5401b5a9bc43a95e [formerly 0e9a17540d]]
Former-commit-id: 7849df2750377b7bb32208974c538f9b11a2620a [formerly bab69f3764]
Former-commit-id: c5aec69ab3
2014-08-28 11:39:48 -04:00
Nate Jensen
3876f26da7 Merge "Omaha #3453 Added the spell check dictionary to site level localization." into omaha_14.4.1
Former-commit-id: 7221b94904 [formerly 7bf0d7cd2a] [formerly 2710aed225] [formerly 7221b94904 [formerly 7bf0d7cd2a] [formerly 2710aed225] [formerly 8536f6681a [formerly 2710aed225 [formerly 2bac6ff5e600218f61343a7dc0f540c27f291924]]]]
Former-commit-id: 8536f6681a
Former-commit-id: b43a6418c7 [formerly f5810478ef] [formerly 10bd606cc6bf2a29f554ff34922524754debf4cf [formerly 3ddebb2170]]
Former-commit-id: 508ea1dcd7bc0ca2f7c09a313763aafa791fb985 [formerly 288db1aea0]
Former-commit-id: 94cf9816c7
2014-08-27 16:27:40 -05:00
Roger Ferrel
1b663590b4 Omaha #3567 Merge conflict VbSources.xml changes placed in volume.xml.
Former-commit-id: 2944c3770f [formerly 0147449477] [formerly fa42c4069a] [formerly 2944c3770f [formerly 0147449477] [formerly fa42c4069a] [formerly 9154ef60bb [formerly fa42c4069a [formerly 474e07b299246aee4e6b214226c176c4a10aa866]]]]
Former-commit-id: 9154ef60bb
Former-commit-id: db74982258 [formerly 17a8bd795d] [formerly 9c8c9bee1d8c31a829aaaca5968d61664e6d90fe [formerly 63a1b2890b]]
Former-commit-id: 5974e03bca22ea6311652bc9faaa322fe570944a [formerly 6e695a12d1]
Former-commit-id: 87b0200274
2014-08-27 15:06:52 -05:00
Brian.Dyke
2da6c7b93b Merge branch 'master_14.2.4' into master_14.3.1 CM-MERGE:14.2.4-5 into 14.3.1
Conflicts:
	cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/StormTrackDisplay.java
	cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java
	cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
	edexOsgi/com.raytheon.uf.common.comm/src/com/raytheon/uf/common/comm/HttpClient.java

Former-commit-id: 0a5ddf7457 [formerly a08db8d73d] [formerly e654318431] [formerly 0a5ddf7457 [formerly a08db8d73d] [formerly e654318431] [formerly aa83bf804f [formerly e654318431 [formerly 7334d3991903dfe8a62728de33c21e81534fdbb6]]]]
Former-commit-id: aa83bf804f
Former-commit-id: 4a56b6f6e1 [formerly f90649d7e7] [formerly c580412a81e899b2803a785d3de77c4ea7ca97b3 [formerly f7f16ff9eb]]
Former-commit-id: 2b5f667a78842762d60c8ab0ba442f22b9229095 [formerly c0dc594eda]
Former-commit-id: 7e4ab705cc
2014-08-27 11:19:19 -04:00
Nate Jensen
f63011dc93 Merge "Omaha #3539 reworked link to editor action to avoid recursion warning" into omaha_14.4.1
Former-commit-id: 6a20d84a8a [formerly 697e1c0b79] [formerly 6fca563d21] [formerly 6a20d84a8a [formerly 697e1c0b79] [formerly 6fca563d21] [formerly 7acf4a04b2 [formerly 6fca563d21 [formerly bdc7d4cb7873651a4b59e0b6af9bb9dae931de77]]]]
Former-commit-id: 7acf4a04b2
Former-commit-id: 1f9c98e8c4 [formerly 783a805a8a] [formerly 1343844853810696ccafe2e8795d21ef1b7f8773 [formerly ff03dc5783]]
Former-commit-id: d1035c455860cde4dc794860a8608b437f23c688 [formerly 60b0b76d42]
Former-commit-id: ba9c46532e
2014-08-27 09:54:49 -05:00
Nate Jensen
cac6498b0f Merge "Omaha #3356 configure path manager factory before spring initialization" into omaha_14.4.1
Former-commit-id: 1ea041a01e [formerly 0edb5fc46c] [formerly 2d1d18b2ff] [formerly 1ea041a01e [formerly 0edb5fc46c] [formerly 2d1d18b2ff] [formerly 1ad37de1ef [formerly 2d1d18b2ff [formerly 93e8fb3b1b27bdce2b15397e2ee7db6f1b419a05]]]]
Former-commit-id: 1ad37de1ef
Former-commit-id: b1f76d8b6d [formerly dc09d337f2] [formerly 39d951ec78dac285126b4df9a10e17fcf4d51d7c [formerly 571ae1d09e]]
Former-commit-id: 13aaf18bc8f110c0e6efa2fd45f405582d1ff00a [formerly 376670d221]
Former-commit-id: a739387842
2014-08-27 09:54:24 -05:00
Brian Clements
392cfad0e2 Omaha #3539 reworked link to editor action to avoid recursion warning
Change-Id: Iac2e6194a3ebd5b9c828555cdbd3dc98e0b66c01

Former-commit-id: 9509568efa [formerly a39a997a8d] [formerly a609334abf] [formerly 9509568efa [formerly a39a997a8d] [formerly a609334abf] [formerly f871058f67 [formerly a609334abf [formerly dcf9ea1ef4f7a7139f6c3700c04e9f9e2fda98e3]]]]
Former-commit-id: f871058f67
Former-commit-id: 3061205a6b [formerly f179d62459] [formerly 28575adbedc1689f7fc46cd5d53fb04c3af8bd28 [formerly e02be806d0]]
Former-commit-id: 3cb76351d8871b831667f7940cd204584bb11974 [formerly aa0cdd843c]
Former-commit-id: fcb9de6bf4
2014-08-26 17:22:20 -05:00
Nate Jensen
5e714459ca Omaha #3356 configure path manager factory before spring initialization
Change-Id: I7a9a1b3aae5292129833b81b535f954cb0681e44

Former-commit-id: 4a48867a81 [formerly f84e89b694] [formerly dbbf012a34] [formerly 4a48867a81 [formerly f84e89b694] [formerly dbbf012a34] [formerly fdc4cc60b9 [formerly dbbf012a34 [formerly 263452a82aef4756492fe02156525137b5ca09ff]]]]
Former-commit-id: fdc4cc60b9
Former-commit-id: 5690db1e94 [formerly 85a17ed23f] [formerly ec90e4ec5b78799ff8c90c5659475672966cd75e [formerly 70216d11e4]]
Former-commit-id: ca13b3031bbdcc900e3e1367503501855ce76f87 [formerly cf2e6693ed]
Former-commit-id: ac5a4234cb
2014-08-26 16:45:00 -05:00