Commit graph

1431 commits

Author SHA1 Message Date
Steve Harris
08bf724a6c 13.2.1-1 baseline
Former-commit-id: 48d1aa7732 [formerly 9771dfae6b] [formerly 48d1aa7732 [formerly 9771dfae6b] [formerly c63f9bcae0 [formerly 6831a29efca54cfde39ab6a462f76ca2ac206f49]]]
Former-commit-id: c63f9bcae0
Former-commit-id: 8ed6a53113 [formerly f6670806bf]
Former-commit-id: 9146e727f9
2013-01-23 11:13:03 -05:00
David Gillingham
a4db386f6e Issue #1515: Move blocking VCParm calls off of the ParmListener notification threads.
Change-Id: I1c3c46dde051802fb79b7ead6fb63d766d1d00a6

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

Change-Id: I2954c1324cbdf1bc4e5577925dbcd10e5faa6156

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

Change-Id: Ifa76b145616d8fdcf4ba41cd3744cfc3991b902c

Former-commit-id: 504268f0f3 [formerly 6c1818d544] [formerly 504268f0f3 [formerly 6c1818d544] [formerly f730422834 [formerly e9d88236907b98f7e461807592e580bdf1ecedb9]]]
Former-commit-id: f730422834
Former-commit-id: 2e09d46fea [formerly 516ac1ab9a]
Former-commit-id: 7918b009ff
2013-01-23 08:06:52 -06:00
Steve Harris
7063a0c8d2 Merge branch '13.2.1_delivery' into development
Former-commit-id: cbffccc58e [formerly 1718a19f2d] [formerly cbffccc58e [formerly 1718a19f2d] [formerly 9b6cc68601 [formerly 382363c3418b73ecd4f0ead96315a50fe859f779]]]
Former-commit-id: 9b6cc68601
Former-commit-id: 764efdb8b8 [formerly c7148da94d]
Former-commit-id: 6964c16be7
2013-01-22 21:47:09 -06:00
Nate Jensen
d61e8b9cdb 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: ca7ecbb38a [formerly 2059b9a962] [formerly ca7ecbb38a [formerly 2059b9a962] [formerly 6e89f547e5 [formerly 302d33f6a13017905c5668fb12d710ecb29c4298]]]
Former-commit-id: 6e89f547e5
Former-commit-id: 0ede688235 [formerly ab30ace9ce]
Former-commit-id: 9494e5b520
2013-01-22 18:05:00 -06:00
Steve Harris
c60051d5df Merge branch '13.2.1_delivery' into development
Former-commit-id: cf384edfbb [formerly 11b9bfc187] [formerly cf384edfbb [formerly 11b9bfc187] [formerly 1af055a04b [formerly 920b282de84def082dac82832d80e67f7bff2b19]]]
Former-commit-id: 1af055a04b
Former-commit-id: 8b578c10dc [formerly 29b9077291]
Former-commit-id: b03d5ce450
2013-01-22 16:45:48 -06:00
Lee Venable
fdd9368038 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: aecd00423a [formerly 619349b140] [formerly aecd00423a [formerly 619349b140] [formerly b945ce9e6e [formerly ef3d4c5b19c6482ec2ac2d38f90d975b7df1e295]]]
Former-commit-id: b945ce9e6e
Former-commit-id: bc10a17c9f [formerly 511a7d9753]
Former-commit-id: 1dd4ad4b00
2013-01-22 16:26:48 -06:00
Ron Anderson
d0d1b62ab7 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: 9a432a1153 [formerly ce3d102cf9] [formerly 9a432a1153 [formerly ce3d102cf9] [formerly 3682a0e7f4 [formerly 4f7a660ae3fba41240e032220b6599e652ae6750]]]
Former-commit-id: 3682a0e7f4
Former-commit-id: 1062e54d2f [formerly 953f86348e]
Former-commit-id: 48099589c0
2013-01-22 16:12:16 -06:00
Mike Duff
3f25b13a11 Issue #1484 - Fix for half timestep changes for 3 hours or less duration.
Peer Review comments.

Change-Id: Ia96c8857094ad14cf0db89b7642dfd46f333ec47

