Commit graph

873 commits

Author SHA1 Message Date
Richard Peter
c653c0437c Merge "Issue #626 update WMOHeaderRemover to remove any extra bytes before wmo header found from WMOHeaderFinder." into development
Former-commit-id: aeadf13cdb [formerly a61fc2ca7b] [formerly 9268dee274] [formerly aeadf13cdb [formerly a61fc2ca7b] [formerly 9268dee274] [formerly 3cf933fa4c [formerly 9268dee274 [formerly 2075d2f125613cf2c69cb3d4166020ed7d9fb175]]]]
Former-commit-id: 3cf933fa4c
Former-commit-id: 23a734ee87 [formerly 3f292954a0] [formerly c4dd73f75c6de87d8e8ca8a838dcd8f626e7602b [formerly 3a984fc39a]]
Former-commit-id: d03496aaacfc9429185dde6a7e5d06fe4ac5fb8a [formerly 72588c9d66]
Former-commit-id: 814f13a022
2012-09-18 08:19:18 -05:00
Lee Venable
a04931e5d7 Merge "Issue #1048 re-commit code cleanup changes from other branch" into development
Former-commit-id: 207ddee191 [formerly f375af2f63] [formerly c4485fd4ac] [formerly 207ddee191 [formerly f375af2f63] [formerly c4485fd4ac] [formerly acf062aa3e [formerly c4485fd4ac [formerly 1ca6642169c3541e3bbcddf3fc57fd1c84fba65b]]]]
Former-commit-id: acf062aa3e
Former-commit-id: 80cf57d2f9 [formerly b227c496be] [formerly f4653122d60408055e4799b487d013c672ad6d71 [formerly 0f0f5aaa32]]
Former-commit-id: 25c79360c91807aef81322a179fe5ef7f81f7562 [formerly 079ddba174]
Former-commit-id: 0ecf1d9608
2012-09-17 16:25:28 -05:00
Steve Harris
c8f51d33ae Merge branch 'ss_builds' (12.10.1-5) into development
Conflicts:
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/alarmalert/dialogs/CurrentAlarmQueue.java

Former-commit-id: 9ed9283b30 [formerly 15a625adb7] [formerly dd6ac67e17] [formerly 9ed9283b30 [formerly 15a625adb7] [formerly dd6ac67e17] [formerly 39f15fe032 [formerly dd6ac67e17 [formerly 4e988dde641d01295134080111e738f25a110e6d]]]]
Former-commit-id: 39f15fe032
Former-commit-id: 429841d1ad [formerly 7abc080c21] [formerly 571dfe92ae7c0a4943df37ffd570fbfe3d20339b [formerly 9de7b02008]]
Former-commit-id: 3ab28176a84d6fd185ac188b916a0d44a561c061 [formerly beb08c98ce]
Former-commit-id: 9966493ff3
2012-09-17 15:46:11 -05:00
Steve Harris
277255717d 12.10.1-5 baseline
Former-commit-id: d0cd58d6bc [formerly 82feb4de50] [formerly a96d35a1fa] [formerly d0cd58d6bc [formerly 82feb4de50] [formerly a96d35a1fa] [formerly 4fd8893e55 [formerly a96d35a1fa [formerly 28dc700c3ef97a134c8871c2c52086fe7db43035]]]]
Former-commit-id: 4fd8893e55
Former-commit-id: 70566fbec1 [formerly a903893a09] [formerly 3760dcf872cc3205410a8002df70f1952ec6e644 [formerly deed84c1a2]]
Former-commit-id: 04dc60f4a3b146bf387bf04f40efb975397eb03d [formerly 430a11f72b]
Former-commit-id: 288d4afff5
2012-09-17 15:42:31 -05:00
Nate Jensen
5858136598 Issue #1048 re-commit code cleanup changes from other branch
Change-Id: I2789e2c268f802c004f1594d7d2e5636065b5740

Former-commit-id: d5b15b488d [formerly fa0043a012] [formerly bdfb01c501] [formerly d5b15b488d [formerly fa0043a012] [formerly bdfb01c501] [formerly 8f7dbdb619 [formerly bdfb01c501 [formerly da4f41b2627e52bde097ab331e1f99c169a7e494]]]]
Former-commit-id: 8f7dbdb619
Former-commit-id: 22c6fb54a9 [formerly 846158f252] [formerly a19ee7b07bdce9654fe665e1844b6a200de43606 [formerly 00abcef8a0]]
Former-commit-id: 57d7cf62736927dae4e07ee0b5fd29abf9381859 [formerly a94642d620]
Former-commit-id: 7ad8585310
2012-09-17 15:29:52 -05:00
Steve Harris
7018fef5a9 Merge branch 'development' into Enhanced_points and Enhanced_points into development
Former-commit-id: 912cec518b [formerly c64e9b0ad9] [formerly 72ecefa9ee] [formerly 912cec518b [formerly c64e9b0ad9] [formerly 72ecefa9ee] [formerly fe92909f53 [formerly 72ecefa9ee [formerly 9f938d77412ff1d09a8314bb650ddef8eabf73fb]]]]
Former-commit-id: fe92909f53
Former-commit-id: 61bb5bf595 [formerly 91f26b6c0e] [formerly 0d6cc0b3ec0875f61bc7bd95203b177595d2ed5c [formerly b8d2ff47ca]]
Former-commit-id: ea273be86b5f19270ed6c4f2c3a06627b8ee3281 [formerly f9166b9d83]
Former-commit-id: ff96578fb4
2012-09-17 14:58:23 -05:00
Max Schenkelberg
7624afbc37 Issue #626 update WMOHeaderRemover to remove any extra bytes before wmo header found from WMOHeaderFinder.
Change-Id: I836fbc496c2dd2da610dbdd16b6bea0428a7966a

