Commit graph

1220 commits

Author SHA1 Message Date
Steve Harris
41b14f0fa2 Merge branch '13.2.1_delivery' into development
Conflicts:
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java

Former-commit-id: f207d282bc [formerly c218786986] [formerly 658bea377b] [formerly ec56acde81 [formerly 658bea377b [formerly 60b2fd0496097fb1086207cbb01779dbfea877a0]]]
Former-commit-id: ec56acde81
Former-commit-id: 60daaf3ef91fb7f1318c36d98b7b63e339bd5c61 [formerly 6383bf8ed2]
Former-commit-id: 73d9455c65
2013-01-31 10:19:14 -06:00
Mike Duff
fca5b04fa4 Issue #1560 - TS Graphs refresh data on page up/down.
Former-commit-id: 1f71b3c0df [formerly 24e9ae73f0] [formerly fc24735297] [formerly f03e9cc5ce [formerly fc24735297 [formerly 272894304774c8446ac6476cd9edcb8e212ffb19]]]
Former-commit-id: f03e9cc5ce
Former-commit-id: 1c778dd8ecedb2260d7a955f5176aacd9fddd3c9 [formerly a51d48db5e]
Former-commit-id: f5ef2dc1fe
2013-01-30 16:38:04 -06:00
Nate Jensen
91aac7bfed Merge "Issue #1534 Check for null in initInternal to avoid exception" into 13.2.1_delivery
Former-commit-id: 65e07954f3 [formerly 8d07de6933] [formerly a0856d2f26] [formerly ca2d99c69a [formerly a0856d2f26 [formerly a89274c821276c8a5ef3b08a8c25aa03c391b766]]]
Former-commit-id: ca2d99c69a
Former-commit-id: f4706a1e1a32258dc2325221b01ad0d3fe1e9dcd [formerly 1fa3c9cb3c]
Former-commit-id: 28535058f9
2013-01-30 15:02:45 -06:00
Roger Ferrel
b14548f572 Issue #1496 Changes to allow multiple query jobs. (Reduced long queries from 30 to 5 seconds.)
Changes to use fewer synchronized blocks.

Change-Id: I854a5ff9d34be63e46d26f3d78953bc3b8cc796a

Former-commit-id: 2db9c6d959 [formerly 97b6a1a810] [formerly 7a7f86bfe6] [formerly fbcc5fb9a0 [formerly 7a7f86bfe6 [formerly 7adb742310b662763315fc721d6d6f326b8ba160]]]
Former-commit-id: fbcc5fb9a0
Former-commit-id: e97f47d41962af0f093d3656148674e9f19fe55b [formerly 4dbb053d65]
Former-commit-id: 234b632c75
2013-01-30 13:11:56 -06:00
Max Schenkelberg
326e96ff07 Issue #1534 Check for null in initInternal to avoid exception
Change-Id: I9ccf341c3c04f08f88e5366009771f9cda510119

Former-commit-id: f5d7c0788b [formerly a574e13562] [formerly 5ed30a723e] [formerly 23e3ad2382 [formerly 5ed30a723e [formerly 77d0d92f23325407292c5a048ba1276e7e0568ad]]]
Former-commit-id: 23e3ad2382
Former-commit-id: 535b4635d1e849ee4518722c9c29c0c9bf382296 [formerly 296186190a]
Former-commit-id: 50deaaaa79
2013-01-30 11:34:19 -06:00
Steve Harris
11042fc60c Issue #1542 throw out non-watches in watches resource
Former-commit-id: 4c0e37a050 [formerly b651007bc7] [formerly 2f5d5f08ae] [formerly 97bd112438 [formerly 2f5d5f08ae [formerly e719c4112920802a7457ced7836a1c4a42140400]]]
Former-commit-id: 97bd112438
Former-commit-id: 64003f818d010d0e9ef46b0f08de3ba66cac4046 [formerly 50565fee11]
Former-commit-id: fbbf2f3cda
2013-01-30 11:26:20 -06:00
Max Schenkelberg
5d59242f46 Issue #1541 Fixed tool activation so always happens in part activated/deactivated listener.
Change-Id: I515bfe867c4ad9c74280173badae408d0ee5dab9

