Commit graph

1954 commits

Author SHA1 Message Date
Mike Duff
2a9f890c9d Issue #2096 - Display of Madis point data
Change-Id: Ic2f47dd592dca9694b7bed3260b5fb854eb4e52a

Former-commit-id: 42a26cef99 [formerly 95c8e6422f] [formerly 42a26cef99 [formerly 95c8e6422f] [formerly b3eb6be510 [formerly c2f940c204e7cce42cc00eb3ab607bf710a3a2e3]]]
Former-commit-id: b3eb6be510
Former-commit-id: 53e6e2de49 [formerly 88f90382e4]
Former-commit-id: 981adc2413
2013-07-12 14:39:09 -05:00
Max Schenkelberg
7f1784e352 Issue #2190 Cleaned up sounding and cloud height dependencies
Change-Id: If07406f7e618fca0ea001b56a81b8552d9d44546

Former-commit-id: dccc265ab0 [formerly d4c7a0c302] [formerly dccc265ab0 [formerly d4c7a0c302] [formerly 56fef93541 [formerly 767ecfd7f2930de641d532d08120d5023b6e38e4]]]
Former-commit-id: 56fef93541
Former-commit-id: 8ea57bfbac [formerly 8ad1acdbc5]
Former-commit-id: 43344e0340
2013-07-12 10:12:48 -05:00
Dustin Johnson
5f55b64857 Issue #2106 Create SubscriptionRetrievalAttributes to only load Subscription objects when required
Amend: Peer review comments, also fixed bug where subscriptions weren't being loaded on changing bandwidth

Change-Id: I8b5a122b0434d54dcfcbff9df6283edad68d7eb1

Former-commit-id: a821cdac28 [formerly 050b38fa9a] [formerly a821cdac28 [formerly 050b38fa9a] [formerly 5f38365571 [formerly 4da045d4c13a7d14cdbea3269409f2020e0c78f1]]]
Former-commit-id: 5f38365571
Former-commit-id: 2756292e27 [formerly 6992ae7a11]
Former-commit-id: 273928f386
2013-07-12 09:01:05 -05:00
Roger Ferrel
3f8ac119d0 Issue #2088 Changes for non-blocking ContactsDlg.
Change-Id: I8e9bd796b6b811cbcbd4159d7b209733fffa23df

Former-commit-id: 11625b6eb3 [formerly 9800f069e9] [formerly 11625b6eb3 [formerly 9800f069e9] [formerly 88e0eeb81c [formerly 82e4a0edf2dbe2d2eca430b42adb50f8ec4e8125]]]
Former-commit-id: 88e0eeb81c
Former-commit-id: 52ce08d4f7 [formerly 69d3ccecf4]
Former-commit-id: f0845257e0
2013-07-11 13:02:13 -05:00
Mike Duff
6a0a9400ad Issue #2166 - Select the site before opening Hydro TS Control dialog
Change-Id: I2220de3092430e6af36f9e3c2a4c8f0fa3b00163

Former-commit-id: bcd4a0aff1 [formerly 8a963939a8] [formerly bcd4a0aff1 [formerly 8a963939a8] [formerly afe9e049b3 [formerly bcf0b1285e46d62695515051cbec17945c2646f0]]]
Former-commit-id: afe9e049b3
Former-commit-id: a8fd06f8d3 [formerly fc46308738]
Former-commit-id: 38ed97d48b
2013-07-10 11:45:56 -05:00
Greg Armendariz
b601345c9f 13.5.1-6 baseline
Former-commit-id: 5894853996 [formerly 7e09fa5a0b] [formerly 5894853996 [formerly 7e09fa5a0b] [formerly b9044b1195 [formerly 30b8d4c0ce425715ea44a394b4b4f143c64b416a]]]
Former-commit-id: b9044b1195
Former-commit-id: 93b71934c0 [formerly 12a09f9aa7]
Former-commit-id: ec2637676d
2013-07-10 10:04:22 -04:00
Lee Venable
d82304ac79 Issue #1928 - Removed SWT browser to prevent errors.
Change-Id: Ifad38700dfc12ec3cade8dc62fa8c46fbf06ed80

