Commit graph

3157 commits

Author SHA1 Message Date
Lee Venable
fc562788fd Issue #2283 - cleaned up some synchronizrd code.
Former-commit-id: 027dae1e9b [formerly 027dae1e9b [formerly f162222be931d03c3a0401205869d48854703c36]]
Former-commit-id: ea4df9cb2d
Former-commit-id: d3268de97a
2013-08-26 09:41:21 -05:00
Steve Harris
7a5e176937 Merge branch 'master_13.5.2' (13.5.1-18) into omaha_13.5.2
Conflicts:
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/FollowupData.java
	nativeLib/edexBridge/edexBridge.cpp

Former-commit-id: e361386eab [formerly e361386eab [formerly a3671ea2935178a28dce6d075dc2067a609e6725]]
Former-commit-id: 119af8a466
Former-commit-id: 5b11d137df
2013-08-23 11:36:43 -05:00
Jonathan Sanchez
9280f2920f Issue #2176 Implemented emergency warning products.
Cherry picked from 13.6.1 e6bb79e45c989e4292b8485307ae239e491cb630 [formerly 67ce90c14a] [formerly 7d74ba5ee1 [formerly 7d74ba5ee1 [formerly 36df6339cc00afc5935746a4a47b0e9e8c641f85]]] to 13.5.2

Change-Id: I80623a63abd495baf3e0004625732f26453a30d9

Former-commit-id: e0bd81c0ae [formerly e0bd81c0ae [formerly be486757ed36916c1c3a1e56ddf98754b900b693]]
Former-commit-id: cf51ba9e9c
Former-commit-id: 051c8103c7
2013-08-22 12:25:42 -05:00
Lee Venable
2e26b28a40 Merge "Issue #2177 Improve county portion descriptions." into omaha_13.5.2
Former-commit-id: 07f087013f [formerly 07f087013f [formerly 1b7f1d8dce2cc1161ce06ca0c4a8df68803a12e1]]
Former-commit-id: 321ddebdde
Former-commit-id: 0af2308491
2013-08-22 11:53:18 -05:00
Jonathan Sanchez
4d8a18180b Issue #2177 Improve county portion descriptions.
Change-Id: I9b2326e0b57b2bba7223032e3f08846f0d2f121d

Former-commit-id: 0c06112925 [formerly 0c06112925 [formerly a8e74ba813cc841c6cc6ff06df73080d1ce1fd8c]]
Former-commit-id: 321799e07b
Former-commit-id: edbc238355
2013-08-22 10:49:09 -05:00
Steve Harris
cde7f2a59c 13.5.1-18 baseline
Former-commit-id: afb34814dd [formerly afb34814dd [formerly f407ad6db2f621a5be95939aea88f49d874d1ab6]]
Former-commit-id: 0a7acf96c7
Former-commit-id: 2f9aa87a9f
2013-08-22 09:12:43 -04:00
Steve Harris
572e76e384 Merge "Issue #2198 - created a launcher that would start both AlertViz and CAVE; no extra windows are created now" into omaha_13.5.2
Former-commit-id: cb1b7ecc55 [formerly cb1b7ecc55 [formerly 37c80d08633e4ab0f7ba6ead07e4cb6fa54e1194]]
Former-commit-id: a1b6f8c50c
Former-commit-id: a2f17e7af1
2013-08-21 10:37:52 -05:00
Ben Steffensmeier
7bf35bdac6 Issue #2194 Fix site override.
Former-commit-id: 791c6a9890 [formerly 791c6a9890 [formerly faba58780d497f8db564c0fa325c07b35326e010]]
Former-commit-id: dac718634c
Former-commit-id: 4e218e9e56
2013-08-20 14:47:32 -05:00
Bryan Kowal
433efe1982 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: a1fccaa598 [formerly a1fccaa598 [formerly c1c6cd087a493f052a66fbc6e7b608cd959f7905]]
Former-commit-id: 21cfeb1b83
Former-commit-id: 6cf776926c
2013-08-20 13:56:07 -05:00
Bryan Kowal
90be457e49 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: 72a841bcd5 [formerly 72a841bcd5 [formerly d3736e2b8d83616f0a7c35475c5a552fdae79674]]
Former-commit-id: d58a720e38
Former-commit-id: e3b8567548
2013-08-20 11:43:18 -05:00
Ben Steffensmeier
7668fdbde7 Issue #2275 Add dataURI column back into bufrmos types.
Former-commit-id: 4cb853ac39 [formerly 4cb853ac39 [formerly 1b883da972ac915252c256b63c881d23121f3ac6]]
Former-commit-id: 9219db0069
Former-commit-id: 8b9031719a
2013-08-19 16:00:01 -05:00
Steve Harris
815bfe575c 13.5.1-17 baseline
Former-commit-id: 9dd7dc5d20 [formerly 9dd7dc5d20 [formerly c5d75a6473b2659b9ac1054a1160c921bd8c1c16]]
Former-commit-id: b210c90245
Former-commit-id: a192a3ebb1
2013-08-19 16:34:24 -04:00
Steve Harris
3c03bff519 Merge branch 'omaha_13.5.1' into omaha_13.5.2
Former-commit-id: bc8af6e701 [formerly bc8af6e701 [formerly ab28f86a23e1c8b83204f57da9b8e7bd15cafe98]]
Former-commit-id: dc44ca76fb
Former-commit-id: e03750d5f9
2013-08-16 12:45:01 -05:00
Max Schenkelberg
f720f78f4c Issue #2189 Fixing java 6 and 7 compatibility issue in 13.5.2 branch.
Change-Id: Ia800aee8f4e027630293b074d0b7e8d93d424611