Former-commit-id: 1255469084 [formerly eaae098e29] [formerly 4fae854006] [formerly ad37f68537 [formerly 4fae854006 [formerly c0f98136403a05755d1c7c640f264f1bafe64a4f]]]
Former-commit-id: ad37f68537
Former-commit-id: 44472abf492b5c54704e9e81afafe3a668b3bfa3 [formerly 9d2a960cb4]
Former-commit-id: 88d5c2f793
2013-01-29 17:33:11 -06:00
Lee Venable
71154555c8 Merge "Issue #1499 Fixed various bugs with Warngen that caused slow initial loading as well as slow interactions. Loaded maps asynchronous and group geometries from table in GeometryCollection instead of unioning into invalid MultiPolygon." into 13.2.1_delivery
Former-commit-id: 2342b84f34 [formerly c9cd8c4c76] [formerly 9f222c9643] [formerly 52e10c8c8a [formerly 9f222c9643 [formerly 4e223a32936225205b61e8d9983a9e9e37dd147a]]]
Former-commit-id: 52e10c8c8a
Former-commit-id: 7e2adce84c3f59d8322483b0899c3a739f477c13 [formerly 56f4567566]
Former-commit-id: 0b005f08fb
2013-01-29 16:44:53 -06:00
Steve Harris
c9bc690eca Issue #1408 - Merge branch 'ss_builds' (13.2.1-3) into 13.2.1_delivery
Former-commit-id: e6093b159e [formerly e655d297f7] [formerly 0505ed0a72] [formerly 6040272573 [formerly 0505ed0a72 [formerly 70ddefcaed9acb5b220faf36693a91ab43a508e2]]]
Former-commit-id: 6040272573
Former-commit-id: 53394d76c4582419b448c742c4d56f7d91e3eff7 [formerly 513d49939f]
Former-commit-id: 75f6e61e6f
2013-01-29 15:57:21 -06:00
Steve Harris
03989493ae 13.2.1-3 baseline
Former-commit-id: b84acc06da [formerly 283147571f] [formerly f45120a1f4] [formerly 7a739c6a5b [formerly f45120a1f4 [formerly fc7291332a08966a746605aef725e1947ec9643c]]]
Former-commit-id: 7a739c6a5b
Former-commit-id: aad469752c5128fb65382f8daefbea8fbb0e4069 [formerly 3edfa1e0be]
Former-commit-id: daca1c3e73
2013-01-29 15:52:43 -06:00
Lee Venable
0de3e4c755 Merge "Issue #1535 Fix GFE saving last block of grids twice" into 13.2.1_delivery
Former-commit-id: 27234eb99d [formerly d6a674189b] [formerly 9b793f195b] [formerly 8195fd7930 [formerly 9b793f195b [formerly 444a78f0a007038b845946aec9ecfb88b4ae7b63]]]
Former-commit-id: 8195fd7930
Former-commit-id: 9d6286e0eb9ffe3594df9d913c23ad32340ced84 [formerly 154b428162]
Former-commit-id: bc93eff808
2013-01-29 14:54:14 -06:00
Mike Duff
53d75d7657 Issue #1523 - Fix for count unit label.
Change-Id: Icc705a4bff143734b61fd11b8edc4d6337647015

Former-commit-id: bdb8f51912 [formerly ea5d953e80] [formerly 2772f83fc7] [formerly 5cab77afb3 [formerly 2772f83fc7 [formerly 5a3facb0b4cb6c15a458a44f97fe4ffece505523]]]
Former-commit-id: 5cab77afb3
Former-commit-id: 80c61d9cabde88f0649bba7a3dc9b69f1952c590 [formerly 9ff30b4934]
Former-commit-id: 26768cd96d
2013-01-29 13:12:40 -06:00
Dustin Johnson
4c323a7bf8 Issue #1530 Do not allow partial scheduling of subscriptions in BandwidthManager
Amend:
  Rebase to 13.2.1

Change-Id: Ied72baede3691957cf1155e1986428d1bfd16e81

