Commit graph

3098 commits

Author SHA1 Message Date
Bryan Kowal
eb05558a87 Issue #2198 - created a launcher that would start both AlertViz and CAVE; no extra windows are created now
- Note: VizLauncher and AWIPSII.CAVE are NOT Eclipse projects.


Former-commit-id: 3e9c78b9e0 [formerly 013ba62af1] [formerly a1fccaa598] [formerly 3e9c78b9e0 [formerly 013ba62af1] [formerly a1fccaa598] [formerly 21cfeb1b83 [formerly a1fccaa598 [formerly c1c6cd087a493f052a66fbc6e7b608cd959f7905]]]]
Former-commit-id: 21cfeb1b83
Former-commit-id: c350450024 [formerly eec811c3b1] [formerly 28e6522f39684a2c80f4e36f7968404f94210af4 [formerly 6cf776926c]]
Former-commit-id: d4152ca5536158bbd4ab18c8cc1af71b6f8ede23 [formerly 433efe1982]
Former-commit-id: 8503422d36
2013-08-20 13:56:07 -05:00
Bryan Kowal
16ecdfdda1 Issue #2213 - create the primary and backup exportgrids directories for GFESuite
- Amend: no longer create the exportgrids tmp directory

Change-Id: Id8aba47244c21d2d7e114ac1af6a29b9a8cd7059

Former-commit-id: 03d1bd1125 [formerly 684c350d12] [formerly 72a841bcd5] [formerly 03d1bd1125 [formerly 684c350d12] [formerly 72a841bcd5] [formerly d58a720e38 [formerly 72a841bcd5 [formerly d3736e2b8d83616f0a7c35475c5a552fdae79674]]]]
Former-commit-id: d58a720e38
Former-commit-id: ac9eca6b38 [formerly 525ec05c44] [formerly 8a827404f7416c90d5e45663d6ac8815023e4167 [formerly e3b8567548]]
Former-commit-id: 6dc54ef383e90ac8a0d87414ca638bdc0440d6b3 [formerly 90be457e49]
Former-commit-id: cafb0da888
2013-08-20 11:43:18 -05:00
Ben Steffensmeier
ab2e5885a4 Issue #2275 Add dataURI column back into bufrmos types.
Former-commit-id: c444a0c4ba [formerly d6ab7d08be] [formerly 4cb853ac39] [formerly c444a0c4ba [formerly d6ab7d08be] [formerly 4cb853ac39] [formerly 9219db0069 [formerly 4cb853ac39 [formerly 1b883da972ac915252c256b63c881d23121f3ac6]]]]
Former-commit-id: 9219db0069
Former-commit-id: fbf165f37f [formerly 3a8893846f] [formerly ababd150fc882dda0dca13854e3bf316e1aafa9b [formerly 8b9031719a]]
Former-commit-id: 620c37f476535c8ffd732b686b071649639a0a93 [formerly 7668fdbde7]
Former-commit-id: 02d3f28c06
2013-08-19 16:00:01 -05:00
Steve Harris
83e6985e1d Merge branch 'omaha_13.5.1' into omaha_13.5.2
Former-commit-id: 7064944bd4 [formerly 9d07ebdab6] [formerly bc8af6e701] [formerly 7064944bd4 [formerly 9d07ebdab6] [formerly bc8af6e701] [formerly dc44ca76fb [formerly bc8af6e701 [formerly ab28f86a23e1c8b83204f57da9b8e7bd15cafe98]]]]
Former-commit-id: dc44ca76fb
Former-commit-id: 61b0c9828a [formerly 703a110473] [formerly 3bff77e7ca1b42280f9bcc3367fa82e79e831485 [formerly e03750d5f9]]
Former-commit-id: 9cb79ee3d809e5c16d17db72cc9f277e649fcc02 [formerly 3c03bff519]
Former-commit-id: f93fdf5fc2
2013-08-16 12:45:01 -05:00
Max Schenkelberg
dad1bc51a5 Issue #2189 Fixing java 6 and 7 compatibility issue in 13.5.2 branch.
Change-Id: Ia800aee8f4e027630293b074d0b7e8d93d424611

Former-commit-id: f8e36bea6f [formerly a6a44754c9] [formerly 57a0df81a6] [formerly f8e36bea6f [formerly a6a44754c9] [formerly 57a0df81a6] [formerly 9e213438f4 [formerly 57a0df81a6 [formerly 0603b0bd77a9463abaa9020bf1bcb97befd7b161]]]]
Former-commit-id: 9e213438f4
Former-commit-id: 53d4c9d9c2 [formerly 0703b5c772] [formerly e195d4590671cefaed22b31ff4f8a803d2f88877 [formerly b67a3033f9]]
Former-commit-id: 6ccb9209bae79b1c80076aabe8abaa3e4393a959 [formerly f720f78f4c]
Former-commit-id: 16232ee8c7
2013-08-15 17:36:36 -05:00
Max Schenkelberg
b64a9336a9 Issue #2255 Made TransformFactory loop to find true base crs in worldToCRS and worldToGrid.
Change-Id: I0cbb4ce0446ab4080ee0dc0f87c1de2ffc77a5a7

Former-commit-id: 54b4b759fd [formerly 5a4d880498] [formerly e85d66f4e5] [formerly 54b4b759fd [formerly 5a4d880498] [formerly e85d66f4e5] [formerly 3800aec9e6 [formerly e85d66f4e5 [formerly d132d2ec2fc296518765d78b04ed942ec246b2e0]]]]
Former-commit-id: 3800aec9e6
Former-commit-id: 39cdbf728f [formerly 352e21ffd3] [formerly ac74cfea7295b7cc3576674f8b131a9d316f9718 [formerly d89d13d029]]
Former-commit-id: 1f274d37e697e17bfbf5f890a9373463aff7810c [formerly ee68615786]
Former-commit-id: 6709242e36
2013-08-15 15:50:40 -05:00
Bryan Kowal
5e55dde47f Issue #2257 - edexBridge now uses qpid 0.18 (64-bit)
- Amend: updated for 32-bit
- Amend: close sender, session, and connection independently