Former-commit-id: e5e7bc1047 [formerly fc4a6264f6] [formerly e5e7bc1047 [formerly fc4a6264f6] [formerly 96e2192585 [formerly f7d8b074bc95b61e6d6e8dbe47442e944092618f]]]
Former-commit-id: 96e2192585
Former-commit-id: 0ffc71147e [formerly d62088cb0c]
Former-commit-id: 8f388537eb
2013-01-22 14:57:23 -06:00
Ron Anderson
64d4baf536 Issue #1504 GFE: Model data not always appearing automatically without CAVE restart
Change-Id: I1e52c111ec50a860a226d85bed6f0ab6dfebed58

Former-commit-id: 74cb9aeb53 [formerly 62671efc2a] [formerly 74cb9aeb53 [formerly 62671efc2a] [formerly 20b0761048 [formerly 1fe63a2d5e20226f6124a9ca27b9f6272c49226c]]]
Former-commit-id: 20b0761048
Former-commit-id: 8e575db69c [formerly 44807ba0d5]
Former-commit-id: cb23960f0e
2013-01-22 14:47:37 -06:00
Ben Steffensmeier
c770b2bd32 Issue #1495 update Product Browser to load all ensemble members
Former-commit-id: cea067868c [formerly 3c62be59c8] [formerly cea067868c [formerly 3c62be59c8] [formerly 1569f5af5d [formerly 2c3ced7beb526f534083ff7b292b7523c76534a9]]]
Former-commit-id: 1569f5af5d
Former-commit-id: ad1ca2feb5 [formerly 1057580201]
Former-commit-id: 18296e08da
2013-01-22 12:12:18 -06:00
Dustin Johnson
87a442717b Merge "Issue #1501 Route notification requests to datadelivery." into 13.2.1_delivery
Former-commit-id: 77923b1cef [formerly 84b6f0217f] [formerly 77923b1cef [formerly 84b6f0217f] [formerly 26e72198b7 [formerly 9fb35681ebe6d17679cd26cc86a53aeb357bcd3b]]]
Former-commit-id: 26e72198b7
Former-commit-id: a83bc7ce7f [formerly 821572355e]
Former-commit-id: c3cfb16075
2013-01-22 11:47:03 -06:00
Dustin Johnson
7da688f138 Issue #1441 Create new datadelivery services plugin
Add GroupDefinition service.
Update subscriptions to not have a group name when their group is deleted.

Amend:
  Rebase to HEAD of 13.2.1.

Change-Id: I817ca1912f76ccf347907ddb12e3f6fd8de7e5aa

Former-commit-id: 3ec05a5a9c [formerly 557de162b0] [formerly 3ec05a5a9c [formerly 557de162b0] [formerly 15c2c55ff9 [formerly 464b46dd4f4af60dbeb917f65c18c876d712e4ad]]]
Former-commit-id: 15c2c55ff9
Former-commit-id: 756080321e [formerly a3c99f86bb]
Former-commit-id: 2168713505
2013-01-22 11:45:18 -06:00
Bryan Kowal
91e8aa2419 Fix the merge.
Former-commit-id: 0858dfdfe4 [formerly fd7c132266] [formerly 0858dfdfe4 [formerly fd7c132266] [formerly a66024e35b [formerly 9f9da21517569f703c9e732016350b64ef14b98a]]]
Former-commit-id: a66024e35b
Former-commit-id: 1e2a4b7801 [formerly 358132c3c4]
Former-commit-id: 61349238a4
2013-01-22 10:48:04 -06:00
Dustin Johnson
cb174e731d Issue #1501 Route notification requests to datadelivery.
Change-Id: Icde52bafb67e199caeb74ed0078c879ab514836b

Former-commit-id: cda7f4d592 [formerly d956891360] [formerly cda7f4d592 [formerly d956891360] [formerly 500f6050be [formerly 9550a861fab635a8f61c485152e27ec90ebb9cb2]]]
Former-commit-id: 500f6050be
Former-commit-id: a372963fb7 [formerly b4bb2ee454]
Former-commit-id: 2ab171b9ef
2013-01-22 10:19:09 -06:00
Steve Harris
cae136ee16 Merge branch '13.2.1_delivery' into development
Conflicts:
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/BaseGfePyController.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/procedures/ProcedureJob.java