Former-commit-id: 8897d2b302 [formerly c8302eb9f8] [formerly b0125d6d7e] [formerly 4e9ecdf166 [formerly b0125d6d7e [formerly 902feab2b1bdf0ffdadce76847ee76b9a8c7061e]]]
Former-commit-id: 4e9ecdf166
Former-commit-id: 696f9cd7deb51ded1ebc38bd99f68f88ea3f520b [formerly 150c5275ca]
Former-commit-id: a463f7ef2b
2013-01-29 10:10:54 -06:00
Dustin Johnson
98eef2ce93 Issue #1529 Disable menu items when no subscriptions selected
Amend:
  Rebase to 13.2.1

Change-Id: I5265c1036bc31a87a8bacadfd7b3a9219922f073

Former-commit-id: ed7ef13c69 [formerly 572733ff56] [formerly fc332a8b9a] [formerly e9ae4c62c1 [formerly fc332a8b9a [formerly 50a157e679cc16cc47653314d538738355aada49]]]
Former-commit-id: e9ae4c62c1
Former-commit-id: ea79fd854c3807f3e6d063e302912815004f8879 [formerly f6dfeb1823]
Former-commit-id: a5ecfa14a9
2013-01-29 10:05:52 -06:00
Lee Venable
0c39a73eac Merge "Issue #1533 Update the calculated dataset size after loading subset xml" into 13.2.1_delivery
Former-commit-id: 3f8f1a6996 [formerly d5a0674873] [formerly 98f25434a9] [formerly 21059af185 [formerly 98f25434a9 [formerly 4043ba3c71a85148bbd262fd5cd371c290b5bfd8]]]
Former-commit-id: 21059af185
Former-commit-id: aee921e6178c46187280f47148d9731cfc8c75cc [formerly 18b96d33c6]
Former-commit-id: 30ab7d00ff
2013-01-29 10:00:37 -06:00
Lee Venable
b865087c22 Merge "Issue #1528 Fix subscription priorities to be the same from domain object to GUI Fix incorrect use of enum ordinal value mappings to priorities. Fix broken bandwidth priority scheduling." into 13.2.1_delivery
Former-commit-id: b35b20a245 [formerly ef51b388d7] [formerly 06900ccbb7] [formerly f98e5b35e1 [formerly 06900ccbb7 [formerly 19229d6f4fc871d462e8460c02bfb69975e7dada]]]
Former-commit-id: f98e5b35e1
Former-commit-id: 4ec38d9e476c5f723089251bd22d992fcc9b56df [formerly fb942ec7c2]
Former-commit-id: df5bcf64de
2013-01-29 09:59:59 -06:00
Lee Venable
a4a40b2fa9 Merge "Issue #1516 Changes to get point information into the proper DataSelection mapping (Planes)." into development
Former-commit-id: fd325027a8 [formerly 73e44d87fa] [formerly 1c61671766] [formerly 078cc84047 [formerly 1c61671766 [formerly 9e32ad8949af4f1e1a4d163056d510c2572f0aec]]]
Former-commit-id: 078cc84047
Former-commit-id: 42c4d71b42c286fb8b9898e7dbbd82f66a2e8380 [formerly 0ee108f806]
Former-commit-id: 65fc68e586
2013-01-29 09:19:56 -06:00
Ron Anderson
5ffbbdd699 Issue #1535 Fix GFE saving last block of grids twice
Change-Id: I3411e27c96b5f0dd79c24e7ba75361582cb6652c

Former-commit-id: c070b55324 [formerly ed7784818a] [formerly aa2c0ffb60] [formerly 5738910b71 [formerly aa2c0ffb60 [formerly 16eedd6d46196d08d02abc674c81ed95c403457c]]]
Former-commit-id: 5738910b71
Former-commit-id: 9ad86a93f01dfa8394e229e86a96b7f7e7dcd020 [formerly d61a24410a]
Former-commit-id: 670f23e1c2
2013-01-28 19:23:23 -06:00
Richard Peter
0ae1b55321 Merge "Issue #1526 stream cave to edex http requests and responses direct through DynamicSerialize to reduce memory usage and boost speed" into development
Former-commit-id: de8c595a0e [formerly 59ef7758f1] [formerly 6eb11703e4] [formerly 2946e97294 [formerly 6eb11703e4 [formerly 86019df71625be675e8bfce21877fa2e40b2b23c]]]
Former-commit-id: 2946e97294
Former-commit-id: 111af45a80d6a0af8bd6a302b734f70ab8d8f912 [formerly 878cbe1695]
Former-commit-id: 7c9b9b0237
2013-01-28 15:27:23 -06:00
Max Schenkelberg
18411217a1 Issue #1499 Fixed various bugs with Warngen that caused slow initial loading as well as slow interactions. Loaded maps asynchronous and group geometries from table in GeometryCollection instead of unioning into invalid MultiPolygon.
Change-Id: I74312305d80762e55f64a5ca70fc454063f2f01d