Former-commit-id: 32a463034a [formerly 38da9ec0c1] [formerly c4a3ff3076] [formerly 32a463034a [formerly 38da9ec0c1] [formerly c4a3ff3076] [formerly b0addbc1db [formerly c4a3ff3076 [formerly 5f580a3989a9f08c20e829ae60318dcf2964ee6d]]]]
Former-commit-id: b0addbc1db
Former-commit-id: 151c2583e6 [formerly 089fcc0310] [formerly d0f9b114f8401237d48ff84589d82b7839645c8e [formerly 4e3ef3661e]]
Former-commit-id: d5bfd82479ddb46b8372b5344ef764b6ac0ba25d [formerly 132cad2d05]
Former-commit-id: 8f757cf5ae
2012-09-17 12:59:10 -05:00
Roger Ferrel
a3dc020209 Issue #875 Added tri-state for Point fields movable and hidden.
Change-Id: Idcb54906735a6f727f4db88ca39ae0e57deb2964

Former-commit-id: 65e9237959 [formerly 4978b5305d] [formerly 70217e1556] [formerly 65e9237959 [formerly 4978b5305d] [formerly 70217e1556] [formerly 66d98d068c [formerly 70217e1556 [formerly 15833c5ca3b8415b3a2fef1da98c42e95721331d]]]]
Former-commit-id: 66d98d068c
Former-commit-id: 9caf301ac1 [formerly 8d21873f2f] [formerly 460e673c5a7153911632cc11d66bf75b51cbf528 [formerly 7bbcb004be]]
Former-commit-id: 877aba65d68c187fa0ecc56eba9e89990a0e2eea [formerly ed3663b145]
Former-commit-id: 85cf1738ef
2012-09-17 09:02:26 -05:00
Steve Harris
2700d99961 Merge branch 'ss_builds' of ssh://lightning.omaha.us.ray.com:29418/AWIPS2_baseline into ss_builds
Former-commit-id: fdf35b8b3f [formerly 790af9ec63] [formerly 13adee3fe9] [formerly fdf35b8b3f [formerly 790af9ec63] [formerly 13adee3fe9] [formerly b06a9469b1 [formerly 13adee3fe9 [formerly f17d5e913412e959e1f950bbd8e07516508f651f]]]]
Former-commit-id: b06a9469b1
Former-commit-id: a0ca603f51 [formerly fa7d2ba33b] [formerly d07ab3eaa2b0787e5bc7de978148e9392dc93f3f [formerly 1c21fe109f]]
Former-commit-id: cc1b83a58a2d3f1a5f478163176b5adc2bd65d4c [formerly 0cde1ea473]
Former-commit-id: 009465d3ea
2012-09-17 08:18:31 -05:00
Bryan Kowal
faa2bbda20 Issue #1181 - replace EnhancedPatternLayout with PatternLayout
Former-commit-id: cff13f2294 [formerly 9915d4c006] [formerly 77d12d0275] [formerly cff13f2294 [formerly 9915d4c006] [formerly 77d12d0275] [formerly 3a037ffd49 [formerly 77d12d0275 [formerly 29b131727eb8b5b9c450a7f0fd9d1c2c073cc393]]]]
Former-commit-id: 3a037ffd49
Former-commit-id: 0ab345e17f [formerly 9dc8747553] [formerly 87357daeaaf9ea2895f17d4854007267e21c00d1 [formerly f516e61f20]]
Former-commit-id: 1d8a42cac7558e4c00a06f158c06ba66408d14c0 [formerly 219c939169]
Former-commit-id: eaca9d0306
2012-09-14 12:25:41 -05:00
Bryan Kowal
615fdf420b Fix the git ignore file
Former-commit-id: 1d2942e048 [formerly 40e2924ce0] [formerly 2e1fe9663c] [formerly 1d2942e048 [formerly 40e2924ce0] [formerly 2e1fe9663c] [formerly 4d7cb017ce [formerly 2e1fe9663c [formerly 667a1c4eb019c27679ad8391608d852745ffa898]]]]
Former-commit-id: 4d7cb017ce
Former-commit-id: 0a3517c40c [formerly dba734953b] [formerly 25bb4f691f05b4d1d2312cde924c62cd7819f9f8 [formerly 079e3f926e]]
Former-commit-id: cdc64252e199cecbaa965a8fc7fe73029710657d [formerly dfb42b74bd]
Former-commit-id: bb314e096a
2012-09-14 12:04:24 -05:00
Nate Jensen
f8992cf603 Merge "Issue #1117: Fix WEBrowserDialog so that clicking on Source menu doesn't clear source selections." into development
Former-commit-id: 994e1080ad [formerly 71f5f75f22] [formerly b1a6ff5396] [formerly 994e1080ad [formerly 71f5f75f22] [formerly b1a6ff5396] [formerly 614c0f4248 [formerly b1a6ff5396 [formerly 31538baa1db02a946b2cec63e349025cd1f4676c]]]]
Former-commit-id: 614c0f4248
Former-commit-id: cc8aab9891 [formerly 9d873ef27d] [formerly 3943d88976514d787846026cee72f4b8fd5026c0 [formerly e8ec45cb18]]
Former-commit-id: 20a66658a0f1c225247a4deeef18eb06ad9e4353 [formerly d7070a6ddf]
Former-commit-id: f1f38899c8
2012-09-14 11:04:04 -05:00
Brad Gonzales
225f645494 Issue #1171 updated TimeSeriesDisplayCanvas.findGraphMinMax(GraphData) to check the latest only setting before including historical traces in the calculation. Replaced System.err logging in TimeSeriesDlg with UFStatus handler logging. Since show latest forcast is always checked initially by default, removed some changes that were unncessary.
Change-Id: I68f80d5c1ffff9993bb9e2fb870a89426dca15aa

Former-commit-id: f378cfec92 [formerly 3fc699002f] [formerly f52f218813] [formerly f378cfec92 [formerly 3fc699002f] [formerly f52f218813] [formerly 09abbee8e9 [formerly f52f218813 [formerly 8bb318d9e42e855ccaab60dc763b42040c098e3e]]]]
Former-commit-id: 09abbee8e9
Former-commit-id: 71f5d6cfe1 [formerly a23e190b3e] [formerly 826ee862ba7b36f086579d0c9e39a99c4d22b01a [formerly 5552fe34a2]]
Former-commit-id: f10496364be54bb562722763f946745ce2658929 [formerly e8e07b3d59]
Former-commit-id: f2edc819fd
2012-09-14 10:56:28 -05:00
David Gillingham
9ed30526c3 Issue #1117: Fix WEBrowserDialog so that clicking on Source menu doesn't clear source selections.
Change-Id: I7341de07e986227f0917191626cdff8e25bafa30

