xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
33102 commits 31 branches 40 tags 3.8 GiB
Commit graph

270 commits

Author SHA1 Message Date
Sarah Pontius
56848461b3 VLab Issue #5674 - HLS/TCV Code Cleanup; fixes #5674 
Change-Id: If31b2979fb741f0e258ae0e3a1323981826b3158

Former-commit-id: 430120f6b9 [formerly 06ac198594] [formerly ff2a0aa1b1] [formerly 430120f6b9 [formerly 06ac198594] [formerly ff2a0aa1b1] [formerly 9b8bdc88d5 [formerly ff2a0aa1b1 [formerly c044f5c349b27be19c6a3ea2abcc3c2294fc07a3]]]]
Former-commit-id: 9b8bdc88d5
Former-commit-id: 4e45b4c9e4 [formerly 886bb45e9d] [formerly f2e3476aba99c281dddd7df1bbce31c6db0905db [formerly 5a81245933]]
Former-commit-id: fa9057886451cd37de2de3e8cc078d1d4d8541d7 [formerly 70441dce24]
Former-commit-id: 136fc9e73c
 2014-12-15 09:54:17 -07:00
Ron Anderson
eaa74da50f VLab Issue #4953 Added support for nwrwavestcv and sending TCV files to VTEC partners 
Change-Id: I2af1f2eaf0625ea58153ebebc1ad10bb76da52bd

Former-commit-id: 18ab45bdae51ae9971a0c5f4b4bde7afe82074d4
 2014-12-12 17:25:52 -06:00
Ron Anderson
d5dc22de4d VLab Issue #4953 Added support for nwrwavestcv and sending TCV files to VTEC partners 
Change-Id: I2af1f2eaf0625ea58153ebebc1ad10bb76da52bd

Former-commit-id: 2c99ce902a [formerly eaa74da50f [formerly 18ab45bdae51ae9971a0c5f4b4bde7afe82074d4]]
Former-commit-id: eaa74da50f
Former-commit-id: b484070ec5
 2014-12-12 17:25:52 -06:00
Ron Anderson
7f83569067 VLab Issue #4953 Added support for nwrwavestcv and sending TCV files to VTEC partners 
Change-Id: I2af1f2eaf0625ea58153ebebc1ad10bb76da52bd

Former-commit-id: d5dc22de4d [formerly b484070ec5] [formerly eaa74da50f] [formerly d5dc22de4d [formerly b484070ec5] [formerly eaa74da50f] [formerly 2c99ce902a [formerly eaa74da50f [formerly 18ab45bdae51ae9971a0c5f4b4bde7afe82074d4]]]]
Former-commit-id: 2c99ce902a
Former-commit-id: 3d25b8fe60 [formerly 5e1d0c5bf0] [formerly ceeaa6ee1557159221fb9e1fe62e8cc3c6fd220c [formerly d58727b86f]]
Former-commit-id: 652904a04ce10958f83eb5ef1fc61d246678b12a [formerly beb3ac8e96]
Former-commit-id: 42d831463e
 2014-12-12 17:25:52 -06:00
David Gillingham
ce624f01ce Omaha #3885: Fix purging of practice VTECproducts when submitted in simulated time. 
Change-Id: I5c4afa6ab0faf975388a25916d6616ce9eb05098

Former-commit-id: 9cb76fd96e [formerly 02af20bcd9] [formerly a41cc32a40] [formerly 9cb76fd96e [formerly 02af20bcd9] [formerly a41cc32a40] [formerly ae5a0f55d1 [formerly a41cc32a40 [formerly 35ae2af301ec8b66a65e1564c17f6e3f8d7623d2]]]]
Former-commit-id: ae5a0f55d1
Former-commit-id: 1af96e36d1 [formerly 4ed1f30c04] [formerly 08b71952d6e6c885679d68ca5e4be1842ba7121d [formerly 877d75d520]]
Former-commit-id: 370f40656933b4002543d0bf32ffe406cc0db28c [formerly cb407d5749]
Former-commit-id: 64e7bcd723
 2014-12-09 11:21:29 -06:00
