Commit graph

221 commits

Author SHA1 Message Date
Dave Hladky
e14b51258b Issue #2460 Product browser display of adhoc subscriptions
Change-Id: I9c045b781adb41468d395b67a837c9a862744447

Former-commit-id: 477fbd3d59 [formerly 6076f46549 [formerly c504c44750f5f441be41c20fdb78a363c620fb3d]]
Former-commit-id: 6076f46549
Former-commit-id: 7b6ef7ee9a
2013-10-16 09:06:00 -05:00
Mike Duff
78e2aab777 Issue #2477 - Fix bug in group settings in create sub dlg.
Change-Id: I32921ec989bb72cfbaea898af5b696c18d514f4c

Former-commit-id: a9c8797e9e [formerly 1485ddd779 [formerly 6111ef3dacff5be7f3fa80334553646b988b60d2]]
Former-commit-id: 1485ddd779
Former-commit-id: 9e2a8a0e04
2013-10-15 11:18:52 -05:00
Mike Duff
e549346353 Issue #2386 - Fix for editing subscriptions from subscription manager dlg.
Change-Id: I0d5532648456cc1a0960fb14e9115c52d4478682

Former-commit-id: 65c693d5c4 [formerly 15fe243ebc [formerly f32286059bfc661408ab16d8a6a118beffe0ce17]]
Former-commit-id: 15fe243ebc
Former-commit-id: 3ac5ba498a
2013-10-15 09:52:08 -05:00
Nate Jensen
2c3d286eb2 Merge "Issue #2386 - DD Front end refactor Peer review comments Change-Id: Ie3d503dca37af3eda917c096119d1c6d40488e0f" into development
Former-commit-id: 23e1817385 [formerly baac431d85 [formerly c3550fa64755f73ee2a23080a0f786a2f170e6ae]]
Former-commit-id: baac431d85
Former-commit-id: b1d4d2d9ef
2013-10-14 16:26:47 -05:00
Mike Duff
335c8ba871 Issue #2386 - DD Front end refactor
Peer review comments
Change-Id: Ie3d503dca37af3eda917c096119d1c6d40488e0f

Former-commit-id: 83ec4daee2 [formerly 33a5d36e1c [formerly a72c1f9ad09594ddc0c0e78e78c9fccd95fd49ff]]
Former-commit-id: 33a5d36e1c
Former-commit-id: 9b4daacb26
2013-10-14 15:42:28 -05:00
Richard Peter
e1ba2afa4c Merge "Issue #2386 - Implement the front end for multiple data type overlap rules Peer review comments" into development
Former-commit-id: c056c93104 [formerly d8b49516dc [formerly 581cc8e7319216c910e71936820f7414d2281fed]]
Former-commit-id: d8b49516dc
Former-commit-id: 1f772816de
2013-10-14 11:15:40 -05:00
Mike Duff
10f3fa86b0 Issue #2386 - Implement the front end for multiple data type overlap rules
Peer review comments

Change-Id: I1f0186b3e08f3013a6dc4dc3dbf7c2e0a19404bf

Former-commit-id: a69120c623 [formerly a220ff05b0 [formerly 69a5242579fdeacceba5ed2ce73be01e671328ae]]
Former-commit-id: a220ff05b0
Former-commit-id: c4e501aaf9
2013-10-11 18:18:18 -05:00
Nate Jensen
568e5bd9f6 Merge "Issue #2104 Fixed EnvelopeIntersection issue with inverted enveloped. Fixed various bugs that prevented proper testing of XML file attached to 2104." into development
Former-commit-id: d5d0fab53b [formerly 8208d756c7 [formerly e4ef1dff4330a64ee3a01a03ca5293ae75fd2fab]]
Former-commit-id: 8208d756c7
Former-commit-id: c6c2f50562
2013-10-11 11:21:18 -05:00
Brad Gonzales
718fea35a1 Issue #1797 Refactored registry Time objects to simplify serialization issues.
Amend: Removed OpenDAPRetrievalGenerator.java from the review.
       Fix GriddedTime addCycles when cycles are empty.

