Commit graph

3232 commits

Author SHA1 Message Date
Roger Ferrel
b82c76157c Issue #2088 Non-blocking ColorScaleMgrDlg and ColorChooserDlg.
Change-Id: I6f14726a466780e0dbab13d8b64fa2c55acf55d0

Former-commit-id: d5e66e410d [formerly d5e66e410d [formerly 108c5a4957b6d3ab50eacd5792122f7cd2ff3cba]]
Former-commit-id: f3bdbde9d3
Former-commit-id: 696885dc4b
2013-07-09 11:13:43 -05:00
Brad Gonzales
6de2098f63 Issue #1965 Changed to use File.delete() instead of Apache FileUtil.deleteQuietly().
Amend: Update from peer review.

Change-Id: Ia58b75f8f8be62f3aaddbe46aed5558714d276bd

Former-commit-id: b462162996 [formerly b462162996 [formerly defb699314eec545eff3b3b603b059ef05ac1a23]]
Former-commit-id: 503d6d6cca
Former-commit-id: 4f80abebaa
2013-07-09 09:07:38 -05:00
Mike Duff
70492fbb2d Issue #2137 - Change Data Browser Dialog to only allow a single data type to be selected
Review comments

Change-Id: Ic4f508ea98683f750b906292094740a4538950b1

Former-commit-id: 9aaf06ab73 [formerly 9aaf06ab73 [formerly 1015a76693e73c52d2bc56c18c4f3dfa25092771]]
Former-commit-id: 9f6213f9a5
Former-commit-id: 502a141297
2013-07-09 08:15:28 -05:00
Bryan Kowal
b3a93df1df Issue #2153 - fix commons-logging dependencies for wes2bridge
Former-commit-id: 650509604a [formerly 650509604a [formerly 3eab5b0c2ae5ed93526edd0b13c40180d6d7cc65]]
Former-commit-id: c3a87eadea
Former-commit-id: 2dc96499d0
2013-07-08 20:14:11 -05:00
Lee Venable
2b7feb420d Merge "Issue #2088 Made FcstPointGroupDlg, FloodReportDlg, HydroBaseDlg and StationFilterOptionsDlg non-blocking." into development
Former-commit-id: ab16e2c8a1 [formerly ab16e2c8a1 [formerly c2d9a2d394fc2ab0f60c63d11323af8db90655da]]
Former-commit-id: 2933cc2ca8
Former-commit-id: b36c421c9a
2013-07-08 17:06:42 -05:00
Dustin Johnson
7d21788705 Merge "Issue #2173 - Update unit tests for Java 1.7 and SLF4J" into development
Former-commit-id: f09225135c [formerly f09225135c [formerly 67b9b463a2463036a47f62b45bf140be8a0567eb]]
Former-commit-id: 6d84cb70a8
Former-commit-id: 7950c692a4
2013-07-08 17:00:59 -05:00
Mike Duff
2a6762694f Issue #2173 - Update unit tests for Java 1.7 and SLF4J
Change-Id: I7cd6378b17d1388d6006bc8ade9708f4797ff51a

Former-commit-id: 40f30c4e7a [formerly 40f30c4e7a [formerly 6c2646847984f3f8ef7a1640128bd06a2abb6a57]]
Former-commit-id: c76a29c074
Former-commit-id: 8751b44abf
2013-07-08 16:22:05 -05:00
Dustin Johnson
21a4444e0e Issue #2106 Move deploy test properties to unit test code
Change-Id: I2463848448789858843cca436f236f71f57d2d95