Former-commit-id: 6a63ae3a79 [formerly 6d15b7795f] [formerly 6a63ae3a79 [formerly 6d15b7795f] [formerly d8335ecd23 [formerly b69e08c40d305005b28c003b6165bcc8d4b41f10]]]
Former-commit-id: d8335ecd23
Former-commit-id: 1da9605d7e [formerly 89f2a6666a]
Former-commit-id: 4e6206ccc3
2013-07-09 17:10:22 -05:00
Roger Ferrel
5d1d211890 Issue #2145 Verify movable ring coordinates prior to saving.
Change-Id: I4772e180d0af394985dbd1bdc65007a8c02feed0

Former-commit-id: f31f880a19 [formerly f279672f6f] [formerly f31f880a19 [formerly f279672f6f] [formerly 26ffb4d885 [formerly 8048d0e91041d734239b11b18df34a87b5e75c35]]]
Former-commit-id: 26ffb4d885
Former-commit-id: cd63b071db [formerly 9e195e5469]
Former-commit-id: 73fd01fa51
2013-07-09 14:05:35 -05:00
Roger Ferrel
9f1f91258f Issue #2088 Non-blocking ColorScaleMgrDlg and ColorChooserDlg.
Change-Id: I6f14726a466780e0dbab13d8b64fa2c55acf55d0

Former-commit-id: e73559b871 [formerly d5e66e410d] [formerly e73559b871 [formerly d5e66e410d] [formerly f3bdbde9d3 [formerly 108c5a4957b6d3ab50eacd5792122f7cd2ff3cba]]]
Former-commit-id: f3bdbde9d3
Former-commit-id: 44724d9487 [formerly 696885dc4b]
Former-commit-id: b82c76157c
2013-07-09 11:13:43 -05:00
Mike Duff
fee7cdb0f1 Issue #2137 - Change Data Browser Dialog to only allow a single data type to be selected
Review comments

Change-Id: Ic4f508ea98683f750b906292094740a4538950b1

Former-commit-id: 53ebc492e1 [formerly 9aaf06ab73] [formerly 53ebc492e1 [formerly 9aaf06ab73] [formerly 9f6213f9a5 [formerly 1015a76693e73c52d2bc56c18c4f3dfa25092771]]]
Former-commit-id: 9f6213f9a5
Former-commit-id: 7a8d39b1da [formerly 502a141297]
Former-commit-id: 70492fbb2d
2013-07-09 08:15:28 -05:00
Lee Venable
4b90569add Merge "Issue #2088 Made FcstPointGroupDlg, FloodReportDlg, HydroBaseDlg and StationFilterOptionsDlg non-blocking." into development
Former-commit-id: 7cf71c36af [formerly ab16e2c8a1] [formerly 7cf71c36af [formerly ab16e2c8a1] [formerly 2933cc2ca8 [formerly c2d9a2d394fc2ab0f60c63d11323af8db90655da]]]
Former-commit-id: 2933cc2ca8
Former-commit-id: 33ec4dd688 [formerly b36c421c9a]
Former-commit-id: 2b7feb420d
2013-07-08 17:06:42 -05:00
Nate Jensen
27b9cde410 Merge "Issue #2145 Added slection indicator and verificaton of lat, lon and radius." into development
Former-commit-id: 4bb1dc7493 [formerly 5f07ddf81b] [formerly 4bb1dc7493 [formerly 5f07ddf81b] [formerly c7ec0ba929 [formerly 12b690f90ee9cf5ab2fe632236f56254efc09a11]]]
Former-commit-id: c7ec0ba929
Former-commit-id: d2c398392d [formerly 829cb5d9eb]
Former-commit-id: 84e7cf173d
2013-07-08 14:42:59 -05:00
Nate Jensen
6f4d06acfe Merge "Issue #2154 Ensure all resource groups get removed from the time matcher." into development
Former-commit-id: 84ccd3140d [formerly 1287301152] [formerly 84ccd3140d [formerly 1287301152] [formerly 6bb28cddcf [formerly 11ee25f7b9eb2f041e75e5922c9ebe95c1e64bab]]]
Former-commit-id: 6bb28cddcf
Former-commit-id: ed0df5c004 [formerly 5ced5e04ff]
Former-commit-id: a42c398300
2013-07-08 13:33:30 -05:00
Ben Steffensmeier
812a14c5cc Issue #1869 Fix goes sounding updates.
Change-Id: Ib974c8e88bea021e0e8505e6fb2974f4e108dc80