Former-commit-id: 57a0df81a6 [formerly 57a0df81a6 [formerly 0603b0bd77a9463abaa9020bf1bcb97befd7b161]]
Former-commit-id: 9e213438f4
Former-commit-id: b67a3033f9
2013-08-15 17:36:36 -05:00
Max Schenkelberg
ee68615786 Issue #2255 Made TransformFactory loop to find true base crs in worldToCRS and worldToGrid.
Change-Id: I0cbb4ce0446ab4080ee0dc0f87c1de2ffc77a5a7

Former-commit-id: e85d66f4e5 [formerly e85d66f4e5 [formerly d132d2ec2fc296518765d78b04ed942ec246b2e0]]
Former-commit-id: 3800aec9e6
Former-commit-id: d89d13d029
2013-08-15 15:50:40 -05:00
Bryan Kowal
36c1e6cff3 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: da29ff63f4 [formerly da29ff63f4 [formerly e8f8d498cd15855b72c170f2990fd4929eb636b2]]
Former-commit-id: 431dbaeaac
Former-commit-id: 7c3c19f794
2013-08-15 14:30:55 -05:00
Max Schenkelberg
4191582186 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: eab65aab5a [formerly eab65aab5a [formerly 473421a32f7c53453db1c5331714204a89bad4da]]
Former-commit-id: 570266eb7b
Former-commit-id: 5840d99a95
2013-08-15 13:51:07 -05:00
Steve Harris
850d0d54c6 Merge branch 'omaha_13.5.1' into omaha_13.5.2
Former-commit-id: 67f7a8db62 [formerly 67f7a8db62 [formerly cfd93a48150e8c559622e806e98362a51f19aee0]]
Former-commit-id: 282577d168
Former-commit-id: 877d672852
2013-08-15 12:55:24 -05:00
Steve Harris
08a7c0831f Merge branch 'master_13.5.1' into omaha_13.5.1
Former-commit-id: 727eba03b9 [formerly 727eba03b9 [formerly 85cde5da231741012e611250a5c3490467aeef1b]]
Former-commit-id: a687da6075
Former-commit-id: 522867f068
2013-08-15 12:46:48 -05:00
Steve Harris
af2b4495bb 13.5.1-16 baseline
Former-commit-id: cd3b63d961 [formerly cd3b63d961 [formerly 2fcbcde58066c18ab423c94c37f446ab5e7f42da]]
Former-commit-id: 7ce0234d76
Former-commit-id: d7b1ed4900
2013-08-15 13:40:37 -04:00
Jonathan Sanchez
dbb60f2c13 Issue #2243 Resolved timing issues.
Change-Id: Ia0386bf21087cb2a00175e35ecfeae5206797a34