Former-commit-id: 04b9bf6b73 [formerly 04b9bf6b73 [formerly ee39ca286312d9cd7629ba30e56faf3635c5b128]]
Former-commit-id: ac8bed9a2f
Former-commit-id: f394cf27e8
2013-07-08 16:19:21 -05:00
Dustin Johnson
41ca04fcbd Merge "Issue #2106 Improve BandwidthManager performance - Use copy constructors - Separate BandwidthBucket handling into a DAO - Preparations to remove all in-memory object handling" into development
Former-commit-id: f5d66a9f0d [formerly f5d66a9f0d [formerly 1a45a8604e35d0b14caf8465905a806e79a2461d]]
Former-commit-id: 59c1cd7a5e
Former-commit-id: 4db95fa534
2013-07-08 15:53:15 -05:00
Dustin Johnson
9c948e69c9 Merge "Issue #2106 Add ability to run deploy tests again" into development
Former-commit-id: 02ceb9d667 [formerly 02ceb9d667 [formerly 889fadcd5b4e6f261d275cab3a5b67e3edbb50d9]]
Former-commit-id: dc8ea99af9
Former-commit-id: f04680fb89
2013-07-08 15:52:12 -05:00
Nate Jensen
84e7cf173d Merge "Issue #2145 Added slection indicator and verificaton of lat, lon and radius." into development
Former-commit-id: 5f07ddf81b [formerly 5f07ddf81b [formerly 12b690f90ee9cf5ab2fe632236f56254efc09a11]]
Former-commit-id: c7ec0ba929
Former-commit-id: 829cb5d9eb
2013-07-08 14:42:59 -05:00
Dustin Johnson
ea2b206bc6 Issue #2106 Add ability to run deploy tests again
Change-Id: I912137e02d4decb0ff07f9d73d1debeb9d9226a1

Former-commit-id: 09b97672cd [formerly 09b97672cd [formerly 290c1fb3bc7e9fd4871799e9884fcb10a28db46f]]
Former-commit-id: 35305d2c1d
Former-commit-id: 36e0fd26d8
2013-07-08 14:00:40 -05:00
Nate Jensen
a42c398300 Merge "Issue #2154 Ensure all resource groups get removed from the time matcher." into development
Former-commit-id: 1287301152 [formerly 1287301152 [formerly 11ee25f7b9eb2f041e75e5922c9ebe95c1e64bab]]
Former-commit-id: 6bb28cddcf
Former-commit-id: 5ced5e04ff
2013-07-08 13:33:30 -05:00
Ben Steffensmeier
c74c93af71 Issue #1869 Fix goes sounding updates.
Change-Id: Ib974c8e88bea021e0e8505e6fb2974f4e108dc80

Former-commit-id: dbe74b56e5 [formerly dbe74b56e5 [formerly 127609cb0ced4b4554943ad78d4263cb70489a90]]
Former-commit-id: 21abe429ec
Former-commit-id: e92d1e9cad
2013-07-08 11:47:08 -05:00
Bryan Kowal
e8885bf9c8 Issue #2164 - fix 13.6.1 qpid build for slf4j / log4j
Change-Id: Iac18215b017ea4b285f6435b3b492a85bacf5da7

Former-commit-id: c91e636399 [formerly c91e636399 [formerly 0d4ba397163e0a365178d5481e520011784104d9]]
Former-commit-id: 86c27863fe
Former-commit-id: 594835f311
2013-07-08 10:43:14 -05:00
Dustin Johnson
84e6eb6c8d Issue #2106 Improve BandwidthManager performance
- Use copy constructors
- Separate BandwidthBucket handling into a DAO
- Preparations to remove all in-memory object handling

Amend: Copy more calendar and byte array objects

Change-Id: I72f4813c0780586585409a9a64c7915adc1ccbae

Former-commit-id: 124edcbd15 [formerly 124edcbd15 [formerly e11242447c3c93f403cd546df4315381486e465c]]
Former-commit-id: a6575c3235
Former-commit-id: 11a1972265
2013-07-08 10:22:30 -05:00
Dustin Johnson
aae6466381 Merge "Issue #2138 - Fixed to not use filter if filter is disabled." into development
Former-commit-id: b8800c0616 [formerly b8800c0616 [formerly 35a2a6d54af2aa62cc3a256869e409cdb7868cb0]]
Former-commit-id: e2ffbd9b27
Former-commit-id: 56d1806f22
2013-07-08 08:39:14 -05:00
Dustin Johnson
47f8f65a38 Merge "Issue #2132 - review comments" into development
Former-commit-id: a414049f39 [formerly a414049f39 [formerly 62394f1d0d8ebcd9781b5c3e377469c04ebd7dc2]]
Former-commit-id: daf64a7923
Former-commit-id: 7606d9e7ff
2013-07-08 08:38:47 -05:00
Richard Peter
17f6319955 Merge "Issue #2133 - qpid is now a wrapped java application; incremented qpid release" into development
Former-commit-id: fbd6bb6421 [formerly fbd6bb6421 [formerly 44da96f5c268100f1e923b1f54120635c45d644c]]
Former-commit-id: 06f1945cbb
Former-commit-id: 89856968a8
2013-07-05 13:47:20 -05:00
Roger Ferrel
2a40a92307 Issue #2145 Added slection indicator and verificaton of lat, lon and radius.
Change-Id: I10492bdd2e74b5ea8fd9386528019665185ae584

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