Change-Id: I9fa27178e5f59252cb872314493256be7f038890

Former-commit-id: bc87f2a168 [formerly 25710edd9e [formerly a01619f78bac065e7d42e28882157778aba09b75]]
Former-commit-id: 25710edd9e
Former-commit-id: ac3d87c397
2013-10-11 10:36:53 -05:00
Max Schenkelberg
c2471fd381 Issue #2104 Fixed EnvelopeIntersection issue with inverted enveloped. Fixed various bugs that prevented proper testing of XML file attached to 2104.
Amend: Accepted ticket, cleanup, comments

Change-Id: I78649dd0268b030624888544740a8d7af3e83e97

Former-commit-id: 01c0e022d5 [formerly 7a66a3c995 [formerly fb196f5b8659e568ea1406cc5c5e01aa82525a76]]
Former-commit-id: 7a66a3c995
Former-commit-id: b64050ff1e
2013-10-11 10:21:37 -05:00
Slav Korolev
2b29184b21 Issue #2428. Fixed memory leak for Regions
Former-commit-id: 0021d53557 [formerly cab603ba36 [formerly 899d1f6371d55056af747d8bf6dee99d0c4179c9]]
Former-commit-id: cab603ba36
Former-commit-id: 2c4730db16
2013-10-10 14:09:37 -04:00
Richard Peter
a4b1eb9dff Merge "Issue #2267 Fixed exceptions in casts of Collections to Lists. Fixed WMO header cr and lf format. Removed statsTemplate from modes." into development
Former-commit-id: d7db5d0219 [formerly 8f67035519 [formerly 3a704d8d903afc5629a13f478af585947954b5d2]]
Former-commit-id: 8f67035519
Former-commit-id: e717ae510b
2013-10-10 11:34:11 -05:00
Slav Korolev
815b2fb40d Issue #2427. Fixed memory leak for images
Former-commit-id: f0aba7be10 [formerly 012497bfef [formerly 770bfd43e07cd92c2c8a3d7b3d1a07eb6d8b1052]]
Former-commit-id: 012497bfef
Former-commit-id: 5dcf4a00bc
2013-10-10 09:34:24 -04:00
Brad Gonzales
094c9dc6a7 Issue #2267 Fixed exceptions in casts of Collections to Lists. Fixed WMO header cr and lf format. Removed statsTemplate from modes.
Change-Id: I601b306bf944d959da05af9277ba80e184d98e30

Former-commit-id: 61448cc04a [formerly 73e757c284 [formerly f776626738e4cc995bb16e87b8da66ff90289bd8]]
Former-commit-id: 73e757c284
Former-commit-id: 59f22b866a
2013-10-09 17:58:12 -05:00
Richard Peter
8d8d1f4996 Merge "Issue #1797 Separation of gridded time and abstract time object Change-Id: I9d84942140e52ec0fded1a9150d7016dec8eaf63" into development
Former-commit-id: e2c7bb21d7 [formerly 2e062048e1 [formerly 204c2034a08cd69fc7286639f37e5ff936ecf49e]]
Former-commit-id: 2e062048e1
Former-commit-id: 9d424c212b
2013-10-07 16:19:11 -05:00
Dave Hladky
7d43c5b7f9 Issue #1797 Separation of gridded time and abstract time object
Change-Id: I9d84942140e52ec0fded1a9150d7016dec8eaf63

Former-commit-id: 1733834e74 [formerly e0ec10d073 [formerly cdf2b6dd5a5b4a12cf12e6d4d254b5e40acfcef5]]
Former-commit-id: e0ec10d073
Former-commit-id: 4d4d93fc0a
2013-10-04 10:36:27 -05:00
Mike Duff
354af07416 Issue #2375 - Fix for set number of rows in notification center
Change-Id: I9f8b937265e77c9777313225ab83f71a81b46994