Former-commit-id: 2b849d7003 [formerly 2b849d7003 [formerly 5833ecad04c31502b4e2991853e6aabeda4919f2]]
Former-commit-id: bc30396b63
Former-commit-id: fca67fb4ca
2013-08-15 10:56:37 -05:00
David Gillingham
6277627e7e Issue #2009: Fix NullPointerException in SocketServer start up.
Change-Id: I07683ba74410234d162e058df0bb3ff6e00ee59e

Former-commit-id: 2d6c6cdd39 [formerly 2d6c6cdd39 [formerly 51a951bf190b7ca68121dc1630f3bc5d094b601b]]
Former-commit-id: 17a45cafe5
Former-commit-id: db0d0374b0
2013-08-14 17:13:58 -05:00
David Gillingham
4bd40cd544 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: 0f4f24beb8 [formerly 0f4f24beb8 [formerly ad7acb2d563c79d92d84ec62405b492907191af3]]
Former-commit-id: f8b6ec20c1
Former-commit-id: 751188ab5a
2013-08-14 17:10:04 -05:00
Richard Peter
6ebc5d67bd Issue #1977: Fix merge issue with WarngenDialog
Former-commit-id: 7c03fc955b [formerly 7c03fc955b [formerly ddfc06eb9753e893ece28e1718c5e4550e82b053]]
Former-commit-id: a5383dbfa4
Former-commit-id: 951bb37cd7
2013-08-14 15:33:02 -05:00
Greg Armendariz
f24011d94d Merge "Issue #2257 - updated edex_com to use the qpid 0.18 messaging api" into omaha_13.5.1
Former-commit-id: f02fef09a2 [formerly f02fef09a2 [formerly ced372967755b611158c213011132a353b72f421]]
Former-commit-id: edf12d4d4f
Former-commit-id: e867472bf6
2013-08-14 15:00:26 -05:00
Richard Peter
7ca1edf371 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: c61afa1bfa [formerly c61afa1bfa [formerly 87a1f8f44cbdfb9006eb5e222ae2c220c6a324b3]]
Former-commit-id: ee6b9eb11a
Former-commit-id: 58a4aaa080
2013-08-14 14:29:55 -05:00
Bryan Kowal
d083f1ae4e 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: fc8c3f540d [formerly fc8c3f540d [formerly af2882799bd08998d1321bac37beb2a7cecb4fb9]]
Former-commit-id: 21893102bb
Former-commit-id: c2c9d745af
2013-08-14 11:21:33 -05:00
Steve Harris
9ea3f0c215 13.5.1-15 baseline
Former-commit-id: 53e96e21db [formerly 53e96e21db [formerly dbf9107f9c775f9a1df759bc341c0722f5fc92f2]]
Former-commit-id: c6dc1817e7
Former-commit-id: 65beefde58
2013-08-14 10:24:26 -04:00
Steve Harris
0f3ffc3892 13.5.1-14 baseline
Former-commit-id: d695e5debe [formerly d695e5debe [formerly fe7b1a704ee92b34684e4f9059bd61cfa28dd485]]
Former-commit-id: 80e5f7fbd4
Former-commit-id: cd5b1e9e2f
2013-08-14 10:07:41 -04:00
Jonathan Sanchez
77a919a7e8 Issue #2243 Resolved incorrect import.
Change-Id: I02e446858d36a934b9aa308a0bc2d4df3863defb