Former-commit-id: 3b7e2b3627 [formerly f14efdfd7b] [formerly cd1acff953] [formerly 3b7e2b3627 [formerly f14efdfd7b] [formerly cd1acff953] [formerly a6d5f67f7a [formerly cd1acff953 [formerly 82a37521333d6cb471d9d770f99ba593a9ce76aa]]]]
Former-commit-id: a6d5f67f7a
Former-commit-id: b3f97a70b7 [formerly c7f3c50a35] [formerly 9eca90d25acea37355c1a256a17e5cbef460f23d [formerly 4a2ebe8218]]
Former-commit-id: abc42c9ef3b1e6c10c78648481828dac6e643d55 [formerly 9c0d31db01]
Former-commit-id: d8e181911e
2012-09-14 10:50:44 -05:00
Nate Jensen
f37499e98e Merge "Issue #1172 - Corrected update problem" into development
Former-commit-id: e97b1fdbcc [formerly d24cc4440c] [formerly 9daaa199ea] [formerly e97b1fdbcc [formerly d24cc4440c] [formerly 9daaa199ea] [formerly 3ae061edf8 [formerly 9daaa199ea [formerly d04a01d963a40711e7ed78b0767b699adfd75b2b]]]]
Former-commit-id: 3ae061edf8
Former-commit-id: ae8d765d70 [formerly b6305cfea7] [formerly 3187bdf802622b7854951f5a746147c085575113 [formerly 7343b1a998]]
Former-commit-id: 8019f47553c72aa32edcd22a76282250b31deba7 [formerly 81699c719d]
Former-commit-id: 0ced243e18
2012-09-14 10:42:59 -05:00
Nate Jensen
bf469fffbc Merge "Issue #1147: for ifpIMAGE ensure map labels default to off." into development
Former-commit-id: f3a1b17c06 [formerly cda905ffaa] [formerly 9fd69051eb] [formerly f3a1b17c06 [formerly cda905ffaa] [formerly 9fd69051eb] [formerly 458900fe11 [formerly 9fd69051eb [formerly 1f4d435e4b7b3db480db0b8aa41505acd44170dc]]]]
Former-commit-id: 458900fe11
Former-commit-id: edfdcfff9e [formerly 8ca45fece4] [formerly a3e2de009b0f823f19954dbdbfa8dbe8bd870c61 [formerly c330ae0ee7]]
Former-commit-id: e813ec137872e896564b29a758b37f85eb5ea054 [formerly 869d7a72d7]
Former-commit-id: adafbdc660
2012-09-14 10:42:26 -05:00
Nate Jensen
7212cc8b71 Merge "Issue #1143 Fixed GriddedImageDisplay2 which is what the CWAT resource uses so stops incorrectly doubling the size of the short array used for display." into development
Former-commit-id: 483447405f [formerly 58c99f5249] [formerly ee4fa911a2] [formerly 483447405f [formerly 58c99f5249] [formerly ee4fa911a2] [formerly 935d47f612 [formerly ee4fa911a2 [formerly 0bd2709db5b336ce5fe215234ba780ff48dc595b]]]]
Former-commit-id: 935d47f612
Former-commit-id: d502608ad9 [formerly 33846f9d4c] [formerly b424d82ebfee92328e15d2634cfb1d89c1a4fd0f [formerly 81fa37fe49]]
Former-commit-id: 0c2efdae4909eee91ec0e60d21f00850191e37cb [formerly 944b661bbe]
Former-commit-id: 4aab36341d
2012-09-14 10:41:59 -05:00
David Gillingham
3df33f2697 Issue #1147: for ifpIMAGE ensure map labels default to off.
Change-Id: If0e8d0ec18374132469729d1bb2db9cf767afaea

Former-commit-id: 3508097a55 [formerly b56f800d33] [formerly f9f1b6981c] [formerly 3508097a55 [formerly b56f800d33] [formerly f9f1b6981c] [formerly 89ee494e1a [formerly f9f1b6981c [formerly d865ea8fc6dbe66e05ea7d7271df4b43a60f2146]]]]
Former-commit-id: 89ee494e1a
Former-commit-id: 26ea2b3cf7 [formerly 3825fa3e59] [formerly 9b90da8222c737d351f113f14876c3c95d3439d5 [formerly 45d3000fe2]]
Former-commit-id: b9f8d63698cf379bbe0ea7a2009a63717de353da [formerly b0e12df6af]
Former-commit-id: 826b4ed24e
2012-09-14 10:08:01 -05:00
James Korman
fa876606dc Issue #1172 - Corrected update problem
Change-Id: Id600728f8f9352b9c44c261c24bf1af8ae6c8e32

Former-commit-id: 60d3a92995 [formerly 26ed32cb19] [formerly c228b73624] [formerly 60d3a92995 [formerly 26ed32cb19] [formerly c228b73624] [formerly f0eafc3839 [formerly c228b73624 [formerly d436841050e4d96dbe3b3cb1e54a9d62525c5d08]]]]
Former-commit-id: f0eafc3839
Former-commit-id: 0e296ab1ba [formerly f90f5fadb1] [formerly 8d27acff59c764cb79fa7e930c179c5b01df9096 [formerly 5c79be21d8]]
Former-commit-id: 9eab975d1b9a27305ae92ca63c99cf1cc03d7039 [formerly 8bd924f6a5]
Former-commit-id: 97e31b6639
2012-09-14 09:46:08 -05:00
Lee Venable
16d5ce5ebd Issue #1165 : initial update for the dialog refactor.
Issue #1165 - added JFACE code update.

Issue #1165 - changed method names.
Change-Id: I4fab0a7c1384a4f3e5f66a9daf90027d39421110