Former-commit-id: d258009cc7 [formerly 865b5f6878 [formerly 74327c92303fe846d7333d8760652dbcace2d45f]]
Former-commit-id: 865b5f6878
Former-commit-id: 80081ff25b
2013-10-04 09:27:30 -05:00
Mike Duff
b6cdbfa984 Issue #2417 - Fix the highlight all button in the notification center's find dialog
Change-Id: Ia39e049045116a4766ed989612f6ab9a3d994efd

Former-commit-id: b0fac5792b [formerly 43e2b5c156 [formerly 01d92017a3db5aafc4b6d6a9f00abbf64481cfe7]]
Former-commit-id: 43e2b5c156
Former-commit-id: a966d4ce97
2013-09-30 09:40:08 -05:00
Lee Venable
03eded9a02 Issue #2419 - fixed issue with DualList and how it was being used.
Former-commit-id: 9c02d45802 [formerly 0758d67964 [formerly 7020ca52e6e22a68013de74bc9891ad44942c48a]]
Former-commit-id: 0758d67964
Former-commit-id: ae23948831
2013-09-27 15:07:02 -05:00
Nate Jensen
d229a9e02f Merge "Issue #2386 Backend work for adding multiple types to Subscription overlap rules Change-Id: I0779dc7987031999b80ab0859c7f33dca20a5c17" into development
Former-commit-id: c40bedaaf9 [formerly 291cd53426 [formerly 9f24ff56dd91286c02ef168be4d4b36efe67f497]]
Former-commit-id: 291cd53426
Former-commit-id: 51bf49f6b5
2013-09-27 09:39:54 -05:00
Richard Peter
d4a9919307 Merge "Issue #2413 - Added isDirty check to new config for Data Browser Peer review comments" into development
Former-commit-id: 1f40a40449 [formerly 2257278313 [formerly bedacaf43bb65ed3cfbf2aff57cd8839f8df4815]]
Former-commit-id: 2257278313
Former-commit-id: a7f13c41ae
2013-09-26 15:23:54 -05:00
Mike Duff
4a008acf29 Issue #2413 - Added isDirty check to new config for Data Browser
Peer review comments

Change-Id: I920fb093aea05ca985e1429671b94e34279a1af2

Former-commit-id: 8a325f1af7 [formerly 9d95942ad1 [formerly 56d7387b481a2ed6c6647130ad75eae22e319928]]
Former-commit-id: 9d95942ad1
Former-commit-id: ab857adda8
2013-09-26 15:18:42 -05:00
Mike Duff
12575e501a Issue #2410 - Fix loading of notification center's filter config file
Change-Id: I0bc9557d0eb0a8f5de40a45064cba031f7839fbd

Former-commit-id: d29beb9d8d [formerly 83064b2bd7 [formerly 96b4c904497ffc99d57949455b96025c658ae9c7]]
Former-commit-id: 83064b2bd7
Former-commit-id: a9ec223319
2013-09-26 15:08:30 -05:00
Richard Peter
9a4ac3be05 Merge "Issue #2412 - Fix problem loading config in dataset discovery browser" into development
Former-commit-id: 15866b434c [formerly 077703ddd8 [formerly 97e67fe192e23cc11a05f9db69455b88c7a6fa5d]]
Former-commit-id: 077703ddd8
Former-commit-id: 7bcf34a67f
2013-09-26 14:56:11 -05:00
Richard Peter
4b5d2ebe33 Merge "Issue #2409 - Add widget disposed check" into development
Former-commit-id: 00e7a6fb16 [formerly 4a4f47e8d1 [formerly 3c3fa316eb073d685f471ebcc48d599b4013c2c4]]
Former-commit-id: 4a4f47e8d1
Former-commit-id: 5dd79b7d5e
2013-09-26 14:55:17 -05:00
Richard Peter
722d1c48e9 Merge "Issue #2408 - Add a restore hidden notification menu item to Notification center" into development
Former-commit-id: 614cde9ec7 [formerly f066cee72b [formerly fac0408066832cb82e8193e1151eb8c63f9131f8]]
Former-commit-id: f066cee72b
Former-commit-id: 24da2b9721
2013-09-26 14:55:01 -05:00
Richard Peter
b296af36fa Merge "Issue #2375 - Only display the configured number of messages in the notification center. Peer review comments" into development
Former-commit-id: a1a5ad148c [formerly f1b5b78165 [formerly c43fa953929a1da0eb0ed8523f5a9b85b4e4b981]]
Former-commit-id: f1b5b78165
Former-commit-id: fd6b01b653
2013-09-26 14:54:48 -05:00
Mike Duff
179d7c38ca Issue #2375 - Only display the configured number
of messages in the notification center.
Peer review comments