Former-commit-id: c6b6576f01 [formerly c6b6576f01 [formerly f79e7820ea010e0bc860b0033183147d7299221f]]
Former-commit-id: fd0f2f1c09
Former-commit-id: 70bb266da7
2013-08-13 20:47:49 -05:00
Richard Peter
6e3624d1a7 Merge "Issue #2243 Fixed update list bugs." into omaha_13.5.1
Former-commit-id: 6efc27c1b1 [formerly 6efc27c1b1 [formerly d7d87eb785c9c5e26a841503ea11fac4461b23b3]]
Former-commit-id: d5130432a8
Former-commit-id: 2fc754b899
2013-08-13 16:45:37 -05:00
Jonathan Sanchez
721b2c7c04 Issue #2243 Fixed update list bugs.
Change-Id: Ie04d66593c450592c78fccdb8d6b78d889d4b68f

Former-commit-id: d685125b25 [formerly d685125b25 [formerly 4dcfd87f1ae127b8050a4c168a5acf0dd6c815ee]]
Former-commit-id: 49f488a58f
Former-commit-id: 96c88ad28b
2013-08-13 16:30:05 -05:00
Nate Jensen
96214e9554 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: 15405cab1b [formerly 15405cab1b [formerly 0f66e6b3e5999f5f1f97b74b157838c598110cb2]]
Former-commit-id: 63b2fe798a
Former-commit-id: 3be446fca8
2013-08-13 12:27:02 -05:00
Ben Steffensmeier
b5332f3eb5 Issue #1869 Fix bufrua point data stationId.
Former-commit-id: 9e799b4df1 [formerly 9e799b4df1 [formerly 63146c966143e4690da0f7979a3fe217d5c6caa0]]
Former-commit-id: d1d3491aaf
Former-commit-id: 761cb47f73
2013-08-09 13:00:18 -05:00
Bryan Kowal
e5727ed745 Issue #2252 - remove file accidentally re-added by the merge.
Former-commit-id: 3bdbf6d0cc [formerly 3bdbf6d0cc [formerly 0462ccb18fdd17b2d25a2c22b547d052ffe33aca]]
Former-commit-id: 5c6258e8c1
Former-commit-id: a35cbbf85c
2013-08-08 18:38:21 -05:00
Lee Venable
a0e0b81a81 Merge "Issue #2243 Prevented invalid follow ups." into omaha_13.5.1
Former-commit-id: 69dd7b66fa [formerly 69dd7b66fa [formerly db71f51d18af219c2fdee6dcbe077be50d4e9e54]]
Former-commit-id: 69645f03dc
Former-commit-id: d9e82e20fd
2013-08-08 16:40:59 -05:00
Jonathan Sanchez
9be546dab8 Issue #2243 Prevented invalid follow ups.
Change-Id: I45f756cd5d7d41cd0086cc76b5473d37ed5b0c1e

Former-commit-id: 4711226b21 [formerly 4711226b21 [formerly a09e3b7957bdfeebb4283fad2ce5cce5d26b8a26]]
Former-commit-id: dad0681ae0
Former-commit-id: d068b5d61f
2013-08-08 16:31:35 -05:00
Greg Armendariz
172bc300ca 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: b08ce25ac8 [formerly b08ce25ac8 [formerly d79f0ffacc775ed4dc49bcf35adacf4fded994d3]]
Former-commit-id: ffb2bea8ad
Former-commit-id: 566532c40d
2013-08-08 16:24:39 -05:00
Greg Armendariz
b66fcc40a5 13.5.1-13 baseline
Former-commit-id: 29b823fee4 [formerly 29b823fee4 [formerly 3a9c1057ea5f7d72ba1d962766ad0e68ded9b3e4]]
Former-commit-id: 5577e686c1
Former-commit-id: 8bfac41add
2013-08-08 17:00:36 -04:00
Greg Armendariz
cbf9e42c21 13.5.1-12 baseline
Former-commit-id: c9898ba8d1 [formerly c9898ba8d1 [formerly eb9cd610891ce5830f4a169db036a49f32c1e63b]]
Former-commit-id: fe51885ba7
Former-commit-id: 9892a1a262
2013-08-08 15:34:01 -04:00
David Gillingham
6b03403d65 Issue #1842: Fix ETN assignment for products with multiple NEW segments with the same phensig.
Change-Id: Iba28011bafdff9a01e7039ce7a439d84bf473389