David Gillingham
a41cc32a40 Omaha #3885: Fix purging of practice VTECproducts when submitted in simulated time. 
Change-Id: I5c4afa6ab0faf975388a25916d6616ce9eb05098

Former-commit-id: 35ae2af301ec8b66a65e1564c17f6e3f8d7623d2
 2014-12-09 11:21:29 -06:00
David Gillingham
9cb76fd96e Omaha #3885: Fix purging of practice VTECproducts when submitted in simulated time. 
Change-Id: I5c4afa6ab0faf975388a25916d6616ce9eb05098

Former-commit-id: ae5a0f55d1 [formerly a41cc32a40 [formerly 35ae2af301ec8b66a65e1564c17f6e3f8d7623d2]]
Former-commit-id: a41cc32a40
Former-commit-id: 02af20bcd9
 2014-12-09 11:21:29 -06:00
David Gillingham
b962e8140c Omaha #3885: Fix build. 
Change-Id: I753a13c74dfb4e477e6a342c28b4edaf18169b3f

Former-commit-id: 9deccef957 [formerly 26b92860af] [formerly b9fe617d57] [formerly 9deccef957 [formerly 26b92860af] [formerly b9fe617d57] [formerly 9c7eff77f6 [formerly b9fe617d57 [formerly ce395804bdc86e1ea485794a0af3f931c83f3cfa]]]]
Former-commit-id: 9c7eff77f6
Former-commit-id: 121cead36f [formerly bc993fd5f3] [formerly 97671069de6903eb3920bbe221c7c964170f360e [formerly 5714cf8dac]]
Former-commit-id: 607352eedf733769d7f2ca4d4050232980d6d0d4 [formerly bd06453882]
Former-commit-id: e9421cc1cc
 2014-12-04 17:00:00 -06:00
David Gillingham
b9fe617d57 Omaha #3885: Fix build. 
Change-Id: I753a13c74dfb4e477e6a342c28b4edaf18169b3f

Former-commit-id: ce395804bdc86e1ea485794a0af3f931c83f3cfa
 2014-12-04 17:00:00 -06:00
David Gillingham
9deccef957 Omaha #3885: Fix build. 
Change-Id: I753a13c74dfb4e477e6a342c28b4edaf18169b3f

Former-commit-id: 9c7eff77f6 [formerly b9fe617d57 [formerly ce395804bdc86e1ea485794a0af3f931c83f3cfa]]
Former-commit-id: b9fe617d57
Former-commit-id: 26b92860af
 2014-12-04 17:00:00 -06:00
Ron Anderson
f36b33c861 Merge "Omaha #3885: Merge VTEC route and request changes from VLab." into omaha_14.4.1 
Former-commit-id: 93bce63af0 [formerly c4d27803cc] [formerly d7e0d21d27] [formerly 93bce63af0 [formerly c4d27803cc] [formerly d7e0d21d27] [formerly e0b9900a50 [formerly d7e0d21d27 [formerly 401356d7917aaf84c5ea5c8f92ca32c270d5790a]]]]
Former-commit-id: e0b9900a50
Former-commit-id: 3626308337 [formerly 9e61a12c32] [formerly 7b7ed77b3d303a507d33f7ce0a70e23c09e2bcc3 [formerly 3d7d560a9e]]
Former-commit-id: f8e171ed3d656e176b11c8d8b1b11a7350cf8d4a [formerly c34aa4047a]
Former-commit-id: 3d87784ba6
 2014-12-04 15:44:46 -06:00
Ron Anderson
d7e0d21d27 Merge "Omaha #3885: Merge VTEC route and request changes from VLab." into omaha_14.4.1 
Former-commit-id: 401356d7917aaf84c5ea5c8f92ca32c270d5790a
 2014-12-04 15:44:46 -06:00
Ron Anderson
93bce63af0 Merge "Omaha #3885: Merge VTEC route and request changes from VLab." into omaha_14.4.1 
Former-commit-id: e0b9900a50 [formerly d7e0d21d27 [formerly 401356d7917aaf84c5ea5c8f92ca32c270d5790a]]
Former-commit-id: d7e0d21d27
Former-commit-id: c4d27803cc
 2014-12-04 15:44:46 -06:00