Former-commit-id: 5788991c34 [formerly 6ac7e90550] [formerly 045297e677] [formerly 5788991c34 [formerly 6ac7e90550] [formerly 045297e677] [formerly 14eb99add7 [formerly 045297e677 [formerly 687a13eb43abd6ff17b3aa82f2a0265159f5e6cc]]]]
Former-commit-id: 14eb99add7
Former-commit-id: 236e15e6bc [formerly 68d0ee976a] [formerly a27ddb6856f05c1bdee33dfc8b324aa6f0223172 [formerly 9267113411]]
Former-commit-id: 1c499b4c7a6f60f40d973e283bd129133945fe27 [formerly 0a23610dee]
Former-commit-id: 6875f14e23
2012-09-14 08:39:38 -05:00
Ron Anderson
6de33bf4c7 Merge "Issue #1117: Modify D2DGridDatabase to retrieve parms from GribParamInfo XML files, modify ParameterInfo to provide list of valid levels for each parameter, create utility script to convert A1 CDL to A2 XML format, modify WeatherElementBrowser so database lists are always current." into development
Former-commit-id: 5b13a48b8d [formerly b628c604ad] [formerly 5c844b346c] [formerly 5b13a48b8d [formerly b628c604ad] [formerly 5c844b346c] [formerly 2dc48d6a85 [formerly 5c844b346c [formerly 5cc4ec7f99bb7e8d3185b4c5aa2b40f86125b618]]]]
Former-commit-id: 2dc48d6a85
Former-commit-id: e786fbb969 [formerly af643434d2] [formerly 706b88b9771f483b97eb04373e6514b7f649068e [formerly 558cfd51cb]]
Former-commit-id: cfbcea7613200a091812e0ef1709f5ec8ba3ff1e [formerly 6dbf6c9c81]
Former-commit-id: 14dd12d24a
2012-09-13 17:41:14 -05:00
Max Schenkelberg
d90bc9b668 Issue #1143 Fixed GriddedImageDisplay2 which is what the CWAT resource uses so stops incorrectly doubling the size of the short array used for display.
Change-Id: I7fd59086fc75b7b72ebece857273c8d0c58d2abd

Former-commit-id: ac6c96dc4c [formerly dc613b2ba7] [formerly 2b20299319] [formerly ac6c96dc4c [formerly dc613b2ba7] [formerly 2b20299319] [formerly 0b361078b3 [formerly 2b20299319 [formerly 5698f8158b32789bab532e8820521f609e23a8c8]]]]
Former-commit-id: 0b361078b3
Former-commit-id: 0ff5dde0ba [formerly 18094f00ed] [formerly 729af0e9bf1baa090cf92f33588ab1ef791a8ca6 [formerly 0fc001113f]]
Former-commit-id: bbddac2d2e59d29ac53e73235d005f96152732fd [formerly d4b083d289]
Former-commit-id: 8c6a79a89f
2012-09-13 16:40:00 -05:00
Nate Jensen
5794d1a052 Merge "Issue #1170 Changed WorldWrapCorrector to take into account interior rings in polygons and world wrap correct them as well." into development
Former-commit-id: 19bd82a901 [formerly 661ef69489] [formerly 5e9ef6a224] [formerly 19bd82a901 [formerly 661ef69489] [formerly 5e9ef6a224] [formerly 1af2344565 [formerly 5e9ef6a224 [formerly 00c4c7a84f65c5c8bb45d3d3020d97c5b9d16eba]]]]
Former-commit-id: 1af2344565
Former-commit-id: bca649279a [formerly 7c5c958074] [formerly 97f92a24042a4b1fa8729bd98b3f95a2a4da1d7f [formerly 99a6312ae0]]
Former-commit-id: f46e0fc79f9d360d442bae009500e5763266e630 [formerly c1d12f5b54]
Former-commit-id: 4a0294bd3d
2012-09-13 16:26:02 -05:00
David Gillingham
d10b8b964d Issue #1117: Modify D2DGridDatabase to retrieve parms from GribParamInfo
XML files, modify ParameterInfo to provide list of valid levels for each
parameter, create utility script to convert A1 CDL to A2 XML format,
modify WeatherElementBrowser so database lists are always current.

Change-Id: If0513ed8ce8c1134e92c6702c58b2a49f17a6dc5

Former-commit-id: 4d7f324f64 [formerly 03a202134a] [formerly 21739d1d38] [formerly 4d7f324f64 [formerly 03a202134a] [formerly 21739d1d38] [formerly 99ab0a124b [formerly 21739d1d38 [formerly 16048abdc9c03aafc11046c716aedce9dd44b92c]]]]
Former-commit-id: 99ab0a124b
Former-commit-id: a048dee4b3 [formerly 28ade875c5] [formerly cfc850e4fc58538a74d0f8c0490660cc9d30f0f8 [formerly 964927b19d]]
Former-commit-id: da7d3be134a3c74fcdb1e41cda076543ccedbfc9 [formerly 527a457e55]
Former-commit-id: dcc5c7789d
2012-09-13 15:39:58 -05:00
Steve Harris
01248e7101 Merge branch 'development' into Enhanced_points
Former-commit-id: b84b354c01 [formerly 2e47ad78bc] [formerly 321e2191b1] [formerly b84b354c01 [formerly 2e47ad78bc] [formerly 321e2191b1] [formerly 6146f56ce4 [formerly 321e2191b1 [formerly ee63462d73511ef55dc0d80b3e94ef08a37f3305]]]]
Former-commit-id: 6146f56ce4
Former-commit-id: 92bac7167a [formerly bc86013d8f] [formerly 1519ecf79b5f70bd2a5878e760356c231a28383c [formerly 9ca736f901]]
Former-commit-id: 8426fe487b6ac801ec3e1fdc9e8591d2f018b9cf [formerly 69b6272658]
Former-commit-id: 40ddaa276f
2012-09-13 15:25:12 -05:00
Steve Harris
de8ec1b459 Merge branch 'development' of ssh://lightning.omaha.us.ray.com:29418/AWIPS2_baseline into development
Former-commit-id: 2a42503413 [formerly 9ae530cd1b] [formerly abc2a7fb62] [formerly 2a42503413 [formerly 9ae530cd1b] [formerly abc2a7fb62] [formerly da0afec2c1 [formerly abc2a7fb62 [formerly 165e2e8bfb9527ba1d5c274e351d63196eafa0e9]]]]
Former-commit-id: da0afec2c1
Former-commit-id: 65fc6b85b0 [formerly f4ed20ec4e] [formerly ec0172ce05892299c83bf5ec5335a17b6abc84cd [formerly dcae36f2d7]]
Former-commit-id: 708c6e6667c214a6429bb58ffcd958102de053f3 [formerly e860b1ea6d]
Former-commit-id: 42f2977019
2012-09-13 15:21:40 -05:00
Max Schenkelberg
3d478f934f Issue #1170 Changed WorldWrapCorrector to take into account interior rings in polygons and world wrap correct them as well.
Change-Id: I4756cffb310ba9c7eab707b3764f667db01f886f