Change-Id: I17c1f0a2d2cf910a52a0bdb655d39a08e47494ea

Former-commit-id: 4ee719b32c [formerly 08078bbd54 [formerly f4ac1c5a665346641cc9fcffa67aed522b1967e3]]
Former-commit-id: 08078bbd54
Former-commit-id: dfd23d61fb
2013-09-26 11:23:12 -05:00
Dave Hladky
dd6074c6dc Issue #2386 Backend work for adding multiple types to Subscription overlap rules
Change-Id: I0779dc7987031999b80ab0859c7f33dca20a5c17

Former-commit-id: e29d10ba4f [formerly d34882eb49 [formerly 449c584afc46257671808b921847a621e7020bcf]]
Former-commit-id: d34882eb49
Former-commit-id: b9f8daf751
2013-09-26 11:12:00 -05:00
Mike Duff
b3bdf87b90 Issue #2412 - Fix problem loading config in dataset discovery browser
Change-Id: I765ec92e587aa4772af1ac170be32395e698beef

Former-commit-id: d66d30ba32 [formerly b20e7e3386 [formerly c478a13d2740e7ad97e02be81233bd8a2fd0dd3e]]
Former-commit-id: b20e7e3386
Former-commit-id: 4745867a18
2013-09-26 09:02:41 -05:00
Mike Duff
724e262578 Issue #2409 - Add widget disposed check
Change-Id: Idd73e96d7704184392eb6297b87957126a286a72

Former-commit-id: d3ade70500 [formerly 18791bc1e8 [formerly 6b3df536a3052028c72841e22b65c381fd070742]]
Former-commit-id: 18791bc1e8
Former-commit-id: c36d6b4670
2013-09-25 16:37:18 -05:00
Mike Duff
a1f9140aa8 Issue #2408 - Add a restore hidden notification menu item to Notification center
Change-Id: If72e2d855b6fc91a8da67294a5436f73b69210a0

Former-commit-id: fead9cffe5 [formerly eabd212954 [formerly 6ece820f9e38fe1e7ccb55b83afca04e7e0d989f]]
Former-commit-id: eabd212954
Former-commit-id: b714451d68
2013-09-25 16:24:26 -05:00
Dave Hladky
64e7bb72c0 Issue #2246 Set the frameoffset to +- 5 mins
Former-commit-id: 34f3bbe3e7 [formerly bdcb623285 [formerly 4fbc811cd469775cdfc75c8b678abbf1c36effea]]
Former-commit-id: bdcb623285
Former-commit-id: 0facbdd9e5
2013-09-23 11:04:41 -05:00
Richard Peter
b1719cf32b Merge "Issue #2391 - Add Data Delivery to product browser. Peer review comments" into development
Former-commit-id: 2c9c5e3597 [formerly 8d3e7e1ace [formerly 683c87e0bfa87c9b7d8ad72e29ba72f581acf92d]]
Former-commit-id: 8d3e7e1ace
Former-commit-id: 41529c1202
2013-09-20 12:19:34 -05:00
Mike Duff
d2297e4b54 Issue #2391 - Add Data Delivery to product browser.
Peer review comments