Former-commit-id: 340d2009f7 [formerly df9ac3685e] [formerly 340d2009f7 [formerly df9ac3685e] [formerly 3a772f41cf [formerly a0bcc2276fb95097cfc10869f0aa1ee48189fc3a]]]
Former-commit-id: 3a772f41cf
Former-commit-id: 5b516ebb6f [formerly 111d5afb3a]
Former-commit-id: 922d0493fb
2013-01-22 09:40:50 -06:00
Dustin Johnson
6314e94764 Issue #1501 Include subscription on activation/deactivation notification, remove race condition of table update.
Change-Id: Ic3f8ff634136a9830cba42befc7f41c2554698aa

Former-commit-id: 94a0cd5733 [formerly 0281da10cc] [formerly 94a0cd5733 [formerly 0281da10cc] [formerly 2eda48aa0d [formerly dd07cad3e6b2471fc4371471918078498f05d01e]]]
Former-commit-id: 2eda48aa0d
Former-commit-id: 58b3edd7df [formerly c7189052e8]
Former-commit-id: 2df1cb5d53
2013-01-21 21:24:48 -06:00
Max Schenkelberg
babef87edb 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.
Change-Id: Ib37e5be2163d750ac24827c2868162b06c290390

Former-commit-id: 8058260830 [formerly 5c51083f35] [formerly 8058260830 [formerly 5c51083f35] [formerly 6fd6b2e42d [formerly 3b5af8689a2fc2a7ee783d896c624fbc5581b58a]]]
Former-commit-id: 6fd6b2e42d
Former-commit-id: 3d459dd57c [formerly 2c05f3c179]
Former-commit-id: 75135bf8f6
2013-01-21 14:58:16 -06:00
Nate Jensen
977cf22051 Merge "Issue #1486: Commit initial implementation of a generic PythonScript controller class based on GFE's AbstractGfePyController, refactor GFE code to use it." into development
Former-commit-id: d725a23922 [formerly 36fc48eb53] [formerly d725a23922 [formerly 36fc48eb53] [formerly d45d793d36 [formerly 73d470a83799446554b4dd86eb20638c0d5fc48f]]]
Former-commit-id: d45d793d36
Former-commit-id: e0452a81c7 [formerly e969a8c438]
Former-commit-id: 6400ecbe98
2013-01-21 11:42:37 -06:00
Nate Jensen
152a94adf4 Issue #1509 garbage collect after each procedure run
Change-Id: I7792d8bc186d6cef0fea38eccb657af040746fd7

Former-commit-id: c5d725bc7e [formerly bd9123fb3a] [formerly c5d725bc7e [formerly bd9123fb3a] [formerly add161ae2f [formerly fa239d3e7413c7441ba4440f0fe10f9e373de3df]]]
Former-commit-id: add161ae2f
Former-commit-id: 414004fabf [formerly 633af5e497]
Former-commit-id: 1a1eb9bf3b
2013-01-21 09:26:43 -06:00
Richard Peter
006dbb78cf Merge "Issue #1495 add ensemble selection tab to subset dialog Change-Id: I71c599428285c9d394529a77359a4ba61dd88f15" into 13.2.1_delivery
Former-commit-id: ac3b484474 [formerly 76f9e42fd3] [formerly ac3b484474 [formerly 76f9e42fd3] [formerly 9feb73c161 [formerly 4eb1e71df46c7ceaa5bf523c02821228da42460e]]]
Former-commit-id: 9feb73c161
Former-commit-id: d421b7208a [formerly 5acc5996d3]
Former-commit-id: 06d25c6c95
2013-01-18 15:43:16 -06:00
Ben Steffensmeier
c659ffb227 Issue #1495 add ensemble selection tab to subset dialog
Change-Id: I71c599428285c9d394529a77359a4ba61dd88f15