Ron Anderson
fc646cac5f Omaha #3885: Merge VTEC route and request changes from VLab. 
Original Ticket: VLab Issue #4953 Added support for managing JSON files in practice mode.

Change-Id: I5ec7c695866554e6209b0c15f6dbe1a460d9d7d9

Former-commit-id: 285330ccd0 [formerly fd25fe9efc] [formerly 5169e7181f] [formerly 285330ccd0 [formerly fd25fe9efc] [formerly 5169e7181f] [formerly 2417d5a2a7 [formerly 5169e7181f [formerly 16e32018de233fb128a7518415b84e032074932f]]]]
Former-commit-id: 2417d5a2a7
Former-commit-id: 473b43b9b1 [formerly 2d30089bbe] [formerly 788730bef7f71d13854f760c267da1fe594997e1 [formerly a882a8f0d1]]
Former-commit-id: d8744e8de956fd3233931333e732b3ff980725c7 [formerly 89ce99fde1]
Former-commit-id: 3be3ae232b
 2014-12-04 10:01:18 -06:00
Ron Anderson
5169e7181f Omaha #3885: Merge VTEC route and request changes from VLab. 
Original Ticket: VLab Issue #4953 Added support for managing JSON files in practice mode.

Change-Id: I5ec7c695866554e6209b0c15f6dbe1a460d9d7d9

Former-commit-id: 16e32018de233fb128a7518415b84e032074932f
 2014-12-04 10:01:18 -06:00
Ron Anderson
285330ccd0 Omaha #3885: Merge VTEC route and request changes from VLab. 
Original Ticket: VLab Issue #4953 Added support for managing JSON files in practice mode.

Change-Id: I5ec7c695866554e6209b0c15f6dbe1a460d9d7d9

Former-commit-id: 2417d5a2a7 [formerly 5169e7181f [formerly 16e32018de233fb128a7518415b84e032074932f]]
Former-commit-id: 5169e7181f
Former-commit-id: fd25fe9efc
 2014-12-04 10:01:18 -06:00
Nate Jensen
ad2a20dd43 Omaha #3549 remove jdt prefs for faster builds 
Change-Id: I82156718a52c37adecc8260fa40a2b0d93453b29

Former-commit-id: effb6c68bf [formerly 6c1391e938] [formerly ec28d2f1a0] [formerly effb6c68bf [formerly 6c1391e938] [formerly ec28d2f1a0] [formerly 8dbe6abbe4 [formerly ec28d2f1a0 [formerly 3ba611e111585d2aa9cd9f647687fedb794077f7]]]]
Former-commit-id: 8dbe6abbe4
Former-commit-id: 3202b579c1 [formerly 1c5057a13f] [formerly fe8f15a6cf651b03c628440d9b584168f73a916a [formerly 291de3f039]]
Former-commit-id: 62ac51e4fd5ddf96d1a40756fde9b064052645f9 [formerly e53063661e]
Former-commit-id: 0bb18f02d0
 2014-12-03 15:47:10 -06:00
Nate Jensen
ec28d2f1a0 Omaha #3549 remove jdt prefs for faster builds 
Change-Id: I82156718a52c37adecc8260fa40a2b0d93453b29

Former-commit-id: 3ba611e111585d2aa9cd9f647687fedb794077f7
 2014-12-03 15:47:10 -06:00
Nate Jensen
effb6c68bf Omaha #3549 remove jdt prefs for faster builds 
Change-Id: I82156718a52c37adecc8260fa40a2b0d93453b29

Former-commit-id: 8dbe6abbe4 [formerly ec28d2f1a0 [formerly 3ba611e111585d2aa9cd9f647687fedb794077f7]]
Former-commit-id: ec28d2f1a0
Former-commit-id: 6c1391e938
 2014-12-03 15:47:10 -06:00
Shawn Hooper
b7369c5eef VLab Issue #5395 - Build fixes and gfeConfig.py update 
Change-Id: I94c02a82c7305dc9eb7d31bc941e6e7b0e4a7ba1