Former-commit-id: 587b5bacc0 [formerly 3cdabeb7cd] [formerly 5a9d7eea35] [formerly 587b5bacc0 [formerly 3cdabeb7cd] [formerly 5a9d7eea35] [formerly 932e4da3a9 [formerly 5a9d7eea35 [formerly ac26e6f39bc21ecb4b2bd13a20f72d4f4c470e67]]]]
Former-commit-id: 932e4da3a9
Former-commit-id: 38c1f1bb52 [formerly 78348fd355] [formerly 8053cdf94bff1afc4a5eb26c0e3e4653e80c2fb3 [formerly e6ca7b1122]]
Former-commit-id: f22eb8101a72b4259667d42f478522cd36a0f62c [formerly 3962f6b156]
Former-commit-id: 2caf54f9d3
2012-09-13 14:37:20 -05:00
Brad Gonzales
e4e96327f0 Issue #1158 Changed the scheduled and alerted alarm containers in SCANAlarmAlertManager to be sychronized. Changed the alarm button and alarm in SCANCellTableDlg to show and alarm only when the current table has alarms. Turn off alarms if the threshold has changed. Also a fix for ScanResource to initialize the ScanDrawer only after it has initialized the GeodeticCalculator.
Former-commit-id: 0750f76993 [formerly 49f61f42f1] [formerly 02ca1776b4] [formerly 0750f76993 [formerly 49f61f42f1] [formerly 02ca1776b4] [formerly 1ed32bdefc [formerly 02ca1776b4 [formerly e1f97dfdf69c0cf625555372e8855d85967c4b2a]]]]
Former-commit-id: 1ed32bdefc
Former-commit-id: 9575ce37d2 [formerly c34cdda42f] [formerly af9bbfb5aa58b854fab891b292d963e9ec66cad2 [formerly 88d9115db9]]
Former-commit-id: d587191e75e38d5c93e25ec02a38f42309887bb7 [formerly 10ddb22854]
Former-commit-id: 3fab94cf35
2012-09-13 14:20:23 -05:00
Steve Harris
12c59e82df Merge branch 'ss_builds' (12.10.1-4) into development
Conflicts:
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/alarmalert/dialogs/CurrentAlarmQueue.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java

Former-commit-id: bedc9569ca [formerly 04de1d5857] [formerly 29e7427dc3] [formerly bedc9569ca [formerly 04de1d5857] [formerly 29e7427dc3] [formerly 04d9735c8f [formerly 29e7427dc3 [formerly 4b7c9ed0bdf6dc1a3a86421b502a176256d56aeb]]]]
Former-commit-id: 04d9735c8f
Former-commit-id: 9d1f595fe6 [formerly e23b030dfd] [formerly 9191d8c6cfa1f6e0cfae44b8ecd803bd00e75cc9 [formerly 53673f63e6]]
Former-commit-id: bd0ee0b429fad620ecf3eac1dfa68366ef64350e [formerly f80fb62837]
Former-commit-id: 30b0700044
2012-09-13 13:26:13 -05:00
Steve Harris
987397b2db 12.10.1-4 baseline
Former-commit-id: ddc923e3e0 [formerly 9cd1f3ec0f] [formerly 791ef6cedf] [formerly ddc923e3e0 [formerly 9cd1f3ec0f] [formerly 791ef6cedf] [formerly 92cc2d8605 [formerly 791ef6cedf [formerly ce574eeff1d197862c8aac2d3fc838a452862576]]]]
Former-commit-id: 92cc2d8605
Former-commit-id: 27d8601fe0 [formerly f641cdd4e0] [formerly 53da655c90a1b4d0e3b7bbcaf373c23ba32edc6a [formerly b4d2a0e8dd]]
Former-commit-id: 5159825bf9b81d8d0188fb4bcfd469ccb27fd393 [formerly 451459d8cb]
Former-commit-id: f61c5114e8
2012-09-13 12:33:36 -05:00
Steve Harris
ed04125cd7 12.10.1-4 baseline
Former-commit-id: 0d8d18d7e2 [formerly e38e81ab8c] [formerly fd19ca5624] [formerly 0d8d18d7e2 [formerly e38e81ab8c] [formerly fd19ca5624] [formerly 49c3861597 [formerly fd19ca5624 [formerly 56e6f8927c92cd546e5fb7a01ad2f19add91f6ed]]]]
Former-commit-id: 49c3861597
Former-commit-id: 424c32bd5d [formerly 684feb34e5] [formerly 26cccfeea72d00040b6ff379b12158bba9f339d2 [formerly 2ba58a3576]]
Former-commit-id: 8c6c58e31355710e22a13ff534f4c47d0ed7d0b0 [formerly 26b7d083ec]
Former-commit-id: e57e7237a9
2012-09-13 12:08:11 -05:00
James Korman
42a67b10de Issue #1011 - Corrected AIREP turbulence decoding
Change-Id: Ie56a2b916df7b68f28cca73235f33596b903c5b1