Change-Id: I9b8cafbc10d81782a812e9d2d57930e859fa29a5

Former-commit-id: fac61175b6 [formerly 14fc0aba77] [formerly da29ff63f4] [formerly fac61175b6 [formerly 14fc0aba77] [formerly da29ff63f4] [formerly 431dbaeaac [formerly da29ff63f4 [formerly e8f8d498cd15855b72c170f2990fd4929eb636b2]]]]
Former-commit-id: 431dbaeaac
Former-commit-id: f2f9b319a2 [formerly 00c47b4f24] [formerly b2c86076a9640772277bd4127df600a8866f4e44 [formerly 7c3c19f794]]
Former-commit-id: acb4842f21cb13e49ecde160efc7cadf572415ef [formerly 36c1e6cff3]
Former-commit-id: e359fa1588
2013-08-15 14:30:55 -05:00
Max Schenkelberg
c451c3f485 Issue #2189 Added a FontType option when initializing a font from a file.
Change-Id: I54973b7c380b1535dd1e1f7fb49fd0b74b3d1752
Amend: Added abstract awt font class, deprecated initializeFont not specifying FontType, added comments

Former-commit-id: 59f3945002 [formerly b07ed474e3] [formerly eab65aab5a] [formerly 59f3945002 [formerly b07ed474e3] [formerly eab65aab5a] [formerly 570266eb7b [formerly eab65aab5a [formerly 473421a32f7c53453db1c5331714204a89bad4da]]]]
Former-commit-id: 570266eb7b
Former-commit-id: 43fc7e0b43 [formerly 72fbe0208e] [formerly 3b2d7d1617ff2d360cb22f44c042b38c9fe3c5e3 [formerly 5840d99a95]]
Former-commit-id: 4a47963fe5b1b33e65906b17daec7ec70eb5b3d1 [formerly 4191582186]
Former-commit-id: b75d942133
2013-08-15 13:51:07 -05:00
Steve Harris
a352190ff4 Merge branch 'omaha_13.5.1' into omaha_13.5.2
Former-commit-id: b9fbfe4b48 [formerly dfee8ca5d9] [formerly 67f7a8db62] [formerly b9fbfe4b48 [formerly dfee8ca5d9] [formerly 67f7a8db62] [formerly 282577d168 [formerly 67f7a8db62 [formerly cfd93a48150e8c559622e806e98362a51f19aee0]]]]
Former-commit-id: 282577d168
Former-commit-id: 1c79df1f15 [formerly 1b31d1d62f] [formerly 458c6230be297d0d6293dff70ec0b5b8c49bc0db [formerly 877d672852]]
Former-commit-id: 8c36f86a999a226bbf1b5e8b218ddf81d53962ad [formerly 850d0d54c6]
Former-commit-id: 7d10f18ae8
2013-08-15 12:55:24 -05:00
Steve Harris
adaa30e7f5 Merge branch 'master_13.5.1' into omaha_13.5.1
Former-commit-id: 8f0b0c1514 [formerly 08b105a492] [formerly 727eba03b9] [formerly 8f0b0c1514 [formerly 08b105a492] [formerly 727eba03b9] [formerly a687da6075 [formerly 727eba03b9 [formerly 85cde5da231741012e611250a5c3490467aeef1b]]]]
Former-commit-id: a687da6075
Former-commit-id: 27a5acb143 [formerly e5c50ad0b6] [formerly d74946ee629b4883a0e073d9f37dae4d8ca4ed97 [formerly 522867f068]]
Former-commit-id: 86cceeaa9d516d6e56a58f9f4e08ab3f2b3ad1c3 [formerly 08a7c0831f]
Former-commit-id: f8442ee983
2013-08-15 12:46:48 -05:00
Steve Harris
ca5109f3d6 13.5.1-16 baseline
Former-commit-id: 47130c98a5 [formerly 6818d80085] [formerly cd3b63d961] [formerly 47130c98a5 [formerly 6818d80085] [formerly cd3b63d961] [formerly 7ce0234d76 [formerly cd3b63d961 [formerly 2fcbcde58066c18ab423c94c37f446ab5e7f42da]]]]
Former-commit-id: 7ce0234d76
Former-commit-id: ca5796e082 [formerly e881ff6271] [formerly 0cee24c9ec1cc1b51da8edf9a2cdeef3b66498e1 [formerly d7b1ed4900]]
Former-commit-id: 8ac6ca8ce4a5022058bcf2cfc30b1481b8e7c987 [formerly af2b4495bb]
Former-commit-id: ff03caef3d
2013-08-15 13:40:37 -04:00
Jonathan Sanchez
04a7a8be95 Issue #2243 Resolved timing issues.
Change-Id: Ia0386bf21087cb2a00175e35ecfeae5206797a34

Former-commit-id: 6902b263e5 [formerly 78b655fd1f] [formerly 2b849d7003] [formerly 6902b263e5 [formerly 78b655fd1f] [formerly 2b849d7003] [formerly bc30396b63 [formerly 2b849d7003 [formerly 5833ecad04c31502b4e2991853e6aabeda4919f2]]]]
Former-commit-id: bc30396b63
Former-commit-id: 93efe34bc1 [formerly 19853a4b57] [formerly 702fb2f390774821e3e6340fc29892363db3d33d [formerly fca67fb4ca]]
Former-commit-id: 0f4fd7ee29ee416395f4664b305f331228350a64 [formerly dbb60f2c13]
Former-commit-id: a1dc6ac50b
2013-08-15 10:56:37 -05:00
David Gillingham
35ac7e0631 Issue #2009: Fix NullPointerException in SocketServer start up.
Change-Id: I07683ba74410234d162e058df0bb3ff6e00ee59e