Former-commit-id: 309624cb7b [formerly dbe74b56e5] [formerly 309624cb7b [formerly dbe74b56e5] [formerly 21abe429ec [formerly 127609cb0ced4b4554943ad78d4263cb70489a90]]]
Former-commit-id: 21abe429ec
Former-commit-id: 0b9c18aa23 [formerly e92d1e9cad]
Former-commit-id: c74c93af71
2013-07-08 11:47:08 -05:00
Dustin Johnson
0a1abe8f7c Merge "Issue #2138 - Fixed to not use filter if filter is disabled." into development
Former-commit-id: 6101c8a586 [formerly b8800c0616] [formerly 6101c8a586 [formerly b8800c0616] [formerly e2ffbd9b27 [formerly 35a2a6d54af2aa62cc3a256869e409cdb7868cb0]]]
Former-commit-id: e2ffbd9b27
Former-commit-id: 86710ba9b6 [formerly 56d1806f22]
Former-commit-id: aae6466381
2013-07-08 08:39:14 -05:00
Dustin Johnson
9b724cea3f Merge "Issue #2132 - review comments" into development
Former-commit-id: 93c7fe3ac9 [formerly a414049f39] [formerly 93c7fe3ac9 [formerly a414049f39] [formerly daf64a7923 [formerly 62394f1d0d8ebcd9781b5c3e377469c04ebd7dc2]]]
Former-commit-id: daf64a7923
Former-commit-id: 2bee69bceb [formerly 7606d9e7ff]
Former-commit-id: 47f8f65a38
2013-07-08 08:38:47 -05:00
Roger Ferrel
87b937b6d9 Issue #2145 Added slection indicator and verificaton of lat, lon and radius.
Change-Id: I10492bdd2e74b5ea8fd9386528019665185ae584

Former-commit-id: a438c9ff2a [formerly c44c11279d] [formerly a438c9ff2a [formerly c44c11279d] [formerly 5224ab80f0 [formerly ab2bd047048b72ea69566925046b329dc67091ab]]]
Former-commit-id: 5224ab80f0
Former-commit-id: b057f27a94 [formerly 895d0dc823]
Former-commit-id: 2a40a92307
2013-07-05 13:33:53 -05:00
Mike Duff
1ec831f66c Issue #2138 - Fixed to not use filter if filter is disabled.
Change-Id: Id40d60b3a478572a1ff09bc92f20fbed9b199d4d

Former-commit-id: cb024359ad [formerly 4442946626] [formerly cb024359ad [formerly 4442946626] [formerly c493182fa4 [formerly 2ced83baa19c11c0eb37f02779ae344e75d108b7]]]
Former-commit-id: c493182fa4
Former-commit-id: a4dfdd7313 [formerly 49cf68617f]
Former-commit-id: bd9ee4c7d3
2013-07-05 12:35:53 -05:00
Ben Steffensmeier
86b0a0a2c3 Issue #2154 Ensure all resource groups get removed from the time matcher.
Former-commit-id: 808941ac45 [formerly a7bfd8ee28] [formerly 808941ac45 [formerly a7bfd8ee28] [formerly 519d0f3ef8 [formerly f652fd3f3126f04c2ced9ceb027875a47ea23f51]]]
Former-commit-id: 519d0f3ef8
Former-commit-id: 1c678fb024 [formerly 4b9138dc0f]
Former-commit-id: 17c7cd4734
2013-07-03 14:42:59 -05:00
Nate Jensen
3f990ebc8a Merge "Issue #2145 Changes to RangeRingDialog so it doesn't double the movable range rings when a point is modified." into development
Former-commit-id: d883392d05 [formerly f13bd6391a] [formerly d883392d05 [formerly f13bd6391a] [formerly 6465fb58ad [formerly 929f2145983f183722dbeacbbf996b78179657c6]]]
Former-commit-id: 6465fb58ad
Former-commit-id: 0cb178f835 [formerly 6a9b54cd4e]
Former-commit-id: 29f4bf22a3
2013-07-03 13:32:49 -05:00
Nate Jensen
5e7b468622 Merge "Issue #2159 Synchronize TimeCache access in D2DTimeMatcher. Change-Id: I9116ced28775294385ea9ea92a1e63bf2fefff55" into development
Former-commit-id: b7ddbeed41 [formerly d4261fcc45] [formerly b7ddbeed41 [formerly d4261fcc45] [formerly 6b93db235f [formerly c9dd4fe32a28f20a3d5883d767787f37598e435d]]]
Former-commit-id: 6b93db235f
Former-commit-id: b688000175 [formerly 8793ca3101]
Former-commit-id: f732b4ccbb
2013-07-03 13:10:39 -05:00
Ben Steffensmeier
e7443b5ef6 Issue #2159 Synchronize TimeCache access in D2DTimeMatcher.
Change-Id: I9116ced28775294385ea9ea92a1e63bf2fefff55