Former-commit-id: 681a2a6ec4 [formerly 796522b6d0] [formerly 95ccc76272] [formerly 1dbeeb84fb [formerly 95ccc76272 [formerly 493ac37a227259db4c1ea01afa3bd7a9b77095f7]]]
Former-commit-id: 1dbeeb84fb
Former-commit-id: 659fd21b93254587addaccc93ad503a195b98bd4 [formerly 99c8a97f8c]
Former-commit-id: 0019b43582
2013-01-28 14:30:53 -06:00
Dustin Johnson
1c51e474c5 Issue #1533 Update the calculated dataset size after loading subset xml
Change-Id: I9fd94485bed113c68663484fb19daadcbe962a8d

Former-commit-id: dd4fc414aa [formerly 7dae10b701] [formerly 2c068589aa] [formerly 9f7e9692c2 [formerly 2c068589aa [formerly 747395cffd90554eea099c05affe75487ec304a3]]]
Former-commit-id: 9f7e9692c2
Former-commit-id: 00f7b4c48c234063529b5a901bb23fe92e7c6885 [formerly 0fe2711273]
Former-commit-id: 8a2ac02862
2013-01-28 12:47:45 -06:00
Roger Ferrel
5951b04a4f Issue #1516 Changes to get point information into the proper DataSelection mapping (Planes).
Change-Id: Icce03032714b09c67bbb4ec23a426ad1dcdd244b

Former-commit-id: 37bdfa5868 [formerly 3bc828f839] [formerly 5a23770931] [formerly dd41c60e3f [formerly 5a23770931 [formerly fcf6a52f2b172c2450f3f417e4256c04f5eefbcd]]]
Former-commit-id: dd41c60e3f
Former-commit-id: 27165535226953b58522aeb5bae5425c31f9b2fa [formerly e6ff72765a]
Former-commit-id: d4667e3909
2013-01-28 08:39:36 -06:00
Bryan Kowal
9476e45881 Issue #1522 - disable Spring during installs and uninstalls
Former-commit-id: 71866bc98e [formerly 1f7f5932dd] [formerly 2046255ef0] [formerly 7e7b47d934 [formerly 2046255ef0 [formerly b65827ab53309433a66c3c5146bdfb6c41eec2f8]]]
Former-commit-id: 7e7b47d934
Former-commit-id: e666bdb02a0ffd5583e5c764ffe9c1384f870cba [formerly fc6feb2329]
Former-commit-id: 0695fbbc8c
2013-01-25 16:19:54 -06:00
Steve Harris
ed42a5c55e Merge "Issue #1522 - disable Spring during installs and uninstalls" into development
Former-commit-id: 98665a9caa [formerly 282acc3b41] [formerly ffb536cd46] [formerly e8e8106d42 [formerly ffb536cd46 [formerly de2829de069a3f3280b25fd8a8b7b831377aaebc]]]
Former-commit-id: e8e8106d42
Former-commit-id: 044d35fb735acb469bfe8681ef7f37367cf2ac62 [formerly bac3f97ab6]
Former-commit-id: fe4b27913c
2013-01-25 16:02:47 -06:00
Dustin Johnson
dac4c429e7 Issue #1528 Fix subscription priorities to be the same from domain object to GUI
Fix incorrect use of enum ordinal value mappings to priorities.
Fix broken bandwidth priority scheduling.

Change-Id: Ic9e220966c20e95fcc3f81f0c647ffcdb2fcbca5