Former-commit-id: 20e0f4b756 [formerly 20e0f4b756 [formerly d0e5cbfdc0ddd13a157ecd85a14af904fb52dc35]]
Former-commit-id: f839ef6f3b
Former-commit-id: 616c023369
2013-08-08 09:41:33 -05:00
Greg Armendariz
9a1b44efdc Merge branch 'master_13.5.1' into omaha_13.5.1
Former-commit-id: ecc9f77f42 [formerly ecc9f77f42 [formerly abb16b014694113cd7f2582542fd0d0f54a2da4e]]
Former-commit-id: 6b1989cb29
Former-commit-id: c46f04dd72
2013-08-07 14:46:30 -05:00
Greg Armendariz
f06ee47260 13.5.1-11 baseline
Former-commit-id: ea7b22500e [formerly ea7b22500e [formerly 7142e607157f6d6ac1ba5cb24f3b3dbf9ab75f7f]]
Former-commit-id: 4ec04083bd
Former-commit-id: 26e58d8cdb
2013-08-07 14:34:27 -04:00
Greg Armendariz
f37ef8c24e 13.5.1-10 baseline
Former-commit-id: 852455843f [formerly 852455843f [formerly c2c6882c462c34ce9cb9ea3399071c2a121ba0f7]]
Former-commit-id: acf7ced37b
Former-commit-id: 05282eac88
2013-08-07 14:14:46 -04:00
Ben Steffensmeier
7e3835fd0a Issue #2242 Optimize FFMP NavigableMap memory.
Former-commit-id: f0ceddacf1 [formerly f0ceddacf1 [formerly 5208c63e9c6eab03bc42736ffe2254fb802d566b]]
Former-commit-id: b06171b4f2
Former-commit-id: 3eb869c65e
2013-08-07 12:08:13 -05:00
Steve Harris
834819949f Merge branch 'master_13.5.1' into omaha_13.5.1
Former-commit-id: 72893066cc [formerly 72893066cc [formerly 64b7a7f6a035d5832f2338d854780b16d22306db]]
Former-commit-id: 97ef150656
Former-commit-id: b346666ef1
2013-08-01 08:27:10 -05:00
Steve Harris
e16fce85ae 13.5.1-9 baseline
Former-commit-id: 97fe6a670f [formerly 97fe6a670f [formerly 06a1dd45adedbe259f9c30ebf93f2f90017fe945]]
Former-commit-id: 6e60cd9a79
Former-commit-id: bbb7f1dd49
2013-08-01 09:20:23 -04:00
Ron Anderson
e1a78db830 Issue #2239 fixed scaling of MakeHazard maps when polygons cross the date line
Change-Id: Idd3745f141b78c74a39cf99746acb45d5f143b10

Former-commit-id: 390f5b2439 [formerly 390f5b2439 [formerly f4feae82505c29bc49113682d2cd584ec3ed6233]]
Former-commit-id: 47b977cdec
Former-commit-id: 77e8cd467f
2013-07-31 09:00:07 -05:00
Nate Jensen
91d5ab7554 Issue #2223 fix melting layer memory leak
Change-Id: I2fbf4dbaea12e4bba560b27ba372df0c3f913fec

Former-commit-id: 5e29be3d1f [formerly 5e29be3d1f [formerly 49299504331c730ffe8a94f490f88337baf12233]]
Former-commit-id: 1c765670ea
Former-commit-id: 97c71fc9dc
2013-07-26 08:43:29 -05:00
Steve Harris
b791fa322b Merge branch 'master_13.5.1' into omaha_13.5.1
Former-commit-id: caee8e354d [formerly caee8e354d [formerly 5fca4065166ffd0e1d7a21f8463abd30657307b9]]
Former-commit-id: 804270e3a2
Former-commit-id: 31ab02f0d4
2013-07-26 08:28:54 -05:00