Former-commit-id: 4442946626 [formerly 4442946626 [formerly 2ced83baa19c11c0eb37f02779ae344e75d108b7]]
Former-commit-id: c493182fa4
Former-commit-id: 49cf68617f
2013-07-05 12:35:53 -05:00
Bryan Kowal
b07e3f47da Issue #2164 - fix pde build for RadarServer.
Change-Id: I439fb9db7d26d1e80bff5e1620691246c92608e3

Former-commit-id: b4df3267bd [formerly b4df3267bd [formerly b5f4fb2cfb101a9a43bb7036a952bf58ed388721]]
Former-commit-id: 92b2c6ae65
Former-commit-id: 5e4350392b
2013-07-03 19:36:42 -05:00
Bryan Kowal
22c2eef5ee Issue #2133 - qpid is now a wrapped java application; incremented qpid release
- Amend: wes2bridge compatibility updates
- Amend: running deploy.xml in the yajsw project will now deploy it to both its EDEX and QPID destination
- Amend: fixed monitoring in qpid wrapper.conf
- Amend: no longer restart qpid when >= 90% of the heap is used
- Amend: specify maximum memory directly in wrapper.conf

Change-Id: I2e3e6881f456535bac08f51f1e541e708be20f58

Former-commit-id: f6412117e1 [formerly f6412117e1 [formerly 24c451a8afbd1b406ee7f83997e0ab92f1625b89]]
Former-commit-id: 38aa7723c6
Former-commit-id: 32190c8848
2013-07-03 15:55:53 -05:00
Bryan Kowal
d262771d1b Issue #2164 - fix 13.6.1 wes2bridge build
Former-commit-id: 63345a298b [formerly 63345a298b [formerly 31b29f11b0e60c0741f69be824093d4f76961eb5]]
Former-commit-id: 9f632d9e2d
Former-commit-id: 4a492c0059
2013-07-03 15:35:12 -05:00
Ben Steffensmeier
17c7cd4734 Issue #2154 Ensure all resource groups get removed from the time matcher.
Former-commit-id: a7bfd8ee28 [formerly a7bfd8ee28 [formerly f652fd3f3126f04c2ced9ceb027875a47ea23f51]]
Former-commit-id: 519d0f3ef8
Former-commit-id: 4b9138dc0f
2013-07-03 14:42:59 -05:00
Nate Jensen
29f4bf22a3 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: f13bd6391a [formerly f13bd6391a [formerly 929f2145983f183722dbeacbbf996b78179657c6]]
Former-commit-id: 6465fb58ad
Former-commit-id: 6a9b54cd4e
2013-07-03 13:32:49 -05:00
Greg Armendariz
a4a653221d Merge "Issue #2142 attempt to fix build" into development
Former-commit-id: 40d7855af0 [formerly 40d7855af0 [formerly d41ed7c37f51551fd426a56a5e7762424fd00167]]
Former-commit-id: 27ba2d1d3c
Former-commit-id: 3360d5f0b2
2013-07-03 13:23:05 -05:00
Nate Jensen
f732b4ccbb Merge "Issue #2159 Synchronize TimeCache access in D2DTimeMatcher. Change-Id: I9116ced28775294385ea9ea92a1e63bf2fefff55" into development
Former-commit-id: d4261fcc45 [formerly d4261fcc45 [formerly c9dd4fe32a28f20a3d5883d767787f37598e435d]]
Former-commit-id: 6b93db235f
Former-commit-id: 8793ca3101
2013-07-03 13:10:39 -05:00
Nate Jensen
2286c25c51 Issue #2142 attempt to fix build
Change-Id: I465de277a20aa354731e45abbb685e108cdb4377