Former-commit-id: 94093accc4b2adc4c12cea0a3af0e037c1be52d8
 2014-11-20 13:12:16 -05:00
Shawn Hooper
c3da295cf3 VLab Issue #5395 - Build fixes and gfeConfig.py update 
Change-Id: I94c02a82c7305dc9eb7d31bc941e6e7b0e4a7ba1

Former-commit-id: cf72b5753d [formerly b7369c5eef [formerly 94093accc4b2adc4c12cea0a3af0e037c1be52d8]]
Former-commit-id: b7369c5eef
Former-commit-id: fd57e5334c
 2014-11-20 13:12:16 -05:00
Shawn Hooper
a3014a223e VLab Issue #5395 - Build fixes and gfeConfig.py update 
Change-Id: I94c02a82c7305dc9eb7d31bc941e6e7b0e4a7ba1

Former-commit-id: c3da295cf3 [formerly fd57e5334c] [formerly b7369c5eef] [formerly c3da295cf3 [formerly fd57e5334c] [formerly b7369c5eef] [formerly cf72b5753d [formerly b7369c5eef [formerly 94093accc4b2adc4c12cea0a3af0e037c1be52d8]]]]
Former-commit-id: cf72b5753d
Former-commit-id: 2647d0da64 [formerly 2f954d65be] [formerly 39d76acba63995c628c757a8a56e7c28e05a4d50 [formerly 330eae9f9e]]
Former-commit-id: f1c2f8e69948210053dc249a42decc8b5669cf29 [formerly b6d1f3aef4]
Former-commit-id: 6699c18a7a
 2014-11-20 13:12:16 -05:00
Ron Anderson
bb451e58c3 VLab Issue #4953 Added support for managing JSON files in practice mode. 
Change-Id: I081a11bd2ed9370c32354a0c5728400561f3d7f8

Former-commit-id: e8ac81c5850b8565ea1e375857cf9dfe531848a0
 2014-11-19 11:31:49 -06:00
Ron Anderson
fdafc8c3b8 VLab Issue #4953 Added support for managing JSON files in practice mode. 
Change-Id: I081a11bd2ed9370c32354a0c5728400561f3d7f8

Former-commit-id: 9104023408 [formerly bb451e58c3 [formerly e8ac81c5850b8565ea1e375857cf9dfe531848a0]]
Former-commit-id: bb451e58c3
Former-commit-id: f88fc45470
 2014-11-19 11:31:49 -06:00
Ron Anderson
23d7015eb2 VLab Issue #4953 Added support for managing JSON files in practice mode. 
Change-Id: I081a11bd2ed9370c32354a0c5728400561f3d7f8

Former-commit-id: fdafc8c3b8 [formerly f88fc45470] [formerly bb451e58c3] [formerly fdafc8c3b8 [formerly f88fc45470] [formerly bb451e58c3] [formerly 9104023408 [formerly bb451e58c3 [formerly e8ac81c5850b8565ea1e375857cf9dfe531848a0]]]]
Former-commit-id: 9104023408
Former-commit-id: 72073e44f9 [formerly 72e6e56c75] [formerly 7575086267f0b679d25c7ca7a24f93f60054d83f [formerly 0991f722ec]]
Former-commit-id: 7a214bf60ae669a1c2166e4b8ff504ab452a6ac8 [formerly 2e14733f66]
Former-commit-id: 727b5f7c57
 2014-11-19 11:31:49 -06:00
Steve Harris
cf73096716 Merge tag 'OB_14.3.1-24m' into omaha_14.4.1 
Former-commit-id: 53dc9657e2 [formerly 06a27b2d3c] [formerly 39c5e9c314] [formerly 53dc9657e2 [formerly 06a27b2d3c] [formerly 39c5e9c314] [formerly 2db03d95b3 [formerly 39c5e9c314 [formerly df9ef1f664e14fa7843328338c5b234022f4bfd4]]]]
Former-commit-id: 2db03d95b3
Former-commit-id: ca63a8cfc3 [formerly bcf1265a16] [formerly 4363db305e76ae3a50e019f510a7b919ebc7230e [formerly 3542caf090]]
Former-commit-id: 0522d4db8f9331e9bfd83cc7147290634159c673 [formerly cfd49c8ca0]
Former-commit-id: afd3d3fa2d
 2014-10-06 13:57:59 -05:00