Former-commit-id: 2d8e1e5e6c [formerly a868d3d0b5] [formerly 2d8e1e5e6c [formerly a868d3d0b5] [formerly 53d969d0db [formerly 3eaca3d7a18ab9c8ab601fc7ed9fb899eced1134]]]
Former-commit-id: 53d969d0db
Former-commit-id: b18f4bbe89 [formerly dde0846fc3]
Former-commit-id: 6804d5f9b3
2013-07-03 12:44:45 -05:00
Bryan Kowal
ca7f9097f6 Issue #2164 - fix 13.6.1 build
Change-Id: I9f4e29f8f19abf7700baad125617054c8a561ff3

Former-commit-id: 34efd01a4f [formerly c2b54d7c31] [formerly 34efd01a4f [formerly c2b54d7c31] [formerly 1c49dff18e [formerly ea1628be6840c42fffd2e8b8437386a4df3aacca]]]
Former-commit-id: 1c49dff18e
Former-commit-id: c9fa275089 [formerly 0787aca88b]
Former-commit-id: 5c14f56265
2013-07-03 11:25:46 -05:00
Greg Armendariz
13ac0b1062 13.5.1-5 baseline
Former-commit-id: 82aabf1066 [formerly 492f92ef7b] [formerly 82aabf1066 [formerly 492f92ef7b] [formerly ea7ac37930 [formerly e0157ab61ca5f2a62d78993a27893778fa119c4f]]]
Former-commit-id: ea7ac37930
Former-commit-id: d899faec3d [formerly 869922cb82]
Former-commit-id: dc881f4ed8
2013-07-03 12:20:27 -04:00
Nate Jensen
d97721eda9 Merge "Issue #2122 Committing Geostationary projection for GOES-R fixed grid as well as cleanup to SatResource code." into development
Former-commit-id: ae004c8c77 [formerly 7bd12afa02] [formerly ae004c8c77 [formerly 7bd12afa02] [formerly 679bf314e0 [formerly d679aae13498d67d79a1134275f1016699583e1f]]]
Former-commit-id: 679bf314e0
Former-commit-id: 7bb4d66cbf [formerly c8d221b46c]
Former-commit-id: 64a7f0d148
2013-07-03 09:37:05 -05:00
Roger Ferrel
9f8b831148 Issue #2145 Changes to RangeRingDialog so it doesn't double the movable range rings when a point is modified.
Change-Id: I229ce3e40769961c9c1b296c7c42d919a21cfd0b

Former-commit-id: ebb76daf14 [formerly fab96d28f2] [formerly ebb76daf14 [formerly fab96d28f2] [formerly 752933c7fe [formerly f7cb404093a0a2bdda1e202bc8cdd98ba146bd85]]]
Former-commit-id: 752933c7fe
Former-commit-id: 477d8b0317 [formerly 3c24739b72]
Former-commit-id: 0fb0ff7a5a
2013-07-02 17:27:22 -05:00
Mike Duff
c1abe64b72 Issue #2132 - review comments
Change-Id: I65b880b5f96471b6f8e0f5ae89ee3981a96a1094