Former-commit-id: bbd1a39f37 [formerly 8faf78d220] [formerly 2d6c6cdd39] [formerly bbd1a39f37 [formerly 8faf78d220] [formerly 2d6c6cdd39] [formerly 17a45cafe5 [formerly 2d6c6cdd39 [formerly 51a951bf190b7ca68121dc1630f3bc5d094b601b]]]]
Former-commit-id: 17a45cafe5
Former-commit-id: f886d99f18 [formerly 64d4ecca53] [formerly 691b2f8318eef69e3a7cb2bcf7eb3a7e6249393b [formerly db0d0374b0]]
Former-commit-id: 9370fc49f6826f65ef9379ccf0770b76927989f9 [formerly 6277627e7e]
Former-commit-id: 7729c52e6d
2013-08-14 17:13:58 -05:00
David Gillingham
982d19d1cf Issue #2009: Implement dual-domain GFE export_grids solution. Update MHS
emulator program to support new directory structure and some code cleanup and
refactoring.

Change-Id: Ib3cf5c0123cd87497517d4221edea5883db9157d

Former-commit-id: 31ae04c92a [formerly 1d3f3da9cc] [formerly 0f4f24beb8] [formerly 31ae04c92a [formerly 1d3f3da9cc] [formerly 0f4f24beb8] [formerly f8b6ec20c1 [formerly 0f4f24beb8 [formerly ad7acb2d563c79d92d84ec62405b492907191af3]]]]
Former-commit-id: f8b6ec20c1
Former-commit-id: 5205fe56a7 [formerly 3af47effc5] [formerly 2eb604c37ee47829cda515d4a57729d8b240989d [formerly 751188ab5a]]
Former-commit-id: b6b4ffccf0253f44efcf7208a528d5943d4e677e [formerly 4bd40cd544]
Former-commit-id: a2a4d1fbcf
2013-08-14 17:10:04 -05:00
Richard Peter
175d2fe542 Issue #1977: Fix merge issue with WarngenDialog
Former-commit-id: 4dc2cdd1d4 [formerly 8ba6abf642] [formerly 7c03fc955b] [formerly 4dc2cdd1d4 [formerly 8ba6abf642] [formerly 7c03fc955b] [formerly a5383dbfa4 [formerly 7c03fc955b [formerly ddfc06eb9753e893ece28e1718c5e4550e82b053]]]]
Former-commit-id: a5383dbfa4
Former-commit-id: 309c524817 [formerly c8ad0e3317] [formerly adf78ace14b85f663608aeb404baf77669836088 [formerly 951bb37cd7]]
Former-commit-id: 125b487f38e49cee304df044315c5a80d119bf32 [formerly 6ebc5d67bd]
Former-commit-id: 0e62a4243e
2013-08-14 15:33:02 -05:00
Greg Armendariz
dd226bd856 Merge "Issue #2257 - updated edex_com to use the qpid 0.18 messaging api" into omaha_13.5.1
Former-commit-id: 0578f67668 [formerly e254c838ea] [formerly f02fef09a2] [formerly 0578f67668 [formerly e254c838ea] [formerly f02fef09a2] [formerly edf12d4d4f [formerly f02fef09a2 [formerly ced372967755b611158c213011132a353b72f421]]]]
Former-commit-id: edf12d4d4f
Former-commit-id: 955f75647d [formerly c9980c9d3f] [formerly 2b69fe3f0396919408641e48b2a327350177c289 [formerly e867472bf6]]
Former-commit-id: 0bc2278639aaa107edd1eecfa6f7d2d78a36f6cb [formerly f24011d94d]
Former-commit-id: b3d6a81db2
2013-08-14 15:00:26 -05:00
Richard Peter
f48818579c Merge branch 'master_13.5.1' (13.5.1-15) into omaha_13.5.1
Conflicts:
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/FollowupData.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/util/FollowUpUtil.java
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPBasinData.java

Former-commit-id: 9ff9054d7e [formerly 2608dfe1d8] [formerly c61afa1bfa] [formerly 9ff9054d7e [formerly 2608dfe1d8] [formerly c61afa1bfa] [formerly ee6b9eb11a [formerly c61afa1bfa [formerly 87a1f8f44cbdfb9006eb5e222ae2c220c6a324b3]]]]
Former-commit-id: ee6b9eb11a
Former-commit-id: 28a53c8a33 [formerly 3f65eaf74b] [formerly 4ccbd370354ae0debc8270aa65a8ac1c72bc2ba9 [formerly 58a4aaa080]]
Former-commit-id: 7b21c6b410610be2392c1ea462eebd5eaebc5a75 [formerly 7ca1edf371]
Former-commit-id: a7075027be
2013-08-14 14:29:55 -05:00
Bryan Kowal
ddcedf0295 Issue #2257 - updated edex_com to use the qpid 0.18 messaging api
- created the new awips2-qpid-lib rpm
- removed the ldm dependendency on awips2-notification (ldm still uses qpid 0.7)
- qpid 0.7 libraries are now packaged with ldm
- Amend: update the 32-bit build configurations
- Amend: improve error handling in the EdexNotification cleanup function

Change-Id: Iee8ec98304a6b5aea0d11044dd8779d2afa100c3