Former-commit-id: f8d6fb35b4 [formerly 50bfcd3fbf] [formerly 41c0ff85ff] [formerly f88a5c1b95 [formerly 41c0ff85ff [formerly b6dbc5f3117832ce8bda1698043d7941398f11b1]]]
Former-commit-id: f88a5c1b95
Former-commit-id: a9e048c56f0e0bcf1daa53c2f59ef7d20bb01b9b [formerly 4465094fe9]
Former-commit-id: 4ab288ae75
2013-01-25 14:30:04 -06:00
Steve Harris
1397f8a811 Merge branch '13.2.1_delivery' into development
Former-commit-id: d6aeabad12 [formerly 618cf868c5] [formerly f673583915] [formerly 827611474f [formerly f673583915 [formerly 5c6a08af0ad5f6185645e53143bf88d8c27f10d0]]]
Former-commit-id: 827611474f
Former-commit-id: b9760adfb36650f58aa4202fbbd5beedb40f8529 [formerly 25fecb8b4f]
Former-commit-id: a85c81289e
2013-01-25 10:54:51 -06:00
Steve Harris
0f4fcd0ba8 13.2.1-2 baseline
Former-commit-id: 74bfe9595c [formerly 0006a2b6cb] [formerly 7a7f7c45ca] [formerly c3e4551dfa [formerly 7a7f7c45ca [formerly b8762009cb6f3bfa17984c2dcce65d5a48c6a844]]]
Former-commit-id: c3e4551dfa
Former-commit-id: 5477d57f4fbcde663b844cacbae089a9292a22a1 [formerly 1153d80c5b]
Former-commit-id: 251a9c0195
2013-01-25 09:07:12 -06:00
Lee Venable
e2f088c003 Merge "Issue #1523 - Fix problem with legend keys." into 13.2.1_delivery
Former-commit-id: 695f441e3f [formerly 0767f1a50b] [formerly 9756c431fd] [formerly e4142b63c9 [formerly 9756c431fd [formerly 2dcf981656f547cc07f8124eadc32ca0204b4b46]]]
Former-commit-id: e4142b63c9
Former-commit-id: 3db7896ccb9207afe3cea12b611de87c2bb0fbeb [formerly 063ffa26eb]
Former-commit-id: 4bf28dd204
2013-01-24 16:52:17 -06:00
Nate Jensen
9fb144f73e Issue #1526 stream cave to edex http requests and responses direct through DynamicSerialize to reduce memory usage and boost speed
Change-Id: I9156f9b29f3e57a668791da28b692420a27dfa96

Former-commit-id: add78bd445 [formerly c7172e87a3] [formerly 705bfb0755] [formerly 2dc3abb847 [formerly 705bfb0755 [formerly 505fa329c6700063aec6b62e4fef623b539ad801]]]
Former-commit-id: 2dc3abb847
Former-commit-id: 7e4143b4d4e1d3ad304dded5581543897cc27dd0 [formerly fa27552c9b]
Former-commit-id: 04a397866a
2013-01-24 16:41:02 -06:00
Bryan Kowal
7214b65ccf Issue #1522 - disable Spring during installs and uninstalls
Former-commit-id: b4945796a3 [formerly ab7f75ad73] [formerly 09735415c5] [formerly 117028c632 [formerly 09735415c5 [formerly 293dd0c762884f285e455d94708b6e9fcc82023f]]]
Former-commit-id: 117028c632
Former-commit-id: 042aa3503e2052385e138273b071ed7d19fad917 [formerly a90266a49f]
Former-commit-id: 473368e0c8
2013-01-24 15:50:09 -06:00
Steve Harris
7b1dbd3c56 Merge "Issue #1496 Changes to move what may be long queries off the UI thread. Changed based on comments in patch set 2." into development
Former-commit-id: d8882d38ef [formerly 88734ab106] [formerly ca23ba06e5] [formerly 267d860cd1 [formerly ca23ba06e5 [formerly 64f9216a13fbad67733c5babde8a8f507bbe399f]]]
Former-commit-id: 267d860cd1
Former-commit-id: 88968d3e3fb4d249efd67cec63084edac1ce39bb [formerly 9b3713763d]
Former-commit-id: bd1393541a
2013-01-24 15:02:36 -06:00
Mike Duff
a09e8c5570 Issue #1523 - Fix problem with legend keys.
Change-Id: Iea9cf5a95767b8c3a71ddc022757d9d5dda5a931