Steve Harris
39c5e9c314 Merge tag 'OB_14.3.1-24m' into omaha_14.4.1 
Former-commit-id: df9ef1f664e14fa7843328338c5b234022f4bfd4
 2014-10-06 13:57:59 -05:00
Steve Harris
53dc9657e2 Merge tag 'OB_14.3.1-24m' into omaha_14.4.1 
Former-commit-id: 2db03d95b3 [formerly 39c5e9c314 [formerly df9ef1f664e14fa7843328338c5b234022f4bfd4]]
Former-commit-id: 39c5e9c314
Former-commit-id: 06a27b2d3c
 2014-10-06 13:57:59 -05:00
Brian.Dyke
18c69d87e2 Merge branch 'field_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1 
Former-commit-id: d1c62c3542 [formerly d4888adc0f] [formerly f47840e4d9] [formerly d1c62c3542 [formerly d4888adc0f] [formerly f47840e4d9] [formerly 2ac30f6c22 [formerly f47840e4d9 [formerly ece734cb6218a80fa2dda1b3c43673dc5a31bfbb]]]]
Former-commit-id: 2ac30f6c22
Former-commit-id: 75ac4f1971 [formerly 277b6e4b36] [formerly 93329339083b58eea30cf9a2fd0c9efc1645f3bb [formerly 36d377e08d]]
Former-commit-id: 99779fb5c1561694dd3f154813fbc624081344ca [formerly 7e465baead]
Former-commit-id: c853463f73
 2014-10-02 10:24:04 -04:00
Brian.Dyke
f47840e4d9 Merge branch 'field_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1 
Former-commit-id: ece734cb6218a80fa2dda1b3c43673dc5a31bfbb
 2014-10-02 10:24:04 -04:00
Brian.Dyke
d1c62c3542 Merge branch 'field_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1 
Former-commit-id: 2ac30f6c22 [formerly f47840e4d9 [formerly ece734cb6218a80fa2dda1b3c43673dc5a31bfbb]]
Former-commit-id: f47840e4d9
Former-commit-id: d4888adc0f
 2014-10-02 10:24:04 -04:00
Ana Rivera
b998ff6c60 VLab Issue #4669 - Add Beach Hazards Statement (RM 13467); fixes #4669 
Change-Id: I54c1055b87b7bfab0a35fd391c6ef7156fc3d297

Former-commit-id: 17f629b3b6 [formerly bb533d9ddd] [formerly 535f254357] [formerly 17f629b3b6 [formerly bb533d9ddd] [formerly 535f254357] [formerly 9a0e9b17f4 [formerly 535f254357 [formerly 2c16492202230dcbec93cf390b47f400a77a545e]]]]
Former-commit-id: 9a0e9b17f4
Former-commit-id: e235d5efc4 [formerly 70b0854582] [formerly 295afcefb1cb17b8654bbfb3fe5f051e920923a7 [formerly ed7119ed4e]]
Former-commit-id: 770a06aad40acdd9dfd02319dbf7408bff8daca3 [formerly 42a6d22008]
Former-commit-id: f4714fb5d4
 2014-09-24 20:11:29 +00:00
Ana Rivera
535f254357 VLab Issue #4669 - Add Beach Hazards Statement (RM 13467); fixes #4669 
Change-Id: I54c1055b87b7bfab0a35fd391c6ef7156fc3d297

Former-commit-id: 2c16492202230dcbec93cf390b47f400a77a545e
 2014-09-24 20:11:29 +00:00
Ana Rivera
17f629b3b6 VLab Issue #4669 - Add Beach Hazards Statement (RM 13467); fixes #4669 
Change-Id: I54c1055b87b7bfab0a35fd391c6ef7156fc3d297

Former-commit-id: 9a0e9b17f4 [formerly 535f254357 [formerly 2c16492202230dcbec93cf390b47f400a77a545e]]
Former-commit-id: 535f254357
Former-commit-id: bb533d9ddd
 2014-09-24 20:11:29 +00:00