Former-commit-id: 67c9cbf70e [formerly ec0ef7fe80] [formerly fc8c3f540d] [formerly 67c9cbf70e [formerly ec0ef7fe80] [formerly fc8c3f540d] [formerly 21893102bb [formerly fc8c3f540d [formerly af2882799bd08998d1321bac37beb2a7cecb4fb9]]]]
Former-commit-id: 21893102bb
Former-commit-id: f2b5128ede [formerly e76b46487c] [formerly 45802081a28e7bb32c87dfb2c52082cf8ae519fb [formerly c2c9d745af]]
Former-commit-id: 75128aa0f0442cec4e271632663b11bd8d65ef46 [formerly d083f1ae4e]
Former-commit-id: 73b3a1faa2
2013-08-14 11:21:33 -05:00
Steve Harris
a700182250 13.5.1-15 baseline
Former-commit-id: b05abcaec0 [formerly 535218c676] [formerly 53e96e21db] [formerly b05abcaec0 [formerly 535218c676] [formerly 53e96e21db] [formerly c6dc1817e7 [formerly 53e96e21db [formerly dbf9107f9c775f9a1df759bc341c0722f5fc92f2]]]]
Former-commit-id: c6dc1817e7
Former-commit-id: 6f1b6d494f [formerly 4f9288e7c1] [formerly c5d936eabd4d2eeade071aad734eb9b268940a49 [formerly 65beefde58]]
Former-commit-id: 813df6d93357ffbcdd78c9658dc75c9aaa803d60 [formerly 9ea3f0c215]
Former-commit-id: d0be6956e9
2013-08-14 10:24:26 -04:00
Steve Harris
a338706fa4 13.5.1-14 baseline
Former-commit-id: c6465a3398 [formerly b848317203] [formerly d695e5debe] [formerly c6465a3398 [formerly b848317203] [formerly d695e5debe] [formerly 80e5f7fbd4 [formerly d695e5debe [formerly fe7b1a704ee92b34684e4f9059bd61cfa28dd485]]]]
Former-commit-id: 80e5f7fbd4
Former-commit-id: 4e75333155 [formerly 9bd983e2fe] [formerly 979d519294a0cce041889e9000a739088fbe1b71 [formerly cd5b1e9e2f]]
Former-commit-id: d8f0e84b19aec7b3ded8283169da1f9631e8d68a [formerly 0f3ffc3892]
Former-commit-id: f4262380d6
2013-08-14 10:07:41 -04:00
Jonathan Sanchez
1e5c5696b5 Issue #2243 Resolved incorrect import.
Change-Id: I02e446858d36a934b9aa308a0bc2d4df3863defb

Former-commit-id: 714982e96f [formerly 52d7862d36] [formerly c6b6576f01] [formerly 714982e96f [formerly 52d7862d36] [formerly c6b6576f01] [formerly fd0f2f1c09 [formerly c6b6576f01 [formerly f79e7820ea010e0bc860b0033183147d7299221f]]]]
Former-commit-id: fd0f2f1c09
Former-commit-id: aafcbe9520 [formerly 7189057682] [formerly ea268f1966644425a392151655f4081fa9cf6ad5 [formerly 70bb266da7]]
Former-commit-id: 33471e77379cb1c3960ddea8f4ec562cbdf3eb20 [formerly 77a919a7e8]
Former-commit-id: c2e2741ad6
2013-08-13 20:47:49 -05:00
Richard Peter
a100febd89 Merge "Issue #2243 Fixed update list bugs." into omaha_13.5.1
Former-commit-id: 4dd1b27e44 [formerly 2b23cb871e] [formerly 6efc27c1b1] [formerly 4dd1b27e44 [formerly 2b23cb871e] [formerly 6efc27c1b1] [formerly d5130432a8 [formerly 6efc27c1b1 [formerly d7d87eb785c9c5e26a841503ea11fac4461b23b3]]]]
Former-commit-id: d5130432a8
Former-commit-id: 0c915ec5dc [formerly e28de494e9] [formerly 2a26f47bc2eef0af172637a67f611d6028ddb875 [formerly 2fc754b899]]
Former-commit-id: 667b56480988a0d27554fe0b37597d7fbe2dfa40 [formerly 6e3624d1a7]
Former-commit-id: 48e9e757e9
2013-08-13 16:45:37 -05:00
Jonathan Sanchez
0487e62197 Issue #2243 Fixed update list bugs.
Change-Id: Ie04d66593c450592c78fccdb8d6b78d889d4b68f

Former-commit-id: dc2363ffd7 [formerly 8d0ee7f5ca] [formerly d685125b25] [formerly dc2363ffd7 [formerly 8d0ee7f5ca] [formerly d685125b25] [formerly 49f488a58f [formerly d685125b25 [formerly 4dcfd87f1ae127b8050a4c168a5acf0dd6c815ee]]]]
Former-commit-id: 49f488a58f
Former-commit-id: 3806121231 [formerly d33332bd58] [formerly dd476c502c979c6b882524dd8959a4110265b20f [formerly 96c88ad28b]]
Former-commit-id: 359b6c726ca69372c3a6c6e3771187107c6d2a19 [formerly 721b2c7c04]
Former-commit-id: ba585b9424
2013-08-13 16:30:05 -05:00
Nate Jensen
346e1d1fb7 Issue #2197 cherry picking 2197 into 13.5
Change-Id: Ic4c5447a39923252b73930ac1577bf63258ae56f

Conflicts:

	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/FFMPMonitor.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataGenerator.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResource.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResourceData.java
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPBasinData.java