Former-commit-id: 972d96fe33 [formerly 6531df3ab0] [formerly c0e5570aa2] [formerly 972d96fe33 [formerly 6531df3ab0] [formerly c0e5570aa2] [formerly d3fd8a53df [formerly c0e5570aa2 [formerly 41dd04864bbd4b510b5e1b0c6e4259bb140b9b2e]]]]
Former-commit-id: d3fd8a53df
Former-commit-id: a5bc971db4 [formerly 2241841dcd] [formerly a836538e0d3617f5215a978ca16aab21016c1d40 [formerly 029f9537c8]]
Former-commit-id: 95e331224aaa35bb86bde1956d0fe600d48a143f [formerly a58854cd36]
Former-commit-id: be6c142d24
2012-09-13 10:18:39 -05:00
Richard Peter
57f89b265d Merge "Issue #951 added Appender EnvConfigurableRollingFileAppender." into development
Former-commit-id: fc1e536f99 [formerly 89b376611f] [formerly 01f8febfd5] [formerly fc1e536f99 [formerly 89b376611f] [formerly 01f8febfd5] [formerly cc479cccc5 [formerly 01f8febfd5 [formerly 028d3984932a79fbdf290c9bf53971cf31f11ff8]]]]
Former-commit-id: cc479cccc5
Former-commit-id: 41f59ada35 [formerly b93815fefd] [formerly bc067e1760c89a61d247dec01d3115baef46f106 [formerly 7d61eaccf7]]
Former-commit-id: 9fb4ba71be5337939a7334bf27419feeead22224 [formerly e4539af9a2]
Former-commit-id: 963bb6170e
2012-09-13 09:36:14 -05:00
Roger Ferrel
2a5bbcd49c Issue #1155 Per email changed default id from 'blank' to hyphen '-'.
Change-Id: Iea2dcb2ecb15662d158c93a6e81989335860e581

Former-commit-id: 0743085c57 [formerly 6ceebcc2ee] [formerly c1315ae6f5] [formerly 0743085c57 [formerly 6ceebcc2ee] [formerly c1315ae6f5] [formerly 412337bc42 [formerly c1315ae6f5 [formerly 993c0cf0eb9e31b1aa1ffa339d49e323571aaa1b]]]]
Former-commit-id: 412337bc42
Former-commit-id: 508ad5117c [formerly 8add761edb] [formerly 5e5b15081d7d9a2ffd400340bab454e61a8d2401 [formerly f5347f2373]]
Former-commit-id: e275fe18c650af325ec48268619ad7e03d17423b [formerly 7b97c64025]
Former-commit-id: fb6942dc3b
2012-09-13 08:23:00 -05:00
Brad Gonzales
314039d80b Issue #951 added Appender EnvConfigurableRollingFileAppender.
Change-Id: Icfab60803c647afad6aa30e516083e46b27be75b

Former-commit-id: b384c8372b [formerly 32df328434] [formerly 4b383c3274] [formerly b384c8372b [formerly 32df328434] [formerly 4b383c3274] [formerly d10cabc917 [formerly 4b383c3274 [formerly 4d103fe06c94b8d5067e44aaabfdac88347f9a96]]]]
Former-commit-id: d10cabc917
Former-commit-id: 05314b8677 [formerly 2ea4005704] [formerly 843e55a046283daa44610ca5e1825fc4341a5d8c [formerly 41dc92ba3a]]
Former-commit-id: 90626b830e47e9f701dbe0bcb7f2187920d0838d [formerly b9937ef456]
Former-commit-id: f4e27386cd
2012-09-13 07:50:56 -05:00
Nate Jensen
3c55680a39 Merge "Issue #875 Now does faster refresh and properly handle nofification of other CAVEs of changes." into Enhanced_points
Former-commit-id: bed0deac22 [formerly 0d2a6afbaf] [formerly 60c1c059c6] [formerly bed0deac22 [formerly 0d2a6afbaf] [formerly 60c1c059c6] [formerly b5309d2484 [formerly 60c1c059c6 [formerly d03287982238676b7f7f76cf1ff4e1404e66f038]]]]
Former-commit-id: b5309d2484
Former-commit-id: 9217868a4d [formerly 40d8ecacd4] [formerly 349fbcae967a5ebe66c180fbe663a9eb3245a21f [formerly 02453bf3e8]]
Former-commit-id: 1812f69df37ef28228a0d02fef85bcd156b8745c [formerly 08bd26f2a1]
Former-commit-id: 2792abbdaf
2012-09-12 15:04:58 -05:00
Roger Ferrel
773136c54f Issue #1155 changed default WMO id to 'blank'.
Change-Id: I1374b7584545e1510745882972e96011fd6db128