Former-commit-id: d06ef00715 [formerly f0d1c1a737] [formerly d06ef00715 [formerly f0d1c1a737] [formerly 14f3c3b3bf [formerly e884c8e79f05af8fb3252fa7a492d232ba090715]]]
Former-commit-id: 14f3c3b3bf
Former-commit-id: 0ec9848c96 [formerly a28d09edbf]
Former-commit-id: 88dd263c34
2013-01-18 15:42:08 -06:00
Richard Peter
f891a71692 Merge "Issue #1495 enable ensemble subset requests in opendap. Change-Id: I5c74b23f6c5c31b397855f102ee08f9c5737ac1a" into 13.2.1_delivery
Former-commit-id: 7cc497c663 [formerly 9f9020db61] [formerly 7cc497c663 [formerly 9f9020db61] [formerly bf18ba9214 [formerly b940fe556d1421d3709ff6c798ee0a39ae09af10]]]
Former-commit-id: bf18ba9214
Former-commit-id: 0f208693ec [formerly 2e5883c56e]
Former-commit-id: 0e6209822e
2013-01-18 15:35:56 -06:00
Ben Steffensmeier
cc33f33872 Issue #1495 enable ensemble subset requests in opendap.
Change-Id: I5c74b23f6c5c31b397855f102ee08f9c5737ac1a

Former-commit-id: 928cb3b00f [formerly eb821d7580] [formerly 928cb3b00f [formerly eb821d7580] [formerly 94ba8511cb [formerly ddaf9e6c69221600deedfbaf991a3936d0bb711e]]]
Former-commit-id: 94ba8511cb
Former-commit-id: 41a0a0e4e4 [formerly 7e3b6d12f6]
Former-commit-id: 0232b77e85
2013-01-18 14:58:10 -06:00
Ben Steffensmeier
c67345f95a Issue #1502 fix grid sampling unit null pointer.
Former-commit-id: f814fd22a3 [formerly b6fb3706bb] [formerly f814fd22a3 [formerly b6fb3706bb] [formerly 5a07b36fa4 [formerly db0a4825b8360afaada2a8f8363108464e61f474]]]
Former-commit-id: 5a07b36fa4
Former-commit-id: 0b672c9c8c [formerly 57ef4597e8]
Former-commit-id: 77d8f4ec1d
2013-01-18 11:19:15 -06:00
Ben Steffensmeier
8d6d821ac0 Issue #1483 switch dual pol bundles to no longer use bestRes, fix bestRes updates.
Former-commit-id: a9654f859a [formerly f0af056d97] [formerly a9654f859a [formerly f0af056d97] [formerly ec199ad7d1 [formerly deeff9eae06f096612b65832a344e5d05a36db07]]]
Former-commit-id: ec199ad7d1
Former-commit-id: 50d1561165 [formerly 3bfba5b771]
Former-commit-id: ca6ab4a945
2013-01-18 10:59:43 -06:00
Steve Harris
61a9f644d9 Merge branch '13.2.1_delivery' into development
Conflicts:
	edexOsgi/com.raytheon.uf.edex.ohd/src/com/raytheon/uf/edex/ohd/pproc/MpeLightningSrv.java