Former-commit-id: 9a01271f5f [formerly a9815b0551] [formerly 15405cab1b] [formerly 9a01271f5f [formerly a9815b0551] [formerly 15405cab1b] [formerly 63b2fe798a [formerly 15405cab1b [formerly 0f66e6b3e5999f5f1f97b74b157838c598110cb2]]]]
Former-commit-id: 63b2fe798a
Former-commit-id: e63e7120e5 [formerly 464a104dc1] [formerly 63f208510706ceb9b97414afeb3057e182119b34 [formerly 3be446fca8]]
Former-commit-id: 3574b3d0242e822b25fae435b013a4f5730216e4 [formerly 96214e9554]
Former-commit-id: 7e35afdd49
2013-08-13 12:27:02 -05:00
Ben Steffensmeier
451acac93b Issue #1869 Fix bufrua point data stationId.
Former-commit-id: c88e432d04 [formerly bf2dfbaca8] [formerly 9e799b4df1] [formerly c88e432d04 [formerly bf2dfbaca8] [formerly 9e799b4df1] [formerly d1d3491aaf [formerly 9e799b4df1 [formerly 63146c966143e4690da0f7979a3fe217d5c6caa0]]]]
Former-commit-id: d1d3491aaf
Former-commit-id: b357fb0018 [formerly 20a7ba8e69] [formerly 5ee45ce1a1eec70e460a54a9e98781bb2db78baa [formerly 761cb47f73]]
Former-commit-id: f26d6075dc3483c9d4f7cfcf7de81d03d46f8bf5 [formerly b5332f3eb5]
Former-commit-id: 7a2cde76d5
2013-08-09 13:00:18 -05:00
Bryan Kowal
ab7b25bd69 Issue #2252 - remove file accidentally re-added by the merge.
Former-commit-id: 09546736f2 [formerly 0ba5c54688] [formerly 3bdbf6d0cc] [formerly 09546736f2 [formerly 0ba5c54688] [formerly 3bdbf6d0cc] [formerly 5c6258e8c1 [formerly 3bdbf6d0cc [formerly 0462ccb18fdd17b2d25a2c22b547d052ffe33aca]]]]
Former-commit-id: 5c6258e8c1
Former-commit-id: 0d1cf60269 [formerly 4f0b9b4cf3] [formerly e0a4220ad22d5843e5444411defaa80103a9ae61 [formerly a35cbbf85c]]
Former-commit-id: 2b66ee842553f164c837f755752a8a1ecc75a155 [formerly e5727ed745]
Former-commit-id: 6a24eb7f9a
2013-08-08 18:38:21 -05:00
Lee Venable
90c1aec4ca Merge "Issue #2243 Prevented invalid follow ups." into omaha_13.5.1
Former-commit-id: c314bf2092 [formerly ef5a7fb83a] [formerly 69dd7b66fa] [formerly c314bf2092 [formerly ef5a7fb83a] [formerly 69dd7b66fa] [formerly 69645f03dc [formerly 69dd7b66fa [formerly db71f51d18af219c2fdee6dcbe077be50d4e9e54]]]]
Former-commit-id: 69645f03dc
Former-commit-id: b46745eebb [formerly 696ee07b3f] [formerly e115b93102485b11368b55772e8726745f744ad8 [formerly d9e82e20fd]]
Former-commit-id: eada16a20c494be474850c2dc84119382e3590d1 [formerly a0e0b81a81]
Former-commit-id: 33177a8711
2013-08-08 16:40:59 -05:00
Jonathan Sanchez
231cedc656 Issue #2243 Prevented invalid follow ups.
Change-Id: I45f756cd5d7d41cd0086cc76b5473d37ed5b0c1e

Former-commit-id: 7d34154d2c [formerly 05f49219d3] [formerly 4711226b21] [formerly 7d34154d2c [formerly 05f49219d3] [formerly 4711226b21] [formerly dad0681ae0 [formerly 4711226b21 [formerly a09e3b7957bdfeebb4283fad2ce5cce5d26b8a26]]]]
Former-commit-id: dad0681ae0
Former-commit-id: 1e64c5d491 [formerly b467d0fd66] [formerly 47e2f4c744287d8c0b4a9cc10d78ee81fa61534a [formerly d068b5d61f]]
Former-commit-id: 8a26fc85e651fdc70a339fe1b11109ae175e19ba [formerly 9be546dab8]
Former-commit-id: 21368ade28
2013-08-08 16:31:35 -05:00
Greg Armendariz
a118b8f70a Merge branch 'master_13.5.1' into omaha_13.5.1
Conflicts:
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPBasinData.java

Former-commit-id: 154539a4fe [formerly 3cecb178cf] [formerly b08ce25ac8] [formerly 154539a4fe [formerly 3cecb178cf] [formerly b08ce25ac8] [formerly ffb2bea8ad [formerly b08ce25ac8 [formerly d79f0ffacc775ed4dc49bcf35adacf4fded994d3]]]]
Former-commit-id: ffb2bea8ad
Former-commit-id: d4840d3802 [formerly 24dc722be4] [formerly 86468f816c52e90d514c87d790110decf28213ac [formerly 566532c40d]]
Former-commit-id: 510970cf69f7524db648757a728ea8385ea55d47 [formerly 172bc300ca]
Former-commit-id: e51e51c625
2013-08-08 16:24:39 -05:00
Greg Armendariz
b264a9d841 13.5.1-13 baseline
Former-commit-id: 429898edc6 [formerly f0b62a22bf] [formerly 29b823fee4] [formerly 429898edc6 [formerly f0b62a22bf] [formerly 29b823fee4] [formerly 5577e686c1 [formerly 29b823fee4 [formerly 3a9c1057ea5f7d72ba1d962766ad0e68ded9b3e4]]]]
Former-commit-id: 5577e686c1
Former-commit-id: 076a0b08ac [formerly 9f2f62427b] [formerly 12247e45609042e5a8e46278311d4b5b7ec9eb9d [formerly 8bfac41add]]
Former-commit-id: e2cd5730bab137f2b61daadd542fa1f16682d2c6 [formerly b66fcc40a5]
Former-commit-id: 0c61b62d24
2013-08-08 17:00:36 -04:00
Greg Armendariz
d37c94464b 13.5.1-12 baseline
Former-commit-id: 34e0218b59 [formerly 01d067cff9] [formerly c9898ba8d1] [formerly 34e0218b59 [formerly 01d067cff9] [formerly c9898ba8d1] [formerly fe51885ba7 [formerly c9898ba8d1 [formerly eb9cd610891ce5830f4a169db036a49f32c1e63b]]]]
Former-commit-id: fe51885ba7
Former-commit-id: 75d1e77f1b [formerly f777a744e5] [formerly cdf25117bf69e350e12772219b241d184999c14d [formerly 9892a1a262]]
Former-commit-id: c31f8384962ae36ae9a33ef84d46aea958522032 [formerly cbf9e42c21]
Former-commit-id: 244bc3ac37
2013-08-08 15:34:01 -04:00
David Gillingham
f5ed9fa3c6 Issue #1842: Fix ETN assignment for products with multiple NEW segments with the same phensig.
Change-Id: Iba28011bafdff9a01e7039ce7a439d84bf473389