Former-commit-id: 57d37e9761 [formerly 4399429e74] [formerly 57d37e9761 [formerly 4399429e74] [formerly 2618c1a4e4 [formerly 7a85b96863dece9c1b5a356f4e929665e0ce03f8]]]
Former-commit-id: 2618c1a4e4
Former-commit-id: 617abbd8f1 [formerly 82d713083a]
Former-commit-id: 3e20961fe0
2013-07-02 16:08:37 -05:00
Max Schenkelberg
738d6bcae8 Issue #2122 Committing Geostationary projection for GOES-R fixed grid as well as cleanup to SatResource code.
Amend: Fixed comment

Change-Id: I384a3fac3ad6e3ee8b4efd17246a26a1c4476c63

Former-commit-id: bc91a9f6de [formerly 9709b0500a] [formerly bc91a9f6de [formerly 9709b0500a] [formerly fef6056519 [formerly 9982c3ffdb399b8c3587d08e9427710ddbc61cb4]]]
Former-commit-id: fef6056519
Former-commit-id: 63d69a5435 [formerly dc78010e74]
Former-commit-id: 1e7b73c44e
2013-07-02 15:22:31 -05:00
Mike Duff
afedebecd4 Issue #2160 - Fix for MPE display 7x7 dialog, field changes
Change-Id: Ib428d1aab246863bfdbbb271d27a4687197a3ebe

Former-commit-id: cc4ac57b22 [formerly 655d9eb928] [formerly cc4ac57b22 [formerly 655d9eb928] [formerly 5b676b122d [formerly 1fbaa2721a4b2d79a06c1d4d8b8526b5b25150a9]]]
Former-commit-id: 5b676b122d
Former-commit-id: 70d25a48dd [formerly d87b4bceb5]
Former-commit-id: c07d8ef10d
2013-07-02 12:31:10 -05:00
Roger Ferrel
1d3ee09895 Issue #1964 clean up of features and manifest.
Change-Id: Ie2fc8ce45853499d80863ab83ba6a60b76444548

Former-commit-id: 3c31d8c2ac [formerly 41c46e14c0] [formerly 3c31d8c2ac [formerly 41c46e14c0] [formerly 7d3362d2b5 [formerly 2590369cb4aa0c3d9c3885acb0ef27de36744e6d]]]
Former-commit-id: 7d3362d2b5
Former-commit-id: b3437266d7 [formerly 201e62a4ad]
Former-commit-id: ea00a52ebe
2013-07-02 11:14:56 -05:00
Nate Jensen
6c95177bdf Merge "Issue #2139 Loaded maps at cave start up." into omaha_13.5.1
Former-commit-id: c68cf47883 [formerly e4955f094c] [formerly c68cf47883 [formerly e4955f094c] [formerly 01efa33cb9 [formerly 5865b5ff9909ff00d047f41174b7e89ca921bb8b]]]
Former-commit-id: 01efa33cb9
Former-commit-id: 058e47192a [formerly 150203f5cc]
Former-commit-id: d288dded44
2013-07-02 11:07:59 -05:00
Jonathan Sanchez
28849d2a53 Issue #2139 Loaded maps at cave start up.
Change-Id: If7d1e801190a2215c6043b81b4beb70e09ba9ee1

Former-commit-id: 58fcc4c896 [formerly a2328f0e06] [formerly 58fcc4c896 [formerly a2328f0e06] [formerly de24b8b431 [formerly 55cb110ba6f328d9fb68d3a9c46254f342299237]]]
Former-commit-id: de24b8b431
Former-commit-id: ab2e2f9a17 [formerly 4e1b0674e4]
Former-commit-id: 5431e5915d
2013-07-02 11:04:26 -05:00
Richard Peter
06ed1bc66c Merge "Issue #2130 - Fix ordering of columns in Subsciption Manager Dialog" into development
Former-commit-id: f12b08401f [formerly 37042f0b2a] [formerly f12b08401f [formerly 37042f0b2a] [formerly a3bd7b3e9c [formerly 556e2ca39b7c93355cfa10ece835bdc63fd12d2c]]]
Former-commit-id: a3bd7b3e9c
Former-commit-id: aef289d287 [formerly 8e15d6aa0a]
Former-commit-id: f916bba7ad
2013-07-02 10:30:51 -05:00
Roger Ferrel
5eee41410c Issue #1964 Changed com.raytheon.uf.viz.archive include files needed in the binary build.
Change-Id: Id5f135c25333d6906178f76782f2b370546863b9