Former-commit-id: 1fb11fbdf7 [formerly 1fb11fbdf7 [formerly a6e205373831d0d029f3a34cc6e34030cc496d9c]]
Former-commit-id: 47520c7b30
Former-commit-id: 577292d8d5
2013-07-03 13:05:57 -05:00
Ben Steffensmeier
6804d5f9b3 Issue #2159 Synchronize TimeCache access in D2DTimeMatcher.
Change-Id: I9116ced28775294385ea9ea92a1e63bf2fefff55

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

Former-commit-id: c2b54d7c31 [formerly c2b54d7c31 [formerly ea1628be6840c42fffd2e8b8437386a4df3aacca]]
Former-commit-id: 1c49dff18e
Former-commit-id: 0787aca88b
2013-07-03 11:25:46 -05:00
Greg Armendariz
dc881f4ed8 13.5.1-5 baseline
Former-commit-id: 492f92ef7b [formerly 492f92ef7b [formerly e0157ab61ca5f2a62d78993a27893778fa119c4f]]
Former-commit-id: ea7ac37930
Former-commit-id: 869922cb82
2013-07-03 12:20:27 -04:00
Nate Jensen
64a7f0d148 Merge "Issue #2122 Committing Geostationary projection for GOES-R fixed grid as well as cleanup to SatResource code." into development
Former-commit-id: 7bd12afa02 [formerly 7bd12afa02 [formerly d679aae13498d67d79a1134275f1016699583e1f]]
Former-commit-id: 679bf314e0
Former-commit-id: c8d221b46c
2013-07-03 09:37:05 -05:00
Roger Ferrel
0fb0ff7a5a 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: fab96d28f2 [formerly fab96d28f2 [formerly f7cb404093a0a2bdda1e202bc8cdd98ba146bd85]]
Former-commit-id: 752933c7fe
Former-commit-id: 3c24739b72
2013-07-02 17:27:22 -05:00
Bryan Kowal
a89ff261d0 Issue #2153 - 13.5.1 build update
Change-Id: Ia57fe9a6ae3f31826eec1eede1c2b46c5c4fae05

Former-commit-id: 6a6cdd7f6d [formerly 6a6cdd7f6d [formerly 8a021ef97c67a4fc7325ce91808cd5878fbd2cda]]
Former-commit-id: dc177c90d1
Former-commit-id: 6bbe51aca9
2013-07-02 16:12:06 -05:00
Mike Duff
3e20961fe0 Issue #2132 - review comments
Change-Id: I65b880b5f96471b6f8e0f5ae89ee3981a96a1094

Former-commit-id: 4399429e74 [formerly 4399429e74 [formerly 7a85b96863dece9c1b5a356f4e929665e0ce03f8]]
Former-commit-id: 2618c1a4e4
Former-commit-id: 82d713083a
2013-07-02 16:08:37 -05:00
Max Schenkelberg
1e7b73c44e 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: 9709b0500a [formerly 9709b0500a [formerly 9982c3ffdb399b8c3587d08e9427710ddbc61cb4]]
Former-commit-id: fef6056519
Former-commit-id: dc78010e74
2013-07-02 15:22:31 -05:00
Mike Duff
c07d8ef10d Issue #2160 - Fix for MPE display 7x7 dialog, field changes
Change-Id: Ib428d1aab246863bfdbbb271d27a4687197a3ebe

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

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

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

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

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

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

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


Former-commit-id: c883b4e636 [formerly c883b4e636 [formerly 765b5eea21f10ad1607aa99acb478eebf283e988]]
Former-commit-id: 7f74926bb4
Former-commit-id: 41e94abee3
2013-07-01 10:40:48 -05:00
Richard Peter
3d6754337a 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: 162261c395 [formerly 162261c395 [formerly 3ec3b75f720bc7622430f69a81ae566936be4363]]
Former-commit-id: 76bc31aa77
Former-commit-id: d3017ca60f
2013-07-01 00:04:43 -05:00