Former-commit-id: ec00fa0cf8 [formerly 6471edab78] [formerly 20e0f4b756] [formerly ec00fa0cf8 [formerly 6471edab78] [formerly 20e0f4b756] [formerly f839ef6f3b [formerly 20e0f4b756 [formerly d0e5cbfdc0ddd13a157ecd85a14af904fb52dc35]]]]
Former-commit-id: f839ef6f3b
Former-commit-id: 3ec31afc5d [formerly 5f9352cb65] [formerly d665f9bc6ae29833ae4f277da48202baec858dd5 [formerly 616c023369]]
Former-commit-id: 18e571136ecc882716d7770817208f07ca118c73 [formerly 6b03403d65]
Former-commit-id: 651ed92403
2013-08-08 09:41:33 -05:00
Greg Armendariz
1a04182d44 Merge branch 'master_13.5.1' into omaha_13.5.1
Former-commit-id: 7398504d85 [formerly d1fb06feb7] [formerly ecc9f77f42] [formerly 7398504d85 [formerly d1fb06feb7] [formerly ecc9f77f42] [formerly 6b1989cb29 [formerly ecc9f77f42 [formerly abb16b014694113cd7f2582542fd0d0f54a2da4e]]]]
Former-commit-id: 6b1989cb29
Former-commit-id: 65b70ce223 [formerly fc6195bbf6] [formerly 515c934b42be211ce5f92cab2acdd2eb519d3d9f [formerly c46f04dd72]]
Former-commit-id: a084eb93b668c3922297767a4872577df1c23840 [formerly 9a1b44efdc]
Former-commit-id: 4b29a16298
2013-08-07 14:46:30 -05:00
Greg Armendariz
7fb928e967 13.5.1-11 baseline
Former-commit-id: 814f7fdcdd [formerly c402dbf6e9] [formerly ea7b22500e] [formerly 814f7fdcdd [formerly c402dbf6e9] [formerly ea7b22500e] [formerly 4ec04083bd [formerly ea7b22500e [formerly 7142e607157f6d6ac1ba5cb24f3b3dbf9ab75f7f]]]]
Former-commit-id: 4ec04083bd
Former-commit-id: 4c20fc4977 [formerly 75f9f8df3f] [formerly f2fc00d3a51154c96e69230aaba5d4ce07cccb09 [formerly 26e58d8cdb]]
Former-commit-id: 4b97c9297a6132e1a64e7b28e4204a8cd32cdd79 [formerly f06ee47260]
Former-commit-id: 8bf2c1cc07
2013-08-07 14:34:27 -04:00
Greg Armendariz
0bb16ced54 13.5.1-10 baseline
Former-commit-id: 9694f9390a [formerly e276b0fabe] [formerly 852455843f] [formerly 9694f9390a [formerly e276b0fabe] [formerly 852455843f] [formerly acf7ced37b [formerly 852455843f [formerly c2c6882c462c34ce9cb9ea3399071c2a121ba0f7]]]]
Former-commit-id: acf7ced37b
Former-commit-id: 690ea2e228 [formerly 9ddb32967c] [formerly 55e2845c864335ebeda69be5a21e4f9deaffd22e [formerly 05282eac88]]
Former-commit-id: f92c8134fca60f550bc93797091c6154015f9683 [formerly f37ef8c24e]
Former-commit-id: 5998f47f57
2013-08-07 14:14:46 -04:00
Ben Steffensmeier
a6a4075f13 Issue #2242 Optimize FFMP NavigableMap memory.
Former-commit-id: 42c551bb7a [formerly 74a5f09cd1] [formerly f0ceddacf1] [formerly 42c551bb7a [formerly 74a5f09cd1] [formerly f0ceddacf1] [formerly b06171b4f2 [formerly f0ceddacf1 [formerly 5208c63e9c6eab03bc42736ffe2254fb802d566b]]]]
Former-commit-id: b06171b4f2
Former-commit-id: 6d60a18a2d [formerly 7de39a58bb] [formerly 638ab88007fb4ccfc259d1c8e3cfadd1bdb30ab1 [formerly 3eb869c65e]]
Former-commit-id: caeba084d0723bb0ee2b76813919bcea8b28e44d [formerly 7e3835fd0a]
Former-commit-id: 7a95a653aa
2013-08-07 12:08:13 -05:00
Steve Harris
48c5fb1f4e Merge branch 'master_13.5.1' into omaha_13.5.1
Former-commit-id: 3573599aaf [formerly 1917c598bc] [formerly 72893066cc] [formerly 3573599aaf [formerly 1917c598bc] [formerly 72893066cc] [formerly 97ef150656 [formerly 72893066cc [formerly 64b7a7f6a035d5832f2338d854780b16d22306db]]]]
Former-commit-id: 97ef150656
Former-commit-id: e680a0e630 [formerly 6ec0c65e84] [formerly 2b8530d5516361d757800e54b2cc11d91e3b78b4 [formerly b346666ef1]]
Former-commit-id: 37556376792a9859a1d670f73769f61cc7cbfa1d [formerly 834819949f]
Former-commit-id: a3f0e4c84b
2013-08-01 08:27:10 -05:00
Steve Harris
a7c6d3b46d 13.5.1-9 baseline
Former-commit-id: 1be9abc02f [formerly 778df21de9] [formerly 97fe6a670f] [formerly 1be9abc02f [formerly 778df21de9] [formerly 97fe6a670f] [formerly 6e60cd9a79 [formerly 97fe6a670f [formerly 06a1dd45adedbe259f9c30ebf93f2f90017fe945]]]]
Former-commit-id: 6e60cd9a79
Former-commit-id: 7fc384a659 [formerly c7e7c838aa] [formerly 1facde304923c944b67d09bf0537810759f82aa7 [formerly bbb7f1dd49]]
Former-commit-id: dd4d7bf31c8224a969995ed35d8e37b50bb8a6d6 [formerly e16fce85ae]
Former-commit-id: ef41819406
2013-08-01 09:20:23 -04:00
Ron Anderson
db13ebd4af Issue #2239 fixed scaling of MakeHazard maps when polygons cross the date line
Change-Id: Idd3745f141b78c74a39cf99746acb45d5f143b10