Former-commit-id: 82b1712714 [formerly c3ebc0cc1c] [formerly 82b1712714 [formerly c3ebc0cc1c] [formerly 68be9bd65f [formerly 01585ddb95a65686eada207aacbe6f12a512c7f3]]]
Former-commit-id: 68be9bd65f
Former-commit-id: ff84f293fd [formerly 933009605a]
Former-commit-id: 68c22b7073
2013-07-01 15:45:14 -05:00
Nate Jensen
86b096bc9b Issue #2142 initial cutover from log4j to SLF4J and logback
Change-Id: I6953739821992fadb2b92da0dc659512b90a5895

Former-commit-id: a4de603bcf [formerly 316d6c09c6] [formerly a4de603bcf [formerly 316d6c09c6] [formerly db6152e524 [formerly 7725d8a6cd00b3c30856b48ef86ab081b67d400b]]]
Former-commit-id: db6152e524
Former-commit-id: 5a6b0f99cc [formerly 6da64f329c]
Former-commit-id: efcf0c8519
2013-07-01 14:41:05 -05:00
Roger Ferrel
d52ab020d1 Issue #2088 Made FcstPointGroupDlg, FloodReportDlg, HydroBaseDlg and StationFilterOptionsDlg non-blocking.
Change-Id: I44d41a5e3e4e00d924df190e253ae2568988d987

Former-commit-id: 1c3c9e461b [formerly 1e7ae55676] [formerly 1c3c9e461b [formerly 1e7ae55676] [formerly 220818df3a [formerly dd9ba84811ee60b4dae7fb940abf6ff2526869ba]]]
Former-commit-id: 220818df3a
Former-commit-id: ee5b120929 [formerly 3cabedbd45]
Former-commit-id: ac04c66be2
2013-07-01 13:03:39 -05:00
Mike Duff
9eb197d124 Issue #2130 - Fix ordering of columns in Subsciption Manager Dialog
Change-Id: I97ce5323002d6c1ae230c446de9837e541e02c86

Former-commit-id: 3fed839344 [formerly cd511c1a0c] [formerly 3fed839344 [formerly cd511c1a0c] [formerly 5c7fd77f98 [formerly d2fbc8fca1efa7c1a467fe9970da74d47d0ba759]]]
Former-commit-id: 5c7fd77f98
Former-commit-id: 2250983ad8 [formerly 053082cb80]
Former-commit-id: 0f4b98626b
2013-07-01 11:53:07 -05:00
Nate Jensen
89f8162e2b Merge "Issue #2139 Revert "Issue #2139 Run async job for loading maps in warngen."" into omaha_13.5.1
Former-commit-id: b23dcab913 [formerly f7e743f388] [formerly b23dcab913 [formerly f7e743f388] [formerly 001fba449f [formerly 8b91364fc675cfa8eb0cb6faefb2951cca1e365d]]]
Former-commit-id: 001fba449f
Former-commit-id: 47d3441930 [formerly 0cb9726554]
Former-commit-id: 57d1375eed
2013-07-01 11:29:47 -05:00
Bryan Kowal
29f21e56ee Issue #2153 - fix merge issue for build
Former-commit-id: 756fb4be59 [formerly f052982f8e] [formerly 756fb4be59 [formerly f052982f8e] [formerly 9c1aaa2bf5 [formerly 25560718fb861f13ff8701b9458a6b18adf523be]]]
Former-commit-id: 9c1aaa2bf5
Former-commit-id: 08bb604ced [formerly 37a5eb6c69]
Former-commit-id: e6516def2a
2013-07-01 10:52:29 -05:00
Jonathan Sanchez
23fe9db31b Issue #2139 Revert "Issue #2139 Run async job for loading maps in warngen."
This reverts commit b046ea220c79e69eec32fa15fca28a84b3cf419c [formerly e4c0188c14] [formerly ab8acf06e1 [formerly 81aad09d06] [formerly ab8acf06e1 [formerly 81aad09d06] [formerly e4c0188c14 [formerly 084e506395a937030f7cee0cdb6f3322948d2b22]]]].