Change-Id: Iffbedf518b2867533592b90bc993bce8f3df91fc

Former-commit-id: 6320aa3238 [formerly 1a1f06defc [formerly 5b393ffd7873116f665917286d127db4a76d9fb3]]
Former-commit-id: 1a1f06defc
Former-commit-id: f878c1c78c
2013-09-20 08:38:35 -05:00
Brad Gonzales
b1ea0a3f5c Issue #2383 Updates to fix issues with adhoc point queries and bandwith manager tests.
Amend:  Reverted BandwidthDaoUtil.setAdhocMostRecentUrlAndTime to Dave's fixes, with one
        minor change.  Added additional handling to start and end bucket calculation in
        InMemoryBandwidthBucketDao.  Addtional logging.  Removed exception logging of
        subscriptions.

Change-Id: Ie51c0accd7f39d31379e49e97542bae75bde5a1c

Former-commit-id: d597d7f653 [formerly c81825ce57 [formerly 148cc6d96ed17127590827d166325c4748384689]]
Former-commit-id: c81825ce57
Former-commit-id: b5669581d8
2013-09-19 12:54:31 -05:00
Mike Duff
d48f83030b Issue #2375 - update notification config dialog
Peer review comments.

Change-Id: Idf4fa753df71ed5cd482ceb22f5b8851fbb1a716

Former-commit-id: dd361ff1f1 [formerly 046d98b5e7 [formerly ec7e3683dd59401ff7365fb3095e5b695c2ba9ee]]
Former-commit-id: 046d98b5e7
Former-commit-id: 945ceae14a
2013-09-17 08:13:08 -05:00
Max Schenkelberg
84377d3e8c Issue #2277 Remove more ScriptCreator references
Change-Id: I8524faa9914c81afb7ace709b857bca2ef7ff747

Former-commit-id: 63e90f6955 [formerly 17b38d9f72 [formerly 0d898da3aebc056c372c7785538b0b27e3e986ef]]
Former-commit-id: 17b38d9f72
Former-commit-id: 487775918d
2013-09-11 16:32:00 -05:00
Nate Jensen
915b198377 Merge "Issue #2351 Fixed bugs in Bandwidth and adhoc pointdata flow Change-Id: I6510f8bd685033627b4cdfa53c6269aeee21a4d6" into dd_pre_release_2.1
Former-commit-id: 98c4525dab [formerly 2696f8bc3b [formerly 9cbd8325e0225e1523e0cba20c3c08ded3beb32c]]
Former-commit-id: 2696f8bc3b
Former-commit-id: 5058c9cb9c
2013-09-11 14:57:28 -05:00
Dave Hladky
fc52c485b9 Issue #2351 Fixed bugs in Bandwidth and adhoc pointdata flow
Change-Id: I6510f8bd685033627b4cdfa53c6269aeee21a4d6

Former-commit-id: 32492e2fc7 [formerly f0cd59589b [formerly 5013a3b61bcc0a1533211e047d780e5a7ecacb08]]
Former-commit-id: f0cd59589b
Former-commit-id: cedbfc69b7
2013-09-11 13:28:51 -05:00
Nate Jensen
790542df2a Merge "Issue #2180 - handle delete of credentials" into dd_pre_release_2.1
Former-commit-id: b371d6ed2a [formerly 92233a3f3a [formerly 07a5e7a9826935e7e3e724e648ce931faf0da62e]]
Former-commit-id: 92233a3f3a
Former-commit-id: b40157ac97
2013-09-11 13:00:03 -05:00
Mike Duff
f3717d0040 Issue #2180 - handle delete of credentials
Change-Id: Ie8f1cdba92df03d94a4d7b009b8330eced10e036