Max Schenkelberg
3fe9b3a357 Omaha #3541 Updated A2 baseline to reflect request service split 
Change-Id: Iaa540397b6723a61841d93baf655be87701d9c93

Former-commit-id: 0419aeea52 [formerly 88ea402947] [formerly 896e353950] [formerly 0419aeea52 [formerly 88ea402947] [formerly 896e353950] [formerly e90bdb6fce [formerly 896e353950 [formerly e6b16ea30563c0afdd48822e8efc9faabadef8f0]]]]
Former-commit-id: e90bdb6fce
Former-commit-id: 9da9d7fe27 [formerly ee4d9a965c] [formerly 2cd1dab291464f00d51c5d42351d92f81defb05b [formerly 68221174c4]]
Former-commit-id: e6903f6858697e0f9f7137372b3aac308d58ed18 [formerly e864d8a275]
Former-commit-id: 395dcaa255
 2014-08-22 13:15:42 -05:00
Max Schenkelberg
896e353950 Omaha #3541 Updated A2 baseline to reflect request service split 
Change-Id: Iaa540397b6723a61841d93baf655be87701d9c93

Former-commit-id: e6b16ea30563c0afdd48822e8efc9faabadef8f0
 2014-08-22 13:15:42 -05:00
Max Schenkelberg
0419aeea52 Omaha #3541 Updated A2 baseline to reflect request service split 
Change-Id: Iaa540397b6723a61841d93baf655be87701d9c93

Former-commit-id: e90bdb6fce [formerly 896e353950 [formerly e6b16ea30563c0afdd48822e8efc9faabadef8f0]]
Former-commit-id: 896e353950
Former-commit-id: 88ea402947
 2014-08-22 13:15:42 -05:00
Ron Anderson
8a6c65946f Omaha #3157 Fix merge issue in ActiveTable.py 
Change-Id: I39550855a413791beb2e02c536f9bdfdf80ff514

Former-commit-id: 9feb625df5 [formerly 49988ea258] [formerly 6393d231e1] [formerly 9feb625df5 [formerly 49988ea258] [formerly 6393d231e1] [formerly 0f20f6d251 [formerly 6393d231e1 [formerly 295f52411e700afddc04390b7016e627d7c676bd]]]]
Former-commit-id: 0f20f6d251
Former-commit-id: d78ba7e113 [formerly bdf078f597] [formerly 33fe841269626c5ccfc4f334fa83c0fa3b4ca4eb [formerly 16a4e017b3]]
Former-commit-id: 2c5b9098e8bd16886a1d36370125fffc1bce017c [formerly 2e1bfdb05d]
Former-commit-id: 71bc965ad5
 2014-08-06 09:59:14 -05:00
Ron Anderson
6393d231e1 Omaha #3157 Fix merge issue in ActiveTable.py 
Change-Id: I39550855a413791beb2e02c536f9bdfdf80ff514

Former-commit-id: 295f52411e700afddc04390b7016e627d7c676bd
 2014-08-06 09:59:14 -05:00
Ron Anderson
9feb625df5 Omaha #3157 Fix merge issue in ActiveTable.py 
Change-Id: I39550855a413791beb2e02c536f9bdfdf80ff514

Former-commit-id: 0f20f6d251 [formerly 6393d231e1 [formerly 295f52411e700afddc04390b7016e627d7c676bd]]
Former-commit-id: 6393d231e1
Former-commit-id: 49988ea258
 2014-08-06 09:59:14 -05:00
Steve Harris
8bce1903ec Merge branch 'omaha_14.3.1' into omaha_14.4.1 
Conflicts:
	cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/Cities.xml
	cave/com.raytheon.uf.viz.core.maps/src/com/raytheon/uf/viz/core/maps/scales/MapScalesManager.java
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/alarmalert/dialogs/AlarmDisplayWindow.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/alarmalert/dialogs/CurrentAlarmQueue.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParmManager.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/D2DGridDatabase.java
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/util/GribModelLookup.java
	edexOsgi/com.raytheon.edex.utilitysrv/src/com/raytheon/edex/services/LocalizationStreamHandler.java
	edexOsgi/com.raytheon.uf.edex.activetable/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java
	edexOsgi/com.raytheon.uf.edex.activetable/utility/common_static/base/vtec/ActiveTable.py