Former-commit-id: 70ab67c3e5 [formerly c883b4e636] [formerly 70ab67c3e5 [formerly c883b4e636] [formerly 7f74926bb4 [formerly 765b5eea21f10ad1607aa99acb478eebf283e988]]]
Former-commit-id: 7f74926bb4
Former-commit-id: fa0887429d [formerly 41e94abee3]
Former-commit-id: a08032627c
2013-07-01 10:40:48 -05:00
Richard Peter
cca3d4c19b Merge branch 'omaha_13.5.1' (13.5.1-4) into development
Conflicts:
	edexOsgi/build.edex/build.xml
	edexOsgi/com.raytheon.edex.feature.uframe/feature.xml

Former-commit-id: edeb3e255b [formerly 162261c395] [formerly edeb3e255b [formerly 162261c395] [formerly 76bc31aa77 [formerly 3ec3b75f720bc7622430f69a81ae566936be4363]]]
Former-commit-id: 76bc31aa77
Former-commit-id: f8213c16bd [formerly d3017ca60f]
Former-commit-id: 3d6754337a
2013-07-01 00:04:43 -05:00
Richard Peter
da3eb1e75c Merge branch 'master_13.5.1' (13.5.1-4) into omaha_13.5.1
Conflicts:
	cave/com.raytheon.uf.viz.archive.feature/feature.xml
	cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/AbstractArchiveDlg.java
	cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/ArchiveTableComp.java
	cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/CaseCreationDlg.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FfmpBasinTableDlg.java
	cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/rsc/PlotResource2.java
	edexOsgi/com.raytheon.uf.common.archive/build.properties
	edexOsgi/com.raytheon.uf.common.archive/src/com/raytheon/uf/common/archive/config/ArchiveConfigManager.java
	edexOsgi/com.raytheon.uf.common.archive/src/com/raytheon/uf/common/archive/config/CategoryConfig.java
	edexOsgi/com.raytheon.uf.edex.archive/res/spring/archivepurger-spring.xml
	edexOsgi/com.raytheon.uf.edex.archive/src/com/raytheon/uf/edex/archive/purge/ArchivePurger.java
	edexOsgi/com.raytheon.uf.edex.archive/utility/common_static/base/archive/PROCESSED_DATA.xml
	edexOsgi/com.raytheon.uf.edex.archive/utility/common_static/base/archive/RAW_DATA.xml
	rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
	tests/unit/com/raytheon/uf/common/archive/ArchiveConfigManagerTest.java

Former-commit-id: da54766cc8 [formerly 53258be797] [formerly da54766cc8 [formerly 53258be797] [formerly 582f38bdd4 [formerly e9ab10a54853ed6e7550cbbafea1d2d6231ce3f9]]]
Former-commit-id: 582f38bdd4
Former-commit-id: 69f8807963 [formerly 1757da59ee]
Former-commit-id: 7ceb1bb9ab
2013-06-30 23:46:32 -05:00
Steve Harris
c05a6c8b50 13.5.1-4 baseline
Former-commit-id: c56be8a332 [formerly 70e4ff30a6] [formerly c56be8a332 [formerly 70e4ff30a6] [formerly e197f23ce3 [formerly d18b403b332dff67d1c85d4317bbceda337d1b41]]]
Former-commit-id: e197f23ce3
Former-commit-id: 640b022e84 [formerly f658320357]
Former-commit-id: c183e08922
2013-06-28 09:46:25 -04:00
Brad Gonzales
33dc495040 Issue #1965 Added null check for topLevelDirs in purgeExpiredFromArchive.
Amend: Added archive feature to the viz product build.
       Added archive feature to the viz developer product.

Change-Id: I49a9e2245236a81e72d66b08cf9af251cadd1f07