Former-commit-id: c0dc7d2e46 [formerly 4c61168660] [formerly 390f5b2439] [formerly c0dc7d2e46 [formerly 4c61168660] [formerly 390f5b2439] [formerly 47b977cdec [formerly 390f5b2439 [formerly f4feae82505c29bc49113682d2cd584ec3ed6233]]]]
Former-commit-id: 47b977cdec
Former-commit-id: d09f5d9d0b [formerly 17fef5a2ab] [formerly 114c4a17a51aff6ca84968879bde76a89a25803b [formerly 77e8cd467f]]
Former-commit-id: 4b829c11b6f4e18ec14b77c5131e7e5289d9eb74 [formerly e1a78db830]
Former-commit-id: e8ab3a860f
2013-07-31 09:00:07 -05:00
Nate Jensen
75fcd9eed9 Issue #2223 fix melting layer memory leak
Change-Id: I2fbf4dbaea12e4bba560b27ba372df0c3f913fec

Former-commit-id: 68fbcf5bb2 [formerly 7fc047102b] [formerly 5e29be3d1f] [formerly 68fbcf5bb2 [formerly 7fc047102b] [formerly 5e29be3d1f] [formerly 1c765670ea [formerly 5e29be3d1f [formerly 49299504331c730ffe8a94f490f88337baf12233]]]]
Former-commit-id: 1c765670ea
Former-commit-id: e60e5dba08 [formerly 5cc5818af7] [formerly 293b692d6b0250e935d8663ee184a7d26bdf62fd [formerly 97c71fc9dc]]
Former-commit-id: 6e74c2517ebc733bea1b8c35fa9aad029b8bab7d [formerly 91d5ab7554]
Former-commit-id: 60b3c042e7
2013-07-26 08:43:29 -05:00
Steve Harris
45bc4e9d50 Merge branch 'master_13.5.1' into omaha_13.5.1
Former-commit-id: 5b142d82f5 [formerly 5697c124b7] [formerly caee8e354d] [formerly 5b142d82f5 [formerly 5697c124b7] [formerly caee8e354d] [formerly 804270e3a2 [formerly caee8e354d [formerly 5fca4065166ffd0e1d7a21f8463abd30657307b9]]]]
Former-commit-id: 804270e3a2
Former-commit-id: d2f1179995 [formerly 92a27a07bb] [formerly d658701a2fdde3a1dd32da88e66fdd3f14ead065 [formerly 31ab02f0d4]]
Former-commit-id: fdb312a83317688cc35c26a11cf1ec19e3567d6e [formerly b791fa322b]
Former-commit-id: 29be71f3cb
2013-07-26 08:28:54 -05:00
Steve Harris
dded20dc93 13.5.1-8 baseline
Former-commit-id: 52da6c54db [formerly 392faf86e7] [formerly 3bece5e5d0] [formerly 52da6c54db [formerly 392faf86e7] [formerly 3bece5e5d0] [formerly dfbf9a5afe [formerly 3bece5e5d0 [formerly 37504305d70e6aaf6a7bdfad8267054af0612515]]]]
Former-commit-id: dfbf9a5afe
Former-commit-id: 340e7bab60 [formerly a7d4c6274e] [formerly 045a10d1b22e942768c319f31dc18646c3419092 [formerly 2afb46f814]]
Former-commit-id: 25e673600ebb4cafb2c67928841e30149139a498 [formerly 1a3197efdf]
Former-commit-id: 767b7fdb4d
2013-07-26 09:02:34 -04:00
David Gillingham
380b13d352 Issue #1762: Fix Service Backup regression caused by last commit under this
ticket: NullPointerException caused by missing DynamicSerialize annotation and
disabled export configuration option caused by incomplete request.