Former-commit-id: ed32adc993 [formerly 478ec72102] [formerly ba5014b162] [formerly c06ed9f9dc [formerly ba5014b162 [formerly c625174317778f673a8f3b5062e1bd7832b70ed4]]]
Former-commit-id: c06ed9f9dc
Former-commit-id: 1b1ac20cfdbaa8e552b23d4725c85806c869b494 [formerly fbf92a6d06]
Former-commit-id: 05e9b88566
2013-01-24 12:39:12 -06:00
Mike Duff
309bb57f14 Issue #1357 - fix for data plotting in the x direction.
Former-commit-id: 4d17e05653 [formerly d4d80b0206] [formerly da22ae4a5f] [formerly b283362a2f [formerly da22ae4a5f [formerly 862ca86596fb59ce5c0b6cbcce320303f6cda3b3]]]
Former-commit-id: b283362a2f
Former-commit-id: 4adca58722a1673adcbc0170eae7beb1f06a40ae [formerly da2c03f0ae]
Former-commit-id: 4e30dc629a
2013-01-24 11:37:23 -06:00
Max Schenkelberg
c709c91154 Issue #1474 Fixed MetarPrecipResourceData and LightningResourceData so updates do not required requery. Made an AutoUpdater per plugin so they process independently of each other.
Amend: Only register product alerts in thin client if JMS is not disabled

Change-Id: Ic46daf57ef3ede3aad2a2f067e9764f85f7df9a2

Former-commit-id: 73fbdc6da3 [formerly a8dc166a1f] [formerly 9655d64069] [formerly b6a29c38a5 [formerly 9655d64069 [formerly 115dc26748e0779b4c67cc74fe08c5bf17542632]]]
Former-commit-id: b6a29c38a5
Former-commit-id: 52f3bdc976aa7b28a5a0097fdc6d4d6c63530fb5 [formerly 11c8dd6fff]
Former-commit-id: ecce9be8ce
2013-01-23 16:50:17 -06:00
Ron Anderson
21d235ccf3 Merge "Issue #1515: Move blocking VCParm calls off of the ParmListener notification threads." into development
Former-commit-id: 0f79427f2a [formerly d8878cfd97] [formerly 237b728039] [formerly ed1e096a11 [formerly 237b728039 [formerly 1f809b6b94e9a0d3d96542bea9781cbc6397572d]]]
Former-commit-id: ed1e096a11
Former-commit-id: 5c5fc269cf44177b7d1f6983e2f3b2b305109bfc [formerly ee4c0568bf]
Former-commit-id: dd437f3df4
2013-01-23 16:46:42 -06:00
Ron Anderson
250fd1d223 Issue #1524 Fix discrete color bar.
Former-commit-id: 001770beb7 [formerly 3d838584ed] [formerly 718f1da85b] [formerly 358c8bdf07 [formerly 718f1da85b [formerly 7edd57ef71e8a22aa25870477844ba063da0b9d3]]]
Former-commit-id: 358c8bdf07
Former-commit-id: d49ec924e070578e004c1ea1c0c50d561de56ceb [formerly 3ccfdbc4bb]
Former-commit-id: 6f7fa3e4e5
2013-01-23 16:37:56 -06:00
Ben Steffensmeier
d06eb6312e Issue #1479 fix mod families
Former-commit-id: dec6cf6e9d [formerly 735add55ba] [formerly 13fd813660] [formerly a7989d4638 [formerly 13fd813660 [formerly 76b5a4fcf313e2a028662a1e07871fff2e328d48]]]
Former-commit-id: a7989d4638
Former-commit-id: 17cbebf191acc2d92271b74e20f9bb5df587b7a1 [formerly fbd614258f]
Former-commit-id: 3dfe43caac
2013-01-23 15:47:30 -06:00
Mike Duff
9c8e53e0d4 Issue #1523 - Fix for count
Former-commit-id: d4b36b98f7 [formerly adbabb6765] [formerly 229a0c77fa] [formerly 3c20aab166 [formerly 229a0c77fa [formerly 35fbd9ce448a17d761bd4f745fd2f1339d82537b]]]
Former-commit-id: 3c20aab166
Former-commit-id: f8373eb1bbc61919c49e5d861d7a5ce2c29b0d77 [formerly cb268b76e4]
Former-commit-id: 028fe6cea9
2013-01-23 15:15:08 -06:00
Mike Duff
dfbaec400e Issue #1386 - Remove Save Stats Graph Menu Item.
Former-commit-id: 008014c61d [formerly c52ed8a476] [formerly 8c2789a1a7] [formerly dc46923886 [formerly 8c2789a1a7 [formerly a201a22bb4271c94b1fda7f4eaa1f1b74b9d1859]]]
Former-commit-id: dc46923886
Former-commit-id: d03b741e0705a2829aae7d11b7012e5dde6b0336 [formerly 2b4ec75a2c]
Former-commit-id: a7dfd070fd
2013-01-23 15:02:36 -06:00
Roger Ferrel
9d57e63501 Issue #1496 Changes to move what may be long queries off the UI thread.
Changed based on comments in patch set 2.