Former-commit-id: 65507d4424 [formerly c28d1e5d4d] [formerly 65507d4424 [formerly c28d1e5d4d] [formerly f4bb78381c [formerly a1f31ee98b485e501f677e03c4e1bc521b3e8b4e]]]
Former-commit-id: f4bb78381c
Former-commit-id: 6e99019a25 [formerly d842d8d9d0]
Former-commit-id: f51c74e2d4
2013-06-27 17:40:07 -05:00
Dave Hladky
1b6421d4c3 Issue #2096 First steps to getting CAVE to display MADIS data
Change-Id: I68925eef139c31e751bcb47f05f05cfd83b380b9

Former-commit-id: 083dff9e43 [formerly f5d3a5f012] [formerly 083dff9e43 [formerly f5d3a5f012] [formerly ee50b5c7be [formerly 1f33631d527ecbcecef31c255ac963556f5e1a4e]]]
Former-commit-id: ee50b5c7be
Former-commit-id: 08a81cdaaf [formerly 2b90920d8f]
Former-commit-id: 2a57eea47f
2013-06-27 11:07:27 -05:00
Roger Ferrel
6261e65829 Issue #1966 Fix race conditiona and delay in populating GUIs combo/spinner entries also minor code clean up.
Change-Id: I4df5a5e4b1fb1e868ce9e8914116c2ae67c029c3

Former-commit-id: 6f07f6f3bd [formerly ee409c0819] [formerly 6f07f6f3bd [formerly ee409c0819] [formerly f66681f62b [formerly 3572d3b28e641446040ae8a6bc96a8770aea6ba5]]]
Former-commit-id: f66681f62b
Former-commit-id: 5f35643c2d [formerly 45dcfe3ad8]
Former-commit-id: bec6928ea9
2013-06-27 07:51:56 -05:00
Richard Peter
2952f2b56d Merge "Issue #1869 Fix plot sampling. Change-Id: I4c2087057a939d3a148f1635b999fe53b735258b" into omaha_13.5.1
Former-commit-id: e3886246fd [formerly 3a3dc3d208] [formerly e3886246fd [formerly 3a3dc3d208] [formerly 67d052307c [formerly 253e29abe56da5790c3a44ac7039426b068d6f12]]]
Former-commit-id: 67d052307c
Former-commit-id: 1b00dd48ec [formerly 208b01a167]
Former-commit-id: 575405b14e
2013-06-26 13:25:39 -05:00
Ben Steffensmeier
6cb77b1793 Issue #1869 Fix plot sampling.
Change-Id: I4c2087057a939d3a148f1635b999fe53b735258b

Former-commit-id: 570da6f0d5 [formerly 8c14a34f46] [formerly 570da6f0d5 [formerly 8c14a34f46] [formerly 6db28c32a5 [formerly 42b779a7695635414764b3c491ba24c0d70983b5]]]
Former-commit-id: 6db28c32a5
Former-commit-id: 2ce266f7e7 [formerly f26a72afe9]
Former-commit-id: 0d2f556144
2013-06-26 13:24:13 -05:00
Nate Jensen
586cb967aa Merge "Issue #2139 Run async job for loading maps in warngen." into omaha_13.5.1
Former-commit-id: 8cc7eefd84 [formerly a60afe6640] [formerly 8cc7eefd84 [formerly a60afe6640] [formerly 10baafed63 [formerly e1588427f01c1a6048d0dc423a6a706b3aa7529f]]]
Former-commit-id: 10baafed63
Former-commit-id: 9374463bac [formerly 214fd8689c]
Former-commit-id: b4c6a79741
2013-06-26 11:14:03 -05:00
Jonathan Sanchez
acad56f72b Issue #2139 Run async job for loading maps in warngen.
Change-Id: I9df6c9f2a730a4c7fe4e64fabac00be96a673e7a

Former-commit-id: ab8acf06e1 [formerly 81aad09d06] [formerly ab8acf06e1 [formerly 81aad09d06] [formerly e4c0188c14 [formerly 084e506395a937030f7cee0cdb6f3322948d2b22]]]
Former-commit-id: e4c0188c14
Former-commit-id: d1b63b5a25 [formerly 47505aa013]
Former-commit-id: c4ce4831c2
2013-06-25 15:29:08 -05:00