Former-commit-id: 89f3120c0c [formerly 2c9c6b7dde] [formerly 89f3120c0c [formerly 2c9c6b7dde] [formerly 407d73a04f [formerly cda6b1137d9052b0859f2b51f5bdadecad411e43]]]
Former-commit-id: 407d73a04f
Former-commit-id: 0ca985778e [formerly bbb637faf3]
Former-commit-id: 45760d8bef
2013-01-18 10:52:29 -06:00
Steve Harris
18b7633b70 13.1.2-10 baseline
Former-commit-id: 683193255d [formerly 68dde17de2] [formerly 683193255d [formerly 68dde17de2] [formerly 86ea0b666e [formerly 5a6d030d358519ca30fc37bf4a090a00557422a3]]]
Former-commit-id: 86ea0b666e
Former-commit-id: 39f9dc931a [formerly d148beb4ca]
Former-commit-id: 5c488932d9
2013-01-18 10:37:25 -05:00
Steve Harris
b9cd443717 13.1.2-9 baseline
Former-commit-id: 6fd587d08d [formerly 0878a7ea57] [formerly 6fd587d08d [formerly 0878a7ea57] [formerly ddc6aec013 [formerly da5b6c5b6999445b5ded541aac1bbdb46f0d322d]]]
Former-commit-id: ddc6aec013
Former-commit-id: 5b752c12c4 [formerly 5e0a9a8fd2]
Former-commit-id: 3f93a9eb2e
2013-01-18 10:29:52 -05:00
Mike Duff
4119d2bb88 Issue #1386 - Change menu text to read Save Graph Image.
Former-commit-id: 754fbf637e [formerly 5b6ec484c0] [formerly 754fbf637e [formerly 5b6ec484c0] [formerly 592b2d9088 [formerly c8e849b1636d9429215a36ba85febf805cdd4fc6]]]
Former-commit-id: 592b2d9088
Former-commit-id: b3c1a39a24 [formerly d0d05f975d]
Former-commit-id: 2f8c734d8e
2013-01-18 09:28:43 -06:00
Nate Jensen
c71320d922 Issue #1497 fix build
Former-commit-id: 13b5619297 [formerly 6e0f0d330e] [formerly 13b5619297 [formerly 6e0f0d330e] [formerly b52aa82213 [formerly 3b30fcffe24d19c6c694d9519d1a515843248d32]]]
Former-commit-id: b52aa82213
Former-commit-id: cc0725f0b7 [formerly 98ec6fcc1c]
Former-commit-id: d269e1953b
2013-01-17 18:42:38 -06:00
David Gillingham
9266b39ced Issue #1486: Commit initial implementation of a generic PythonScript controller class based on GFE's AbstractGfePyController, refactor GFE code to use it.
Change-Id: I6d04b58fea98c6e4ef032b4867969b8a01e258bc

Former-commit-id: 9e3999a427 [formerly c6e64d83a2] [formerly 9e3999a427 [formerly c6e64d83a2] [formerly d16760c73e [formerly f54f775fa2bb89663e308feb79f5e188dbdd4cb4]]]
Former-commit-id: d16760c73e
Former-commit-id: 09836dacca [formerly a40383de3b]
Former-commit-id: 74bd042c3f
2013-01-17 17:42:05 -06:00
Dustin Johnson
1e4df6722c Issue #1501 Use registry version of subscription when sending notification responses
Change-Id: I96622e8f1d2236ade47d4c5a11ad41b750bc7962

Former-commit-id: 9f775d2dd7 [formerly d9064bdc98] [formerly 9f775d2dd7 [formerly d9064bdc98] [formerly 38036a0e8b [formerly da8f6de9ae2b897163b465c045114fbd9ebec6e8]]]
Former-commit-id: 38036a0e8b
Former-commit-id: 9681f57fac [formerly 13a75fabad]
Former-commit-id: 6266e3e44c
2013-01-17 14:53:36 -06:00
Ben Steffensmeier
eee5dfea1d Issue #1502 fix grid sampling unit null pointer.
Former-commit-id: c71e77f65e [formerly 00f0384065] [formerly c71e77f65e [formerly 00f0384065] [formerly 6409141383 [formerly e1618704972fad954ac61bc3aecb09f6767f1255]]]
Former-commit-id: 6409141383
Former-commit-id: 9053b6e7aa [formerly e03f073335]
Former-commit-id: 02f52c800e
2013-01-17 13:02:35 -06:00
Ben Steffensmeier
07fc539dd5 Issue #1495 update Product Browser to load all ensemble members
Former-commit-id: 6366bf3b6d [formerly 4854df66bc] [formerly 6366bf3b6d [formerly 4854df66bc] [formerly 9aafe61075 [formerly 38af9c697b1bb96e5f6f032eb9fc2055a9e8f7ef]]]
Former-commit-id: 9aafe61075
Former-commit-id: 65c898fb16 [formerly 6ff281dc98]
Former-commit-id: 99349f9f9e
2013-01-17 10:32:40 -06:00
Bryan Kowal
dc85c1692b Issue #1469 - getPath will be used in the place of getAbsolutePath so java does not prepend a fictional path to the beginning of the expected path
Former-commit-id: 86bd4e3b3f [formerly a2f745ec54] [formerly 86bd4e3b3f [formerly a2f745ec54] [formerly 5d769d8a8d [formerly 42a05fc36d0ba3036a7e056d8871f684abf986c9]]]
Former-commit-id: 5d769d8a8d
Former-commit-id: d9832e846b [formerly 2bb5377a4d]
Former-commit-id: 0c5323fadb
2013-01-17 09:59:11 -06:00
Bryan Kowal
0b8e0ac970 Issue #1494 - the com.raytheon.viz.dataaccess feature will now be built
Former-commit-id: 846d860eb2 [formerly 68491bee01] [formerly 846d860eb2 [formerly 68491bee01] [formerly 08c2faaabe [formerly 796f9e15632bf3491c68702be5e7135c51b99fec]]]
Former-commit-id: 08c2faaabe
Former-commit-id: ef232c483f [formerly 7dbe52a47a]
Former-commit-id: dfe8b8b291
2013-01-17 09:57:58 -06:00
Richard Peter
20c095cd1a Merge "Issue #1479 fix mod families" into development
Former-commit-id: 62565f136d [formerly 9d81479452] [formerly 62565f136d [formerly 9d81479452] [formerly 8d05edb256 [formerly 31faae93ac271de25b7671f45548a3c088a2eacf]]]
Former-commit-id: 8d05edb256
Former-commit-id: 10ffd93cd7 [formerly 8538c8ff38]
Former-commit-id: ac4e63d202
2013-01-16 17:11:12 -06:00
Roger Ferrel
0435636b1e Issue #1442 Changes to update display when Simulated Time is changed. Corrections to pqact.conf.template.
Changes based on code review and added listener to GridManager and unit test.