Former-commit-id: 758b90b2b3 [formerly 65b8cd58c3] [formerly d61f796f31] [formerly 758b90b2b3 [formerly 65b8cd58c3] [formerly d61f796f31] [formerly 00d7dea2eb [formerly d61f796f31 [formerly c68617688bebf943fba3f46ab4df200ee4f99cc8]]]]
Former-commit-id: 00d7dea2eb
Former-commit-id: 63725482a3 [formerly 1b76eec288] [formerly 610f75dddcd8f45283a33719f385e68b0ff42391 [formerly c6bbd04898]]
Former-commit-id: 9eeb2a2a1496fcdf0a51793d3211a8d4acf9af22 [formerly 789e5f513d]
Former-commit-id: 731fcd6f3c
2012-09-12 14:55:15 -05:00
Richard Peter
d9d7723686 Merge "Issue #626 Changed satellite distribution file to only match on expected WMO headers TIC, TIG, and TIT" into development
Former-commit-id: 8dddc6338f [formerly c6be036eaf] [formerly 9b4a60d1b5] [formerly 8dddc6338f [formerly c6be036eaf] [formerly 9b4a60d1b5] [formerly e858b42697 [formerly 9b4a60d1b5 [formerly 281071d8f0fd51f5ef72598ddeed02a0dc47d4c8]]]]
Former-commit-id: e858b42697
Former-commit-id: 3f73c4f123 [formerly b5fd0f7116] [formerly e4cc02c28d87b9df34f8ffef36603611cb880b6c [formerly 08696bbdb6]]
Former-commit-id: 3f9778387f4cfc0ba0cd3f83c6b4bcf520c525b3 [formerly 3c84d0dbc0]
Former-commit-id: 60fbe9cfe1
2012-09-12 14:31:37 -05:00
Steve Harris
5b45d94813 Merge branch 'development' into Enhanced_points
Former-commit-id: bb6fe85a47 [formerly 892598dc66] [formerly 1dd1305a5d] [formerly bb6fe85a47 [formerly 892598dc66] [formerly 1dd1305a5d] [formerly ada1066831 [formerly 1dd1305a5d [formerly 632a766ec44337156bab8df73aecdee8b7bc2853]]]]
Former-commit-id: ada1066831
Former-commit-id: 0f90ce8b04 [formerly e0ee6bbf96] [formerly ad082c7958881e97fce6af73febade39a438deb1 [formerly d85659d9de]]
Former-commit-id: 5c4e50ab82874e05d162915d324435e735821222 [formerly d20a1de861]
Former-commit-id: 73b1005512
2012-09-12 14:14:56 -05:00
Steve Harris
5ffa959e86 Merge branch 'ss_builds' (12.10.1-3 - better version) into development
Former-commit-id: ea4731bde5 [formerly 1c37242c8b] [formerly 3338cabcb2] [formerly ea4731bde5 [formerly 1c37242c8b] [formerly 3338cabcb2] [formerly ce5f09ec5c [formerly 3338cabcb2 [formerly 028c1bb9fe740017da11979d492eaec84d97a75f]]]]
Former-commit-id: ce5f09ec5c
Former-commit-id: 6d1247aedc [formerly cb1c6ecc5d] [formerly 5891709b2b99eb2f869a95cff1ed1550026d80b5 [formerly 6ab33ffb07]]
Former-commit-id: 78023febf63aadc05de940b527a0c8f66b1f05d8 [formerly d7e6be52bc]
Former-commit-id: a85d6b541a
2012-09-12 13:17:30 -05:00
Steve Harris
7a4eb9bf41 12.10.1-3 baseline (better than previous which was missing changeset 7d75620)
Former-commit-id: bbc20f4a68 [formerly 22dac5c82e] [formerly 077ced354e] [formerly bbc20f4a68 [formerly 22dac5c82e] [formerly 077ced354e] [formerly fd5e214e72 [formerly 077ced354e [formerly af8ffe73c81cd980843f137800f9fbb453c9e2c0]]]]
Former-commit-id: fd5e214e72
Former-commit-id: 11421048fb [formerly 9f3bd0d4ec] [formerly bdf8cbe13f96fe312d8ad014285d113e04c8d85a [formerly ba25027ea5]]
Former-commit-id: 669f728964989299c9646d57fbe148142a246f5f [formerly 2002a7cb8d]
Former-commit-id: 6ce314ca65
2012-09-12 13:10:36 -05:00
Max Schenkelberg
1d31564f30 Issue #626 Changed satellite distribution file to only match on expected WMO headers TIC, TIG, and TIT
Change-Id: I2e6e538870c605675d8070d79786398adbf7dbcb

Former-commit-id: 863ecb1ad6 [formerly e1b01588d1] [formerly eabc8d684b] [formerly 863ecb1ad6 [formerly e1b01588d1] [formerly eabc8d684b] [formerly cc37173be9 [formerly eabc8d684b [formerly 42b8711fa44c85aee40070683729727192b62891]]]]
Former-commit-id: cc37173be9
Former-commit-id: c8d7d72fcb [formerly 69ba6f1ce1] [formerly 95fa4b0a40ddfb9e179dc5f25ed544f2ae347f2c [formerly ec9b3c56fb]]
Former-commit-id: e75f755759751a0b003abbbe3b918016be694f23 [formerly 411a8d43a0]
Former-commit-id: fca4448458
2012-09-12 09:22:25 -05:00
Nate Jensen
8648c59a64 Merge "Issue #1164 Revereted Friedman changes to time matcher over last 5 months. Fixed original issues for DRs 14699 and 15160 by getting rid of setTimeList on AbstractTimeMatcher and instead calling redoTimeMatching when a resource is added. Also made time matching happen in job when resource is removed." into development
Former-commit-id: 761795bbae [formerly 3c240d3269] [formerly 89fb0a5bee] [formerly 761795bbae [formerly 3c240d3269] [formerly 89fb0a5bee] [formerly bb68c93607 [formerly 89fb0a5bee [formerly 9b20aae000c7d4ac25dada94390eb3e8d70a6cc9]]]]
Former-commit-id: bb68c93607
Former-commit-id: 43c2ee4358 [formerly 4f457a34b9] [formerly 7b464ea25fc9ce3602bc4d975dce3f84fbefe8f3 [formerly 50c95b06f9]]
Former-commit-id: 09d667a8dc119e82e7596885f962ae423621fa14 [formerly 5b6f330da6]
Former-commit-id: 89447077ee
2012-09-12 09:18:24 -05:00
Roger Ferrel
6c2ffb654d Issue #875 Now does faster refresh and properly handle nofification of other CAVEs of changes.
Amend: Changes from code review

Change-Id: I556174de78c98730cabcd194b657db55328cf551