Former-commit-id: aaf7a3778f [formerly 0d602a6c3f [formerly 1dfcfc80308a182f0f21f028e19285fa39c53d6e]]
Former-commit-id: 0d602a6c3f
Former-commit-id: 43583eeaae
2013-09-11 12:08:12 -05:00
Mike Duff
f20e2d7255 Issue #2352 - Data Browser Must Check For Subscriptions Belonging to the Local Site
Change-Id: I23392906a7d829852af2991dd096d4b5e76765aa

Former-commit-id: b8d2c6cffc [formerly 89342e59b9 [formerly 5b4c9794eb396f02cdf024d2df2089add4719910]]
Former-commit-id: 89342e59b9
Former-commit-id: b569410bc4
2013-09-11 09:47:04 -05:00
Richard Peter
e99cf81ab8 Merge "Issue #2330 SubscriptionManagerAction.execute now filters subscriptions by current site id." into dd_pre_release_2.1
Former-commit-id: a149d485dd [formerly 4dcc55b0c3 [formerly 9cdf94f6651d4e84af65738aaf577713fb717d95]]
Former-commit-id: 4dcc55b0c3
Former-commit-id: e65a557536
2013-09-05 16:40:30 -05:00
Richard Peter
3d31e662db Merge "Issue #2335 - Implement adhoc point queries" into dd_pre_release_2.1
Former-commit-id: fa09f2a97f [formerly a6652b28f5 [formerly b21e918baf426f02947dcc98e33478018dcfe789]]
Former-commit-id: a6652b28f5
Former-commit-id: 76316ae998
2013-09-05 16:39:53 -05:00
Brad Gonzales
df86ac5a44 Issue #2330 SubscriptionManagerAction.execute now filters subscriptions by current site id.
Change-Id: I4572837369088bcc1ee0bb4d5fb2349162f386b2

Former-commit-id: 0f12e60d65 [formerly 2ebe39ea37 [formerly 92386c72ba9e7ef3ee0c64caa8b369c23b0367eb]]
Former-commit-id: 2ebe39ea37
Former-commit-id: 96b3794c45
2013-09-05 16:30:15 -05:00
Richard Peter
52522da59b Merge "Issue #2314 - Fix for notification center's filtering." into dd_pre_release_2.1
Former-commit-id: 5127bb9485 [formerly a64552274c [formerly fa034b944ece4587ad74adf430751faa6e32eb36]]
Former-commit-id: a64552274c
Former-commit-id: 2d1c0c1688
2013-09-05 16:26:48 -05:00
Mike Duff
1cc61d9e3f Issue #2314 - Fix for notification center's filtering.
Change-Id: I404c5c79f642908ff8c48cba23b269af9a4dc3f6

Former-commit-id: 37896c4b81 [formerly 0ad77d7f3c [formerly 307c3cbca9732a534448eb40c4bff03573e4a975]]
Former-commit-id: 0ad77d7f3c
Former-commit-id: bfc8669f17
2013-09-05 15:04:23 -05:00
Mike Duff
e0b2c5f252 Issue #2335 - Implement adhoc point queries
Change-Id: I8d5f6017ee79c5aeb1769797c679688afef71259

Former-commit-id: 05170ee93f [formerly b7e284b810 [formerly ee8fab4cffe5ef010c9a0296d1098ede9ba6b0c9]]
Former-commit-id: b7e284b810
Former-commit-id: 1c014081a2
2013-09-05 14:48:31 -05:00
Mike Duff
085b462d2a Issue #2314 - Additional non-blocking cleanup
Change-Id: Ibe1db684c2883fcef8b99e55c0906f9244600c9c

Former-commit-id: 72d53a9b6f [formerly 00ba49547d [formerly b66e49222f7ee12bd6216fc944370dff9a60769d]]
Former-commit-id: 00ba49547d
Former-commit-id: e8a6a0ea14
2013-09-05 07:47:15 -05:00