Change-Id: Ida593a7e3cc7d4fd9bd6f44a4455145114484650

Former-commit-id: 972db12324 [formerly 1cd076671c] [formerly 972db12324 [formerly 1cd076671c] [formerly 1e492b81ff [formerly 7f70c2f65453db6bf3097ae8157511c38a36b136]]]
Former-commit-id: 1e492b81ff
Former-commit-id: 86d51634dc [formerly f10521f861]
Former-commit-id: 722708105f
2013-01-16 16:53:29 -06:00
Mike Duff
fc87600adb Issue #1420 - More Rules changes.
Peer review comments

Change-Id: I3ed89b332764bba2d995a248e361d20c1eec6edf

Former-commit-id: 1df1b5a94d [formerly 2a31447d6d] [formerly 1df1b5a94d [formerly 2a31447d6d] [formerly 8d0a79703f [formerly 84f2d0ed39e11059359558676c988a0bf1e989b9]]]
Former-commit-id: 8d0a79703f
Former-commit-id: 72a70a6eaf [formerly c6924b6920]
Former-commit-id: 7a750e72e3
2013-01-16 14:34:55 -06:00
Roger Ferrel
fe30158953 Issue #1492 Made GFE's GhgFontDlg and volume browser's InventoryDlg non-blocking; removed no longer needed "original" classes. No code changes merge conflict?
Change-Id: I28676d7b6d016e3f4f61fcc667c2e1d2af9e53d1

Former-commit-id: fbf6bc87c4 [formerly 5250a0addf] [formerly fbf6bc87c4 [formerly 5250a0addf] [formerly cabdfd569f [formerly 5444e7653c0cf488eb424a16816beb2e6a9335b1]]]
Former-commit-id: cabdfd569f
Former-commit-id: 5187be10ca [formerly e8d8dcc795]
Former-commit-id: 3a9b914186
2013-01-16 13:07:58 -06:00
Steve Harris
f1164c96a7 Merge branch '13.2.1_delivery' into development
Former-commit-id: 79e7b50d94 [formerly 8c447659ff] [formerly 79e7b50d94 [formerly 8c447659ff] [formerly 483e55bcef [formerly 723f0efba18c83c46d3b241dae678e81d2ac924d]]]
Former-commit-id: 483e55bcef
Former-commit-id: b8ab464cee [formerly 2e34a82690]
Former-commit-id: 77662c1de0
2013-01-16 12:03:50 -06:00
Ben Steffensmeier
1b6523f7fa Issue #1479 fix mod families
Former-commit-id: da98f8e176 [formerly 244f55e1f9] [formerly da98f8e176 [formerly 244f55e1f9] [formerly 65b11cf54c [formerly 4678cbf7764cae77683d357f0ac1bf6ff95bc63e]]]
Former-commit-id: 65b11cf54c
Former-commit-id: 0fe033c64c [formerly 0d8a901d07]
Former-commit-id: 82bb31a603
2013-01-16 10:56:21 -06:00
Bryan Kowal
6dbe3e938f Issue #1469 - getPath will be used in the place of getAbsolutePath so java does not prepend a fictional path to the beginning of the expected path
Former-commit-id: 55550007cb [formerly 2ed28bed93] [formerly 55550007cb [formerly 2ed28bed93] [formerly 8c118e791b [formerly 18676a8f73c7ac0eb2ce0ff25cf3c66ae1f72f02]]]
Former-commit-id: 8c118e791b
Former-commit-id: 1eb4e6d41e [formerly 0a39b4ddf1]
Former-commit-id: e9e16abea2
2013-01-15 18:46:46 -06:00
Bryan Kowal
f99ad00934 Issue #1414 - adding Satellite to the Data Access Framework
- addressed peer review comments
- includes the CAVE generic grid resource and resource data
- the generic grid resource now utilizes the populateData method of IGridData
- the data time methods of the satellite factory will now throw data retrieval exceptions