Former-commit-id: d606269c5b [formerly a92dc418c6] [formerly 0fb743ec44] [formerly d606269c5b [formerly a92dc418c6] [formerly 0fb743ec44] [formerly bf9a0fa5de [formerly 0fb743ec44 [formerly f7d474895366eb23ae5eef242a4568f911435aa3]]]]
Former-commit-id: bf9a0fa5de
Former-commit-id: 386dfebe65 [formerly b848e05aa1] [formerly af44a55101128b715bc6595cfc378e8fcdc2eb3d [formerly 46fe792d83]]
Former-commit-id: 5636830e013729a270565af661d066aa2f000390 [formerly 5e2f7a9f74]
Former-commit-id: a0fdc76880
 2014-08-04 22:20:29 -05:00
Steve Harris
0fb743ec44 Merge branch 'omaha_14.3.1' into omaha_14.4.1 
Conflicts:
	cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/Cities.xml
	cave/com.raytheon.uf.viz.core.maps/src/com/raytheon/uf/viz/core/maps/scales/MapScalesManager.java
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/alarmalert/dialogs/AlarmDisplayWindow.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/alarmalert/dialogs/CurrentAlarmQueue.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParmManager.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/D2DGridDatabase.java
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/util/GribModelLookup.java
	edexOsgi/com.raytheon.edex.utilitysrv/src/com/raytheon/edex/services/LocalizationStreamHandler.java
	edexOsgi/com.raytheon.uf.edex.activetable/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java
	edexOsgi/com.raytheon.uf.edex.activetable/utility/common_static/base/vtec/ActiveTable.py

Former-commit-id: f7d474895366eb23ae5eef242a4568f911435aa3
 2014-08-04 22:20:29 -05:00
Steve Harris
d606269c5b Merge branch 'omaha_14.3.1' into omaha_14.4.1 
Conflicts:
	cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/Cities.xml
	cave/com.raytheon.uf.viz.core.maps/src/com/raytheon/uf/viz/core/maps/scales/MapScalesManager.java
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/alarmalert/dialogs/AlarmDisplayWindow.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/alarmalert/dialogs/CurrentAlarmQueue.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParmManager.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/D2DGridDatabase.java
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/util/GribModelLookup.java
	edexOsgi/com.raytheon.edex.utilitysrv/src/com/raytheon/edex/services/LocalizationStreamHandler.java
	edexOsgi/com.raytheon.uf.edex.activetable/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java
	edexOsgi/com.raytheon.uf.edex.activetable/utility/common_static/base/vtec/ActiveTable.py

Former-commit-id: bf9a0fa5de [formerly 0fb743ec44 [formerly f7d474895366eb23ae5eef242a4568f911435aa3]]
Former-commit-id: 0fb743ec44
Former-commit-id: a92dc418c6
 2014-08-04 22:20:29 -05:00
Brian.Dyke
1d9494a502 Merge branch 'master_14.2.2' into master_14.3.1 CM-MERGE:14.2.2-17,-18,-19,-20,-21,-22,-23,-24 into 14.3.1 
Conflicts:
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/RadarBiasTableDialog.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
	edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
	edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java

Former-commit-id: 590e37a8f2 [formerly 301f3094be] [formerly 9abb02ea8a] [formerly 590e37a8f2 [formerly 301f3094be] [formerly 9abb02ea8a] [formerly 270d2b0ddb [formerly 9abb02ea8a [formerly b209604e1f0d6e790980d0bc8f1760e38f448076]]]]
Former-commit-id: 270d2b0ddb
Former-commit-id: b9da27608c [formerly bbe6ec4d50] [formerly 4f6e23e0fe3a5044b75abe6a89c965ab32b19947 [formerly 37aacfcb96]]
Former-commit-id: ea25ca2fdedff8bbe1c901d0538886147f633e65 [formerly b9daa26f7d]
Former-commit-id: 803ceadaec
 2014-08-04 13:10:13 -04:00