Change-Id: I867f716aac39562f9b8bfaddf187bc80cb5a71ce

Former-commit-id: 7dad868adf [formerly 3abb6f1026] [formerly ff09ee32ab] [formerly 470abe2495 [formerly ff09ee32ab [formerly e54cc8fa001f3c6584bc40a74f461d7021ef77bb]]]
Former-commit-id: 470abe2495
Former-commit-id: 74c0f2f92451f0a414ebfbb04887d41f50debf92 [formerly 58e3bbbe97]
Former-commit-id: 3daf0c7b37
2013-01-23 14:08:46 -06:00
Ben Steffensmeier
46d0780052 Issue #1521 create grid data access factory and refactor satellite to share common functionality.
Change-Id: I54de0b41b60ccd058124eb79e6f032cb2ea9a3cf

Former-commit-id: 4c552e9078 [formerly bd32a947c7] [formerly a19b51cf2e] [formerly 3032dc2189 [formerly a19b51cf2e [formerly 2133adac87eaa53977c26700ef656c304e81ee1b]]]
Former-commit-id: 3032dc2189
Former-commit-id: e8a187a94b2904c946afa1581a0b3a5ec4094308 [formerly 2e907f4a0e]
Former-commit-id: e59bb3c914
2013-01-23 11:39:52 -06:00
Mike Duff
aa26a4d5d2 Issue #1357 - Remaining stats items implemented.
Peer Review Fixes

Change-Id: I94d2e3fc08af2bef5e1e57c4ad7caf826e254ae1

Former-commit-id: d54b3a3519 [formerly 712862d96f] [formerly ffca969560] [formerly 1bc6e7c2e4 [formerly ffca969560 [formerly 19e1608c44d314e11bb7cba809e1cc0a6bb68dc5]]]
Former-commit-id: 1bc6e7c2e4
Former-commit-id: 1dd22669a9d4462243dd018526062181eb8a7d09 [formerly 4cd7deb608]
Former-commit-id: dfcce57a0a
2013-01-23 11:17:36 -06:00
David Gillingham
b96532e8ba Issue #1515: Move blocking VCParm calls off of the ParmListener notification threads.
Change-Id: I1c3c46dde051802fb79b7ead6fb63d766d1d00a6

Former-commit-id: a8bc4575bc [formerly eab83c0f63] [formerly bf6230441f] [formerly 88e518725e [formerly bf6230441f [formerly 9cd87997f7ae7b51608ac56fcdf4d282339526aa]]]
Former-commit-id: 88e518725e
Former-commit-id: 9daae29bca1ae2c2c15295eb3aeae98bbeae7fa5 [formerly a1fd2bd32f]
Former-commit-id: faedefb85d
2013-01-23 10:09:39 -06:00
Mike Duff
d2f8846060 Issue #1520 - Change delete notifications to hide.
Remove accelerators

Change-Id: I2954c1324cbdf1bc4e5577925dbcd10e5faa6156

Former-commit-id: bf9354054d [formerly bbc998d372] [formerly ddcd0f8222] [formerly 8efd37da79 [formerly ddcd0f8222 [formerly 0378ff80cc3592379ec3d49efc895adafa05109a]]]
Former-commit-id: 8efd37da79
Former-commit-id: 026641ddcd51a6b5f16ed20fe1e5055ed89bac01 [formerly 243c1e15e9]
Former-commit-id: 14bfeb0732
2013-01-23 09:14:48 -06:00
Dustin Johnson
70bce9d505 Issue #1519 Fix max latency calculations for adhoc queries
Amend:
  Peer review comments.