Change-Id: I763cddc8ba8cac715eb0605594904bd9f9c21db9

Former-commit-id: a315e4461b [formerly 4939e96872] [formerly a315e4461b [formerly 4939e96872] [formerly 789359a779 [formerly b084e4a721edc9400fc7a8f25c7da539d6dd8480]]]
Former-commit-id: 789359a779
Former-commit-id: 03ccca567a [formerly 53a280116b]
Former-commit-id: e443218bfb
2013-01-15 18:08:17 -06:00
Brad Gonzales
beed5ad195 Issue #1452 Clear current filters when creating a new filter configuration.
Change-Id: I7562e05f404b7b3bc746a168d72601520d3a8500

Former-commit-id: 5fd396acaf [formerly 026c98298b] [formerly 5fd396acaf [formerly 026c98298b] [formerly e7ecc52e25 [formerly c4f47262403a56a0e6fe28bb1b5ac523fb91e43f]]]
Former-commit-id: e7ecc52e25
Former-commit-id: 382a21f3a2 [formerly 253ac8f1d3]
Former-commit-id: 5693e82505
2013-01-15 15:50:43 -06:00
Dave Hladky
4fd7346b03 Issue #1475 QPF standalonoe displays appear slow
Change-Id: I352de7f76ade5d3d981b3c6206086955c2243f6a

Former-commit-id: ffd3faa84b [formerly 0f7a64798d] [formerly ffd3faa84b [formerly 0f7a64798d] [formerly 6822591e1a [formerly 6e7c86aba7103c445823ac2a11a2241939e4b6c2]]]
Former-commit-id: 6822591e1a
Former-commit-id: 9d935baf22 [formerly 81c9f8e21e]
Former-commit-id: 5b9f40661a
2013-01-15 15:50:27 -06:00
Richard Peter
84e0f2cf1f Merge "Issue #1286 Fix bugs found during 1286 testing" into 13.2.1_delivery
Former-commit-id: d30a607764 [formerly c8d963d541] [formerly d30a607764 [formerly c8d963d541] [formerly dc6ee0b9e1 [formerly e2516f60d0748830d5849f42819e2dcc66b67bb6]]]
Former-commit-id: dc6ee0b9e1
Former-commit-id: fe2c8b320e [formerly b456405145]
Former-commit-id: aef2f39a62
2013-01-15 15:37:42 -06:00
Bryan Kowal
89cc2bdf57 Issue #1469 - pypies will now read the hdf5 root directory from configuration. Relative paths can now be passed to pypies. Rebased to fix merge conflict.
Change-Id: I38873e478729a3644db7ce2813e9bd6c15d9bdf3

Former-commit-id: fba28ea69b [formerly e2a12845d3] [formerly fba28ea69b [formerly e2a12845d3] [formerly 4db9c6c321 [formerly ed2e78738b391bcb9a40ddde7b7a6acf7ccd1b30]]]
Former-commit-id: 4db9c6c321
Former-commit-id: 38480e46b1 [formerly c1330e8121]
Former-commit-id: 290167ac16
2013-01-15 14:56:01 -06:00