Former-commit-id: e96c2962a5 [formerly 9fa6048f38] [formerly 881566d46b] [formerly e96c2962a5 [formerly 9fa6048f38] [formerly 881566d46b] [formerly 938f9cd7f7 [formerly 881566d46b [formerly 071f7e80fc09720a3b1763d4903eb75fb96ebcca]]]]
Former-commit-id: 938f9cd7f7
Former-commit-id: f22922eaca [formerly 72e808cb1c] [formerly 148b8c40d4c89da3d04e1f5c6a0dc0ba21499d31 [formerly 42f096abe8]]
Former-commit-id: 059d65f359518574a4d1fa4376a7b2dbfb491997 [formerly 274ca5a740]
Former-commit-id: 888a61c520
2013-07-22 17:24:00 -05:00
Richard Peter
449dcca1dd Issue #1977: Fix NCEP Plugin issues due to merge
Former-commit-id: 4d2b51881c [formerly 61455f533b] [formerly 82f3d26700] [formerly 4d2b51881c [formerly 61455f533b] [formerly 82f3d26700] [formerly c311adda88 [formerly 82f3d26700 [formerly 3496de5dfddf84fb7130d993a17dcf973018d2f1]]]]
Former-commit-id: c311adda88
Former-commit-id: 3604bc0b96 [formerly 6e895375bb] [formerly 8631f73cb55ec9e059c48450b3026b8f90c21f77 [formerly 14748bda85]]
Former-commit-id: 68028aa3f423c8e3787948796e3c140a4ff89630 [formerly f2846e2051]
Former-commit-id: 573bf9465e
2013-07-22 16:12:01 -05:00
Bryan Kowal
04e82d590c Issue #2206 - relocate ATBL directory change to 13.5
Former-commit-id: 49efaf00e0 [formerly aeb80aa780] [formerly b8de269bd0] [formerly 49efaf00e0 [formerly aeb80aa780] [formerly b8de269bd0] [formerly 75e9bdcb7a [formerly b8de269bd0 [formerly 5ba0ee80d25a5fe548d31f736eceb38a58f8ee90]]]]
Former-commit-id: 75e9bdcb7a
Former-commit-id: 1ce7b8d139 [formerly 9bfdd9121d] [formerly eb3e8c53dc32d32a4bccd6e571905081f01e2dee [formerly b45ee945b3]]
Former-commit-id: b361560b3522fde576719190a6f2430e5bb3fa3d [formerly ee99d6f73d]
Former-commit-id: 27c868f201
2013-07-22 13:44:32 -05:00
Ron Anderson
2d662d54e2 Merge "Issue #1842: Fix issue where start time of in progress VTEC events was being set to 991130T0000Z." into omaha_13.5.1
Former-commit-id: 2089070a96 [formerly ecf1cfe4ed] [formerly 02dbc313c8] [formerly 2089070a96 [formerly ecf1cfe4ed] [formerly 02dbc313c8] [formerly 249e7b1aaa [formerly 02dbc313c8 [formerly 7e04107b602191703a8dbe19b7182ccb41a13eb1]]]]
Former-commit-id: 249e7b1aaa
Former-commit-id: 776a8b1ec3 [formerly 188ae55396] [formerly 78783370cdef4d5ebf4a1541cf82e7dd322db711 [formerly d62ba6c852]]
Former-commit-id: 6539bb9684b40fbaf3b41f67750af1fd1e2bef18 [formerly ff6f9def32]
Former-commit-id: 89ef1f295b
2013-07-22 09:47:09 -05:00
Greg Armendariz
723d0a4806 Merge "Issue #2205 Fix cancelling adhoc queries" into omaha_13.5.1
Former-commit-id: 16cb7d3737 [formerly fda3ba6d5b] [formerly a3b77f2623] [formerly 16cb7d3737 [formerly fda3ba6d5b] [formerly a3b77f2623] [formerly d5ea12d97f [formerly a3b77f2623 [formerly d60e75576a5f80f8838330789c97e89788c7a057]]]]
Former-commit-id: d5ea12d97f
Former-commit-id: 4c26ff845a [formerly c8c2a3d636] [formerly 6a070220b5d10249ff1b492f7b2e28dd9dd2b76e [formerly 3947baa02d]]
Former-commit-id: f1f5602f12e8568c08454a071de154890cb220bf [formerly e1092b5725]
Former-commit-id: 6c35eb215a
2013-07-19 14:15:24 -05:00
David Gillingham
73006f4de2 Issue #1842: Fix issue where start time of in progress VTEC events was being set
to 991130T0000Z.


Former-commit-id: 2ad8bd7bcd [formerly 62d740b2ed] [formerly 1fc7c3197a] [formerly 2ad8bd7bcd [formerly 62d740b2ed] [formerly 1fc7c3197a] [formerly d0568ff347 [formerly 1fc7c3197a [formerly bf21f81dcad44880af5a3f988d15d4330b2b1d6b]]]]
Former-commit-id: d0568ff347
Former-commit-id: 61ef3ec108 [formerly 988a705e81] [formerly 46fe96a6849444cf7e9aeddeda70aed4f091031e [formerly 4b9edbdcb4]]
Former-commit-id: d8263245acac3de84477b4282ece967a0bd90e38 [formerly e52a6caa0e]
Former-commit-id: 6415691028
2013-07-19 11:24:30 -05:00
Bryan Kowal
a3b4b564ab Issue #2153 - fix 13.5.1 build after merge
Former-commit-id: 0a4d751112 [formerly b49ddfe75a] [formerly 914f2f7e2f] [formerly 0a4d751112 [formerly b49ddfe75a] [formerly 914f2f7e2f] [formerly e9e3baa4df [formerly 914f2f7e2f [formerly a70fac10e48f1fc258a7756acb4d48560a54248d]]]]
Former-commit-id: e9e3baa4df
Former-commit-id: 18f781ee61 [formerly d67aa10275] [formerly 243a3b4f5bb1ab2d3bf98b3e738e06b86d9930de [formerly a7f431e526]]
Former-commit-id: ab3ee7fa5b0a2d8d14a2afa09e3342b6f7efca17 [formerly 9af77e045c]
Former-commit-id: 21902a3edb
2013-07-19 10:28:30 -05:00
Richard Peter
69af3f93ca Merge branch 'master_13.5.1' (13.5.1-7) into omaha_13.5.1
Conflicts:
	cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/AbstractArchiveDlg.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/FFMPMonitor.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataGenerator.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResource.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/thread/AbstractLoadJob.java
	edexOsgi/com.raytheon.uf.common.archive/src/com/raytheon/uf/common/archive/config/ArchiveConfigManager.java
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPBasinData.java
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPDataContainer.java
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPTemplates.java
	edexOsgi/com.raytheon.uf.edex.archive/utility/common_static/base/archiver/purger/PROCESSED_DATA.xml
	edexOsgi/com.raytheon.uf.edex.archive/utility/common_static/base/archiver/purger/RAW_DATA.xml
	edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/FFMPGenerator.java
	edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/common/FFTIProcessor.java
	rpms/awips2.core/Installer.ldm/component.spec

Former-commit-id: 8e3a28636c [formerly 85fb4c3940] [formerly 7e08c04383] [formerly 8e3a28636c [formerly 85fb4c3940] [formerly 7e08c04383] [formerly cc7189fcb7 [formerly 7e08c04383 [formerly 3a10af4a3aedbccccb2062f5bf6c0902e448e6d7]]]]
Former-commit-id: cc7189fcb7
Former-commit-id: e46425cd8d [formerly eefaf2c836] [formerly d1139e995fdb6ae17e30ada823c7426e3f31cab7 [formerly ea2b372343]]
Former-commit-id: fcddfd2ee1c278a22544ea6d0efd7a301de67fff [formerly 3a573f4256]
Former-commit-id: 374879df01
2013-07-18 21:46:25 -05:00