Former-commit-id: fa4d4e0ff8 [formerly 5b320fe49d] [formerly 6df929a87d] [formerly fa4d4e0ff8 [formerly 5b320fe49d] [formerly 6df929a87d] [formerly be8e334da3 [formerly 6df929a87d [formerly ae352e695a198b4f675249d1ef22118305d2f682]]]]
Former-commit-id: be8e334da3
Former-commit-id: 5070a3b22c [formerly e8675be231] [formerly 509780471409fb7e4558715d54c4c9137c2dfc08 [formerly 8b4e7346a6]]
Former-commit-id: 7b54f1018f34ceec8cf0fc0f2783685d8caca306 [formerly c276743760]
Former-commit-id: 4c60f31617
2012-09-12 09:00:33 -05:00
Richard Peter
fe8d1b40f7 Merge "Issue #1134 - edex will now use the same jep library that CAVE does" into development
Former-commit-id: 5baaa6593f [formerly c8443cf85c] [formerly 701960a246] [formerly 5baaa6593f [formerly c8443cf85c] [formerly 701960a246] [formerly 60b21393fc [formerly 701960a246 [formerly 978e35357ee01c8b5d7fc4f4ced8ba82a3ddd0b6]]]]
Former-commit-id: 60b21393fc
Former-commit-id: f1d458e450 [formerly 9d1413ff28] [formerly 1caef7b52e6ad68e0ead7729ecc24930c9ffc1dc [formerly b5d3a41fb1]]
Former-commit-id: 5317efa78bec07bb182f7ff1944ef2332146ed46 [formerly c142137798]
Former-commit-id: 457cb5375e
2012-09-12 08:27:11 -05:00
Steve Harris
24dde5731f Merge branch 'development' of ssh://lightning.omaha.us.ray.com:29418/AWIPS2_baseline into development
Former-commit-id: eff949899d [formerly d39a318583] [formerly 503cddcc5e] [formerly eff949899d [formerly d39a318583] [formerly 503cddcc5e] [formerly adf25aa707 [formerly 503cddcc5e [formerly 6d859accd185300997d14e7daf17f3c3257c348d]]]]
Former-commit-id: adf25aa707
Former-commit-id: 1ce86f79cb [formerly 31c1998d08] [formerly ce66c34bbdf3a8a1520465c247af5fbfd7bd9f07 [formerly 865fd2f475]]
Former-commit-id: dc5aa9e2fb2cce6ca63b93113b6933be26786d6a [formerly dbd228eea2]
Former-commit-id: 2d3fdd9558
2012-09-11 17:06:26 -05:00
Steve Harris
e78abbb503 Merge branch 'ss_builds' (12.10.1-3) into development
Conflicts:
	cave/com.raytheon.uf.viz.ccfp/src/com/raytheon/uf/viz/ccfp/rsc/CcfpResource.java
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/tile/TileLevel.java
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/tile/TileSetRenderable.java
	cave/com.raytheon.uf.viz.kml.export.feature/build.properties
	cave/com.raytheon.uf.viz.kml.export.feature/feature.xml
	cave/com.raytheon.uf.viz.kml.export/src/com/raytheon/uf/viz/kml/export/graphics/ext/KmlSingleColorImageExtension.java
	cave/com.raytheon.uf.viz.truecolor/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObject
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/makehazard/MakeHazardDialog.java
	cave/com.raytheon.viz.ghg/src/com/raytheon/viz/ghg/MakeHazardsAction.java
	edexOsgi/com.raytheon.uf.common.geospatial/src/com/raytheon/uf/common/geospatial/interpolation/data/UnsignedByteArrayWrapper.java
	rpms/awips2.core/Installer.edex-environment/wes2bridge.files/deliverables/scripts/edex-environment

Former-commit-id: 2f57e328fe [formerly f94db138cd] [formerly 64d4e2bded] [formerly 2f57e328fe [formerly f94db138cd] [formerly 64d4e2bded] [formerly 012c526816 [formerly 64d4e2bded [formerly e4e12a182b674b136c2753e3fd2f79a3a338ebee]]]]
Former-commit-id: 012c526816
Former-commit-id: 047003d8c0 [formerly b14d30591b] [formerly bf5ba423a5556426548660494a7905779f996b28 [formerly 41c82361f7]]
Former-commit-id: 585e00c89332757d4df66cf4a92879c20bf9d63b [formerly bba73380ca]
Former-commit-id: 3bec22460f
2012-09-11 16:57:03 -05:00
Max Schenkelberg
6b5b4197a0 Issue #1164 Revereted Friedman changes to time matcher over last 5 months. Fixed original issues for DRs 14699 and 15160 by getting rid of setTimeList on AbstractTimeMatcher and instead calling redoTimeMatching when a resource is added. Also made time matching happen in job when resource is removed.
Change-Id: I7f72f9782f0f28b25a202e48e5391d1ad34ce91d

Former-commit-id: 5e94274b98 [formerly a6cc869ada] [formerly 7294025e26] [formerly 5e94274b98 [formerly a6cc869ada] [formerly 7294025e26] [formerly 2f8f1ce9b2 [formerly 7294025e26 [formerly 64194223bc30a629b32ca8aa5cefbcfdf8fd6776]]]]
Former-commit-id: 2f8f1ce9b2
Former-commit-id: 1e81c703f1 [formerly 52e812ec0e] [formerly 879019359ad23ac206937c8d749c606eda7eac91 [formerly c26d21d908]]
Former-commit-id: 0f1fad1da8c7a5d1787cda72eb269efb5b9cde6d [formerly 1badd11cdb]
Former-commit-id: fbc35a39d4
2012-09-11 16:27:41 -05:00
Steve Harris
9d4e230e7a 12.10.1-3 baseline
Former-commit-id: 0403e7d0a9 [formerly de1639aea2] [formerly 21f430062b] [formerly 0403e7d0a9 [formerly de1639aea2] [formerly 21f430062b] [formerly 969e7e6dfd [formerly 21f430062b [formerly 1a94c1ca3674c8e4dbb8847de5190efe33da371c]]]]
Former-commit-id: 969e7e6dfd
Former-commit-id: 64699fa90b [formerly f376a4b4db] [formerly fcb66f8bc7809d9eb8a7989d2e1acbdbe19fb78e [formerly 438d139fdd]]
Former-commit-id: 477c548d5650883749d49288002c87221b218db7 [formerly faadb51529]
Former-commit-id: 5030894212
2012-09-11 16:00:38 -05:00
Steve Harris
4ccea19158 12.10.1-2 baseline
Former-commit-id: bb190a66a1 [formerly dde1f4c54d] [formerly 250f0ccac9] [formerly bb190a66a1 [formerly dde1f4c54d] [formerly 250f0ccac9] [formerly a66f3f4b60 [formerly 250f0ccac9 [formerly 3dab4c2eb757ceea21f4db5bb78e8b92767dd18c]]]]
Former-commit-id: a66f3f4b60
Former-commit-id: 406bde9fd0 [formerly ec74f638e5] [formerly f7762df316c068a0c6bb3ef9e303f7dbe3b9cd4a [formerly 34d2ddee9d]]
Former-commit-id: c8612b01cf2efa0937102321eb6c14dfe7097005 [formerly cc3c3dadee]
Former-commit-id: 5684a84a46
2012-09-11 15:50:57 -05:00