Brian.Dyke
9abb02ea8a Merge branch 'master_14.2.2' into master_14.3.1 CM-MERGE:14.2.2-17,-18,-19,-20,-21,-22,-23,-24 into 14.3.1 
Conflicts:
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/RadarBiasTableDialog.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
	edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
	edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java

Former-commit-id: b209604e1f0d6e790980d0bc8f1760e38f448076
 2014-08-04 13:10:13 -04:00
Brian.Dyke
590e37a8f2 Merge branch 'master_14.2.2' into master_14.3.1 CM-MERGE:14.2.2-17,-18,-19,-20,-21,-22,-23,-24 into 14.3.1 
Conflicts:
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/RadarBiasTableDialog.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
	edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
	edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java

Former-commit-id: 270d2b0ddb [formerly 9abb02ea8a [formerly b209604e1f0d6e790980d0bc8f1760e38f448076]]
Former-commit-id: 9abb02ea8a
Former-commit-id: 301f3094be
 2014-08-04 13:10:13 -04:00
Steve Harris
908e6e908b Merge branch 'master_14.1.3' into master_14.2.2 
Conflicts:
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/WclInfo.java
	edexOsgi/com.raytheon.uf.edex.activetable/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java

Former-commit-id: 070e025fb4 [formerly 4882158177] [formerly 483a69c58d] [formerly 070e025fb4 [formerly 4882158177] [formerly 483a69c58d] [formerly fcecd75dfd [formerly 483a69c58d [formerly f947df2bf87c0df3e461be5c6dd72e13a0743f61]]]]
Former-commit-id: fcecd75dfd
Former-commit-id: 8d6e807936 [formerly c59b92895c] [formerly 0931821f4ace5f034c8b87a9d38c16b0b9763945 [formerly 29c2cc0c29]]
Former-commit-id: 03a3c04cf900c39d9298620704be5b5397111cbe [formerly 998c9a4084]
Former-commit-id: 984b7b1df4
 2014-07-01 18:05:43 -05:00
Steve Harris
483a69c58d Merge branch 'master_14.1.3' into master_14.2.2 
Conflicts:
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/WclInfo.java
	edexOsgi/com.raytheon.uf.edex.activetable/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java

Former-commit-id: f947df2bf87c0df3e461be5c6dd72e13a0743f61
 2014-07-01 18:05:43 -05:00
Steve Harris
070e025fb4 Merge branch 'master_14.1.3' into master_14.2.2 
Conflicts:
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/WclInfo.java
	edexOsgi/com.raytheon.uf.edex.activetable/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java

Former-commit-id: fcecd75dfd [formerly 483a69c58d [formerly f947df2bf87c0df3e461be5c6dd72e13a0743f61]]
Former-commit-id: 483a69c58d
Former-commit-id: 4882158177
 2014-07-01 18:05:43 -05:00
Ron Anderson
26df246878 Omaha #3296 A few more minor performance tweaks and some addtional logging. 
Change-Id: Iab603f6f7420a11c5c5cae82df7ebb96f66b0945
(cherry picked from commit 9e6a14877578177e4cfb0c5698097750bde6f280)

Former-commit-id: 319819d3a7 [formerly c7a74ab5b1] [formerly 2c5f910f90] [formerly 319819d3a7 [formerly c7a74ab5b1] [formerly 2c5f910f90] [formerly 4123073c4e [formerly 2c5f910f90 [formerly a0384ccfb30a877f14893c6cfa62d92117c0bb87]]]]
Former-commit-id: 4123073c4e
Former-commit-id: 9210f3a55d [formerly 0329b4d8f4] [formerly 0e147fb71ca969d1fc46cffd1962c97ca7cece30 [formerly 892eb70952]]
Former-commit-id: 05ef0d1dfd0a62197a13dc4c5614043584e047f3 [formerly bb91362572]
Former-commit-id: ac6b3b0b10
 2014-07-01 13:56:41 -04:00