Change-Id: Ifa76b145616d8fdcf4ba41cd3744cfc3991b902c

Former-commit-id: 0f7b01795d [formerly 504268f0f3] [formerly 99533e7f4be78460bbd202f0f609a7357cffb683 [formerly 6c1818d544]] [formerly f730422834 [formerly 6c1818d544 [formerly e9d88236907b98f7e461807592e580bdf1ecedb9]]]
Former-commit-id: f730422834
Former-commit-id: 76d8b5641220e657d9123f65878c0ce41da1c8f6 [formerly 516ac1ab9a]
Former-commit-id: 2e09d46fea
2013-01-23 08:06:52 -06:00
Steve Harris
b33edc1373 Merge branch '13.2.1_delivery' into development
Former-commit-id: 0a728f6550 [formerly cbffccc58e] [formerly 1718a19f2d] [formerly 9b6cc68601 [formerly 1718a19f2d [formerly 382363c3418b73ecd4f0ead96315a50fe859f779]]]
Former-commit-id: 9b6cc68601
Former-commit-id: 85fb1ad709c9c553a8e608e531581ff213d0b779 [formerly c7148da94d]
Former-commit-id: 764efdb8b8
2013-01-22 21:47:09 -06:00
Nate Jensen
998bbc254d Merge "Issue #1485 fixed bug in CAVE localization where a save() operation would appear to work when it actually failed due to user not being authorized." into 13.2.1_delivery
Former-commit-id: a2b66980dd [formerly ca7ecbb38a] [formerly 2059b9a962] [formerly 6e89f547e5 [formerly 2059b9a962 [formerly 302d33f6a13017905c5668fb12d710ecb29c4298]]]
Former-commit-id: 6e89f547e5
Former-commit-id: ee1703ba3eeb2bcd70c9bcd684bd2ba428f46711 [formerly ab30ace9ce]
Former-commit-id: 0ede688235
2013-01-22 18:05:00 -06:00
Steve Harris
7d6a1a7e3a Merge branch '13.2.1_delivery' into development
Former-commit-id: f1b3a0ce2e [formerly cf384edfbb] [formerly 11b9bfc187] [formerly 1af055a04b [formerly 11b9bfc187 [formerly 920b282de84def082dac82832d80e67f7bff2b19]]]
Former-commit-id: 1af055a04b
Former-commit-id: cdda32a5afb54d36ca6dc56ab5842aa9a04bf651 [formerly 29b9077291]
Former-commit-id: 8b578c10dc
2013-01-22 16:45:48 -06:00
Lee Venable
96dcd20dc6 Merge "Issue #1484 - Fix for half timestep changes for 3 hours or less duration. Peer Review comments." into 13.2.1_delivery
Former-commit-id: f5ac31bcde [formerly aecd00423a] [formerly 619349b140] [formerly b945ce9e6e [formerly 619349b140 [formerly ef3d4c5b19c6482ec2ac2d38f90d975b7df1e295]]]
Former-commit-id: b945ce9e6e
Former-commit-id: bc549afb6b1466a867632b29624f84bc92b91365 [formerly 511a7d9753]
Former-commit-id: bc10a17c9f
2013-01-22 16:26:48 -06:00
Ron Anderson
eb41c05f54 Issue #1518 Fixed unloading of D2D model parameters from Grid Manager and related issues with HashMaps with Parms as keys in GFELegendResource.
Change-Id: I483bbe92210ceb3015632d6a25d97ac35d7021a6

Former-commit-id: ec31e7e2b5 [formerly 9a432a1153] [formerly ce3d102cf9] [formerly 3682a0e7f4 [formerly ce3d102cf9 [formerly 4f7a660ae3fba41240e032220b6599e652ae6750]]]
Former-commit-id: 3682a0e7f4
Former-commit-id: 6a1f7a195cac8a4aa1dc0ea06b509c23bb7d1264 [formerly 953f86348e]
Former-commit-id: 1062e54d2f
2013-01-22 16:12:16 -06:00