Commit graph

2723 commits

Author SHA1 Message Date
Mike Duff
229efa7c5b Issue #2677 - Don't do overlap checks when updating subs to deactivated.
Change-Id: Ia974111d9810f27ef2b073304cd248de292275bd

Former-commit-id: 3691146e34 [formerly bafe19bbd5] [formerly 101c08818d] [formerly 6b01c2957f [formerly 101c08818d [formerly 2e406f02b0abbdeee0f553df430f5a58977d9af2]]]
Former-commit-id: 6b01c2957f
Former-commit-id: c5c924842a196e06e1a50bd0c39e0bc05f4fb139 [formerly 6a2f75e8d5]
Former-commit-id: 9edf591218
2014-02-05 16:08:01 -06:00
Ben Steffensmeier
3a13cfcb78 Issue #2672 Handle envelopes in data access requests of gridded types.
Change-Id: I4a58e6489e2173457d50e6f3c06e2e8fffdb678c

Former-commit-id: f3eebf56f5 [formerly b84bf8c891] [formerly 9c439866d5] [formerly dc5b5526a3 [formerly 9c439866d5 [formerly f634fe40e6fa7a8a3af575e79cb3d996761db983]]]
Former-commit-id: dc5b5526a3
Former-commit-id: 30d66ecdaa170e8c1d59f0f680338dc3d3185bbd [formerly 02a0874646]
Former-commit-id: 5b7cf3caec
2014-02-05 15:57:08 -06:00
Brian.Dyke
d274021768 Issue #124
Former-commit-id: 6d35a4b1bc [formerly 3ba93b175e] [formerly 439f053309] [formerly 0cc11ddfd3 [formerly 439f053309 [formerly e192f01952d7779f03db819c0a04aa7f6cd0c88e]]]
Former-commit-id: 0cc11ddfd3
Former-commit-id: 1e605ca4a47aef453131de36960bb5a057128099 [formerly 90b4e7ebf0]
Former-commit-id: e1d788683d
2014-02-04 16:56:47 -05:00
Brian.Dyke
8e78870c71 Issue #83
Former-commit-id: 89422cef7c [formerly f2e56b268c] [formerly 484119f6b0] [formerly fb15dd5dfb [formerly 484119f6b0 [formerly 93c3c9057bc68d7a4c436d433a629200663d9eeb]]]
Former-commit-id: fb15dd5dfb
Former-commit-id: 75d1cbbdb2e42e3d0ad9d5112f388174acbf50f1 [formerly f088dab5ef]
Former-commit-id: 3c160bb05e
2014-02-04 16:32:42 -05:00
Slav Korolev
0ebbffc8fc Issue #2757. Added filter for removed stations and cleaned code.
Change-Id: I9998cf3bd20b2ec43956284257ee3dfcb8b52534

Former-commit-id: 91972c1b42 [formerly cbd17ea025] [formerly c7c40a3467] [formerly fa59172d87 [formerly c7c40a3467 [formerly b613a9d5b7e9b1c17fa354c9c6b617da040d1d71]]]
Former-commit-id: fa59172d87
Former-commit-id: 9e17821f974894adbc9405dc7e9472062b30ba3c [formerly 4ec22d9530]
Former-commit-id: aea166d7b9
2014-02-04 15:21:22 -05:00
Mike Duff
e1023f0bc4 Issue #2722 - Add auto refresh to sub manager dialog
Former-commit-id: 8d92217e94 [formerly 227eb23157] [formerly 04ee397f2b] [formerly ab9621698f [formerly 04ee397f2b [formerly f678a39b37040bd637cf210f73aaef0841bda36e]]]
Former-commit-id: ab9621698f
Former-commit-id: 81c8a2b9d2b37711be589b2c809d03532ae8c45f [formerly e984863c1c]
Former-commit-id: f7566298b2
2014-02-04 12:45:33 -06:00
Brian.Dyke
6e66bb7b6e 14.1.1-17 baseline
Former-commit-id: 4c6eb0c001 [formerly f3d34b0c38] [formerly 180d1356cd] [formerly 23280af290 [formerly 180d1356cd [formerly 810229668fd7ff81b5c426161d496fc62e24b75c]]]
Former-commit-id: 23280af290
Former-commit-id: 50e190ed8cb3b89c055f33e543707eeb6346818a [formerly 947ec5fd96]
Former-commit-id: f1cc9d6ee2
2014-02-04 12:33:46 -05:00
Brian Clements
876b60e15d Issue #2699 fixed assumption that usersearch was exact
usersearch returns matches for any part of string
added method to restrict to exact matches only


Former-commit-id: ddbfe9a763 [formerly bebd62c6b6] [formerly cfa3c9e0e8] [formerly 6ea009a2e1 [formerly cfa3c9e0e8 [formerly 74daa7109149073c615d13c25092f6d08a77b936]]]
Former-commit-id: 6ea009a2e1
Former-commit-id: 32509d9365c50f4522e4f0eb5ec73059ee0d9acf [formerly aff354a3d7]
Former-commit-id: bc75d43bc3
2014-02-03 15:34:58 -06:00
Lee Venable
803102f8b3 Merge "Issue #2757. Fixed issues in Area Configuration Dialogs." into development
Former-commit-id: 39021a203a [formerly 72a4a12e89] [formerly 19b883a407] [formerly c44b120176 [formerly 19b883a407 [formerly ecb833d823cf072f4e02b312fe320c2ade5162a2]]]
Former-commit-id: c44b120176
Former-commit-id: d7c9c51cbb759b4283d0b5b2756b8b47c1ba7581 [formerly 15f94a61b5]
Former-commit-id: 3e3805e1a7
2014-02-03 14:31:28 -06:00
Ben Steffensmeier
a63cd52b14 Issue #2764 Ensure GFEGridResource gets added to procedure xml context, fix gridded displays work for all float buffers.
Change-Id: I50ff9be715357b6719d083de411f31c1a3e05834

Former-commit-id: fc0d044bd9 [formerly 921401ffe9] [formerly 8865177c6b] [formerly 97a64f89f1 [formerly 8865177c6b [formerly 10d1070016b9a8a960f15e5dcf316d4f2aee5e90]]]
Former-commit-id: 97a64f89f1
Former-commit-id: e17a311de5c08292ece4f9c8f0ed3adc52531127 [formerly 2be72739b5]
Former-commit-id: 1f34342948
2014-02-03 14:07:07 -06:00
Brian Clements
c6287ecffc Issue #2699 added handle config to prefs
default handle autofills session dialogs
is also used to connect to feed venue (error popup if already taken)


Former-commit-id: 83d6ca0855 [formerly 21c75d1d01] [formerly 1ff4ed1ae9] [formerly 16c1aaed3e [formerly 1ff4ed1ae9 [formerly f10f42753c541d4003b4c67a84a1d50e033941d3]]]
Former-commit-id: 16c1aaed3e
Former-commit-id: a84830a2b6c074a8c5eb328da49682053240a4cd [formerly 7c867338c8]
Former-commit-id: 2f60d1b579
2014-02-03 12:59:57 -06:00
Everett Kladstrup
2c8d0df351 Issue #2725 deriv param to common stage 1
* Removing viz dependencys from derivparam
** Move LevelUtilities to common
** Use spring instead of eclipse plugin extentions
   to configure derived parameter function types
** Use RequestRouter instead of ThriftClient so
   we can use IServerRequest objects in both CAVE
   and EDEX

The next stage will be to clean up exceptions in
derived parameters to stop using VizException and
VizCommunicationException.


Former-commit-id: aac0fd726e [formerly 90df04614d] [formerly bd50a38d87] [formerly 80ad25754b [formerly bd50a38d87 [formerly 604ae156f8b235e2e1736863b419547289403240]]]
Former-commit-id: 80ad25754b
Former-commit-id: 9e9dc4b990dced62032e88e880c8fd835938b081 [formerly 415ccd78fb]
Former-commit-id: 40b796f59b
2014-02-03 09:02:58 -06:00
Slav Korolev
f6ea436e80 Issue #2757. Fixed issues in Area Configuration Dialogs.
Change-Id: Ic3d3d5c41df6c8d80aac8e434e4c42a5ef9d1ecf

Former-commit-id: 7b3702c186 [formerly 6013121a99] [formerly ea573d2c30] [formerly a768f540f0 [formerly ea573d2c30 [formerly 81826338bda946aff4ac8a7b9ea83c2eb72397d5]]]
Former-commit-id: a768f540f0
Former-commit-id: a981a42007f76a4e25e017ce265ad6fb22a436d4 [formerly 6d9a066c36]
Former-commit-id: d2d4672a46
2014-02-03 09:50:01 -05:00
Brian Clements
7678703ae0 Issue #2700 fixed subscribe back after contact request accept
we were sending the wrong presence type when accepting request
pidgin handled it, but it wasn't to the spec
fixed by adding contact to roster if not already a friend
request authorization dialog doesn't prompt for group if they are already in one


Former-commit-id: dc59e8fa2d [formerly 7176bf59b8] [formerly b88eaeb73e] [formerly b0402be1d3 [formerly b88eaeb73e [formerly 4d860337ea821975b6ddb4846f102199347a4dcc]]]
Former-commit-id: b0402be1d3
Former-commit-id: 49b91dbbac727f3af22f35a351ce544d8ce31b75 [formerly b651ada4b3]
Former-commit-id: 9210aae10a
2014-01-31 13:10:35 -06:00
Nate Jensen
3b3a81cd6c Merge "Issue #2312 Java 6 compatibility, fix legend menus." into development
Former-commit-id: 1b845abe22 [formerly 6112fd394c] [formerly 62f86b0a02] [formerly 0f1f50650c [formerly 62f86b0a02 [formerly 4bd377297daea932f4907f7119208461f7f79281]]]
Former-commit-id: 0f1f50650c
Former-commit-id: a28fee8e461c42c0c9bc7679d076645e9c166a04 [formerly 22190c55f0]
Former-commit-id: 38eb172fce
2014-01-31 12:00:00 -06:00
Nate Jensen
d88b53e706 Merge "Issue #2698 added handles to venues" into development
Former-commit-id: d83c0b2e99 [formerly 003e6bf0d2] [formerly 4a3c89c722] [formerly 50da1236dd [formerly 4a3c89c722 [formerly 0e6750826ed7f36e92a6cd451138bc3562149aad]]]
Former-commit-id: 50da1236dd
Former-commit-id: a5eb54ad3b3116ec0f71ceca98c9089c2ece8ef2 [formerly 87d49a2b1c]
Former-commit-id: 49410a7e53
2014-01-31 11:59:34 -06:00
Brian Clements
35b53a61cd Issue #2698 added handles to venues
venues now handle identity differently with VenueParticipant instead of UserId
fixed alias bug due to roster entry change


Former-commit-id: bd410b2529 [formerly 4e2cb3f7ae] [formerly 3e585945d6] [formerly 3250eb34f5 [formerly 3e585945d6 [formerly 9a8b011683ffe7194c48b1827d3a4f0ddf4f9627]]]
Former-commit-id: 3250eb34f5
Former-commit-id: 15ea8433323667869df6df396f6377d11f2a7079 [formerly 4f4d5c5d69]
Former-commit-id: 4190b13ae2
2014-01-31 09:44:31 -06:00
Bryan Kowal
6c7b44fc8a Issue #2754 - fix ant xpath error; gfe is now dependent on kml (unrelated to this change)
Former-commit-id: 0e89136215 [formerly 6e19ac4acf] [formerly 6fd129379f] [formerly 678fb83ded [formerly 6fd129379f [formerly e027cf42b3b395a834f91512e269e41377f673ef]]]
Former-commit-id: 678fb83ded
Former-commit-id: 2b74f17b03d7ffc9219150c073ed97847f0ecc59 [formerly 77370b4e68]
Former-commit-id: 9ef27edf5f
2014-01-30 18:11:48 -06:00
Ben Steffensmeier
e8493ada37 Issue #2312 Java 6 compatibility, fix legend menus.
Former-commit-id: 17e58bb339 [formerly 27fbb0f870] [formerly 7ab61aaa23] [formerly fe5f0118da [formerly 7ab61aaa23 [formerly 2853536477d39459de3cbb4eef7670734cfad5f8]]]
Former-commit-id: fe5f0118da
Former-commit-id: 7002ef6a0a422a4b9670a1e79551716f01ec90da [formerly e4232ce9a7]
Former-commit-id: 1f23bb4cf7
2014-01-30 16:12:10 -06:00
Bryan Kowal
116f872261 Issue #2754 - now more accomodative for the com.raytheon.uf.viz.application.feature feature dependency
Former-commit-id: 54d0d4fd55 [formerly 635548dae3] [formerly d88019d902] [formerly ee95e4de7e [formerly d88019d902 [formerly 5e007018d1cd6064ba114d92d3943e23d8c3e17e]]]
Former-commit-id: ee95e4de7e
Former-commit-id: 1e726cd962bdd3d3452656fcf23cec9c7816c5da [formerly bd88b563fe]
Former-commit-id: 89e0e847c9
2014-01-29 14:25:38 -06:00
Ron Anderson
da9d8b55d6 Merge "Issue #2703 Hook GFEResource into KML Export. Change-Id: I3baeb829dec4fa650fa9cb86e4fe602b6ad47963" into development
Former-commit-id: a0e9e35891 [formerly d0e821e5d1] [formerly 61f35e86ec] [formerly f4f89c79a2 [formerly 61f35e86ec [formerly a3ea22b1db8418f5367b6ffa029f9aa159003398]]]
Former-commit-id: f4f89c79a2
Former-commit-id: c22c542a86577176c89c23cb7f84b62f159a84e7 [formerly 2e9389293a]
Former-commit-id: ff65b54555
2014-01-29 14:24:26 -06:00
Nate Jensen
075b8776da Merge "Issue #2698 made sessions private and invite only" into development
Former-commit-id: ab82a7fdb2 [formerly 1977b026ee] [formerly 52c3b71049] [formerly 004999bbec [formerly 52c3b71049 [formerly db4447bf109981ded541bff929687040cc28953a]]]
Former-commit-id: 004999bbec
Former-commit-id: bdc44ee479d463d8e50545c6697f7891ded78ee9 [formerly 0a7961457e]
Former-commit-id: bcf82eb692
2014-01-29 11:01:45 -06:00
Brian Clements
a225d12692 Issue #2698 made sessions private and invite only
removed venue info because you can't get it for private rooms
improved error handling for existing room when attempting to create
fixed default compression config


Former-commit-id: 190400fc34 [formerly 1f1be20d41] [formerly c498307b30] [formerly 5b9f694930 [formerly c498307b30 [formerly 850cbc03ebea6f26ac7095abffe7729985c426c4]]]
Former-commit-id: 5b9f694930
Former-commit-id: ceb8a89c7f4c8cc41774e50c75969cbdacc6d919 [formerly 4a0682a9e8]
Former-commit-id: 07452b7778
2014-01-29 10:16:15 -06:00
Max Schenkelberg
b495451e3f Issue #2680 Fixed various OpenGL errors
Change-Id: I7ed70adcb1591a9feb66a4fe80c3249f2e6b339b
(cherry picked from commit 431ffa97ae4b1c9159c4607e51dbed23c77b76d2 [formerly f4765d1577] [formerly 037cd48c62 [formerly 5d488d27b9] [formerly 83c600ada9] [formerly f4765d1577 [formerly 83c600ada9 [formerly 59d4c2b9965a7c208863af8f5a3ba4145ea2bbf4]]]])

Former-commit-id: b63edcc8a7 [formerly 122c3442f8] [formerly 0c840cf724] [formerly d566ed9927 [formerly 0c840cf724 [formerly 6c3817256b4cf6b5deca8d73d0df1d1f89b4ea82]]]
Former-commit-id: d566ed9927
Former-commit-id: 5c9afda4f5c9656fe346333485798a21a785033b [formerly f5ff746126]
Former-commit-id: e1717b2729
2014-01-29 10:15:38 -06:00
Steve Harris
cdb99cc3e0 Merge branch 'omaha_14.2.1' into development
Conflicts:
	cave/com.raytheon.uf.viz.application/src/com/raytheon/uf/viz/application/VizApplication.java

Former-commit-id: f562540e7c [formerly 14ba3b29f4] [formerly 1738185503] [formerly 1aea63a1f6 [formerly 1738185503 [formerly d1fb8bcf1780b94bf23ce60dc4a6e0a10b37fe45]]]
Former-commit-id: 1aea63a1f6
Former-commit-id: 5d9047e5063900e85cef179c5be76057b8ca6cd1 [formerly 1fd5b2255f]
Former-commit-id: d9cd003a5a
2014-01-29 09:41:57 -06:00
Greg Armendariz
fc4ce60ce6 Issue #2754 - Remove extra character
Former-commit-id: ddf3e9785f [formerly 6ff868a167] [formerly 9cc089b369] [formerly 1017abdc78 [formerly 9cc089b369 [formerly 5979ad555987210e07e32eb5336e7cb427ac06c3]]]
Former-commit-id: 1017abdc78
Former-commit-id: 36e64f6fb42a953ef4b064e4d83069bf3fb501c5 [formerly a8c75ce81e]
Former-commit-id: 4e092b5810
2014-01-29 08:43:09 -06:00
Brian Clements
a2cc9001ae Issue #2700 added contact request dialog
user is now prompted to accept contact request
added support for managing contacts that haven't accepted contact requests
contacts list shows new icon for contacts that haven't accepted contact requests


Former-commit-id: aa642d5577 [formerly b4d930bcb9] [formerly 6b1843f19a] [formerly bd19366ada [formerly 6b1843f19a [formerly 8ad4c1674d2719a7781eb137669eb15212a1488c]]]
Former-commit-id: bd19366ada
Former-commit-id: aa6da3ca1e9307689f8365bc7178e584cb7032e6 [formerly f22052321b]
Former-commit-id: bffa4d84fe
2014-01-28 10:07:11 -06:00
Richard Peter
6f92dc558e Merge "Issue #2711 Get All levels from the database for derived parameters." into development
Former-commit-id: ec60bff55c [formerly 766af8b281] [formerly 90dd7474b3] [formerly 5c1de78c24 [formerly 90dd7474b3 [formerly b238a853283cc1b71ce290b233db5f174e486c9f]]]
Former-commit-id: 5c1de78c24
Former-commit-id: 7f369638f9405f8d6174043e99a8d04a40fd4196 [formerly e9bc96c37e]
Former-commit-id: 953925d24b
2014-01-27 11:36:55 -06:00
Ben Steffensmeier
cdcd7dbe93 Issue #2711 Get All levels from the database for derived parameters.
Former-commit-id: bd5bb4eca1 [formerly fdb67f9979] [formerly 08d277fe62] [formerly 3ca92176ac [formerly 08d277fe62 [formerly 0b36f91188c458532eb26d8b4a01e7f8954eba5a]]]
Former-commit-id: 3ca92176ac
Former-commit-id: 0fdc05342c87ce2c1bf8e4756cf8cd0f8acd2da5 [formerly bedec49852]
Former-commit-id: c42af67f51
2014-01-27 11:12:08 -06:00
Brian Clements
e2ca671173 Issue #2701 removed local groups from collaboration
added shared groups to represent groups managed by server
local group actions changed to modify roster groups
code cleanup on contacts manager including removing unneeded roster manager
update script to clean up localization files
removed ui option to create an empty group


Former-commit-id: fffb6aaf9a [formerly b86ad8ca6f] [formerly f615f2226f] [formerly 26ac549096 [formerly f615f2226f [formerly 06a9db4836fa2753a913e2314a8c003380416eac]]]
Former-commit-id: 26ac549096
Former-commit-id: beabd84fb816fcf8a5201927f1389915efb941f7 [formerly 8944860cbb]
Former-commit-id: cfe945d76b
2014-01-27 10:14:10 -06:00
Mike Duff
07fb9b74d5 Issue #2459 - Last change from unscheduled to deactivated.
Former-commit-id: 9a0665ccc8 [formerly 3766f6a0f4] [formerly e46c226489] [formerly 81aa9ce0cb [formerly e46c226489 [formerly 09494558cae046e97ff2126673c5a5c4fd1f0105]]]
Former-commit-id: 81aa9ce0cb
Former-commit-id: 36d2c58bed76ee7aef5431b41fe9592aebf50dc7 [formerly 5fc96739b9]
Former-commit-id: ef5d3f370c
2014-01-26 18:57:26 -06:00
Mike Duff
3e4b74c79d Issue #2452 - Changed label based on feedback.
Former-commit-id: bb8b6eea5f [formerly fb6194c464] [formerly 1da1285311] [formerly 6dcd1a7969 [formerly 1da1285311 [formerly dd74aef827f0892c64a7efd60b0edd1156ef31ec]]]
Former-commit-id: 6dcd1a7969
Former-commit-id: 28722ea6fd1407967384474a85ef503f13c4099c [formerly be59be53d4]
Former-commit-id: eaaab3b082
2014-01-25 14:41:20 -06:00
Nate Jensen
a773aec724 Issue #2359 printout shutdown of application to try and detect kills
Change-Id: I113890428cfd5a22c2fbb0a4abdcff18a4ccd11e

Former-commit-id: 567a18dab4 [formerly f5ce7b485d] [formerly 47d6e5b54f] [formerly cdbd05b293 [formerly 47d6e5b54f [formerly 34b2c7a402bcf7f3b04ea1e98090f7e0df48566f]]]
Former-commit-id: cdbd05b293
Former-commit-id: 53e2e8b666941bdcfe30a8f595600e7f0cdd6072 [formerly 7dd0b1c978]
Former-commit-id: e6e9cab9f9
2014-01-23 19:02:37 -06:00
Ben Steffensmeier
467cd5a9f2 Issue #2703 Hook GFEResource into KML Export.
Change-Id: I3baeb829dec4fa650fa9cb86e4fe602b6ad47963

Former-commit-id: 39fae5c109 [formerly 48bb8a59a1] [formerly 1897336455] [formerly 7b1245b0cf [formerly 1897336455 [formerly 547e9ac7212b5a9842d064d5669772e8e50a4828]]]
Former-commit-id: 7b1245b0cf
Former-commit-id: a5d0c33c597d28090b6fd7ad4486e862006ffc35 [formerly 76e76198d6]
Former-commit-id: c9a89659c3
2014-01-23 18:43:14 -06:00
Ben Steffensmeier
3f053ee508 Issue #2363 Add General implementation od IColormapShadedShapeExtension so that all targets will be able to render filled wind barbs.
Former-commit-id: 33bf8e9c44 [formerly 9c65c5b07b] [formerly 6aa6683258] [formerly a92f6e9bb6 [formerly 6aa6683258 [formerly e214a045c4d45532ed80fb4cdd51355c7884a2ee]]]
Former-commit-id: a92f6e9bb6
Former-commit-id: beeaf72ec6549c4e1072090e287697ca2d2233bf [formerly b90004e46a]
Former-commit-id: 9b788b49b0
2014-01-23 12:41:16 -06:00
Nate Jensen
de36a7461e Merge "Issue #2667 added bin lightning data access factory" into development
Former-commit-id: 5e51b08ed3 [formerly 922cd8c3a2] [formerly 27b07e27f1] [formerly db10439844 [formerly 27b07e27f1 [formerly beede8dc30f5497c5769f78a46642d31c4b61cb0]]]
Former-commit-id: db10439844
Former-commit-id: 0605b72d3eccc8caa7656d9bed868a3e2fc82a0e [formerly 00bfd9d5bb]
Former-commit-id: 423e8f7fb5
2014-01-23 10:32:17 -06:00
Brian Clements
5bc0ffe4af Issue #2667 added bin lightning data access factory
renamed lightning record's lightSource field to source
added delta script for db column change
added attribute method comments for IData and DefaultGeometryData


Former-commit-id: ff97757a38 [formerly 54516275f1] [formerly 4758c9d3d29a5bd3ccc2e5af4b1bb418e31992c3 [formerly 402bef9c5b]] [formerly bd9fbc5f38 [formerly 402bef9c5b [formerly b6c50729919ea8a9b29ca963e18f68268c3a0b7f]]]
Former-commit-id: bd9fbc5f38
Former-commit-id: 72626aac11a4c66833f161115fc8c8d2adc2b74c [formerly 83ed9dc04d]
Former-commit-id: 265137fd91
2014-01-23 09:32:18 -06:00
Ben Steffensmeier
5298304b65 Issue #2312 Add extra frame selection option to GFE image export.
Change-Id: Ic62448c703e59a5318f361e141de7ffb65055f74

Former-commit-id: 744d199be6 [formerly 3196471d18] [formerly 81b38e2ddf] [formerly 4f9e60c658 [formerly 81b38e2ddf [formerly cb4db2bfd5a659c59d5c5e450c92207b3a81088c]]]
Former-commit-id: 4f9e60c658
Former-commit-id: 9c47a4b5169c16e1c59ee4226a6eab5b09ec5636 [formerly 85eb694b23]
Former-commit-id: 831d904de2
2014-01-22 16:53:04 -06:00
Ben Steffensmeier
159642b200 Issue #2602 Don't try to load classes from uninstalled bundles.
Former-commit-id: f1de2aaded [formerly c7357863b9] [formerly 0c4fc0dd01] [formerly 3187754736 [formerly 0c4fc0dd01 [formerly 30ca0135046851884e4a07b36559fce086ccd3f2]]]
Former-commit-id: 3187754736
Former-commit-id: 983c7624df570de47db5a313760f0b69fec21954 [formerly d1dbd0c9b6]
Former-commit-id: 32bac228db
2014-01-22 15:46:51 -06:00
Nate Jensen
438afc8ddf Merge "Issue #2312 Add ability to export gif and image export dialog. Change-Id: I10aaeba20a4acc7888cd566107ffff3e6a4fad05" into development
Former-commit-id: b8fd9afeca [formerly 1f5a26dc30] [formerly e2f9e86659] [formerly 738c70e8ea [formerly e2f9e86659 [formerly 8c8215778f5e37dfa4ec2df000db90f1193107ac]]]
Former-commit-id: 738c70e8ea
Former-commit-id: f1d07570e73e9dfb9bf87e2e898ca0f0586aadff [formerly 10f9feddba]
Former-commit-id: 96ad72aa9e
2014-01-22 09:36:33 -06:00
Ben Steffensmeier
b7cdcc757c Issue #2312 Add ability to export gif and image export dialog.
Change-Id: I10aaeba20a4acc7888cd566107ffff3e6a4fad05

Former-commit-id: 7a8c934c5c [formerly b70faf1f7d] [formerly fc1c56f9cb] [formerly 4ad4b4a859 [formerly fc1c56f9cb [formerly e2159c422ca93aa76c6ba7a30a09234e8f9da4ce]]]
Former-commit-id: 4ad4b4a859
Former-commit-id: e898590f6488b3cb1f76a669ff09fbe8f3b22604 [formerly 8b2e5a06bc]
Former-commit-id: cd295e4172
2014-01-21 18:09:13 -06:00
Steve Harris
6cb92b1f57 Merge branch 'omaha_14.2.1' into development
Conflicts:
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/perspective/GFEPerspectiveManager.java
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/GeneralGridData.java
	cave/com.raytheon.viz.product.awips/awips.product
	edexOsgi/com.raytheon.uf.edex.plugin.fssobs/src/com/raytheon/uf/edex/plugin/fssobs/FSSObsUtils.java
	edexOsgi/com.raytheon.uf.edex.pointdata/src/com/raytheon/uf/edex/pointdata/PointDataPluginDao.java

Former-commit-id: 56f5ae9f48 [formerly a465718a0d] [formerly 24ab7cff49] [formerly 69dc3d835b [formerly 24ab7cff49 [formerly 2d255c9772a017e84b0d1b4b42cdc5de8fd53b90]]]
Former-commit-id: 69dc3d835b
Former-commit-id: 24faa7a52a1fc22725c96c64ac33b0850b177a02 [formerly 252c7ee40a]
Former-commit-id: b62efa9387
2014-01-21 12:36:54 -06:00
Mike Duff
7e3e76e9da Issue #2538 - Add AdhocSubscripionHander to SubscriptionHandler. Fix problem querying for adhoc subs.
Former-commit-id: 4038246f93 [formerly 9bd8e84b9f] [formerly bdf6a002f6] [formerly 9a2d2af4a9 [formerly bdf6a002f6 [formerly 5fc6b9fcc55b6e93c9837c7b99347df8f28fc90a]]]
Former-commit-id: 9a2d2af4a9
Former-commit-id: d100328be0c1140a5b43dcb2f41ad9e6ab41095e [formerly 9112366cae]
Former-commit-id: e929abf7d7
2014-01-20 17:44:02 -06:00
Lee Venable
b40ae43582 Merge "Issue #2291 - Fixed resizing of components." into omaha_14.2.1
Former-commit-id: c3022f8274 [formerly d825d627bd] [formerly b3928f4f49] [formerly dd12515ca2 [formerly b3928f4f49 [formerly 277513c8d810a3996d93fd04a5691eb730c78630]]]
Former-commit-id: dd12515ca2
Former-commit-id: 4206ad0dee836a41182154fcefd07a187f71acab [formerly 4e121d1261]
Former-commit-id: 82eafd385d
2014-01-20 17:32:38 -06:00
Nate Jensen
c2340dfd07 Merge "Issue #2717 Force use of legacy merge sort" into omaha_14.2.1
Former-commit-id: 55203d0486 [formerly c598185130] [formerly d78dbb85d5] [formerly 54262ad318 [formerly d78dbb85d5 [formerly 566d188782f5976d2a221b5a7ab162da3e8b36ca]]]
Former-commit-id: 54262ad318
Former-commit-id: 3b53bce38675c75e649c3c5c70ab3876d1503296 [formerly f13cb9ae26]
Former-commit-id: 5b84b27087
2014-01-20 17:32:15 -06:00
Lee Venable
9ecbd3bc7a Issue #2291 - Fixed resizing of components.
Former-commit-id: ea96ce87e9 [formerly 39e8124ef7] [formerly 1927ba49ea] [formerly d3eb6c16ec [formerly 1927ba49ea [formerly 9956936125611cd67aaaf6ba6e617e01b004a738]]]
Former-commit-id: d3eb6c16ec
Former-commit-id: 3951681cd94fb490f91e2f28a8cc25e01dca0872 [formerly b8520d1e12]
Former-commit-id: dad11aca88
2014-01-20 17:26:28 -06:00
Ron Anderson
9b8c8310ab Issue #2717 Force use of legacy merge sort
Change-Id: Ic37aa4af53f18cc1cbe9bd23420cb692dfa300d7

Former-commit-id: a481848c67 [formerly 34d1b95a79] [formerly de97ec032f] [formerly 66bbc99784 [formerly de97ec032f [formerly df2af35f3c54b30915cdb6ccebaa30c0e05c7725]]]
Former-commit-id: 66bbc99784
Former-commit-id: c83a8b6d3a8111365ba2ad52fdb151f0a5cec621 [formerly 61d8aec23c]
Former-commit-id: 0048ef6a96
2014-01-20 17:22:26 -06:00
Richard Peter
fa5e160245 Merge "Issue #2459 - Remove unscheduled status from UI" into omaha_14.2.1
Former-commit-id: 007de15a53 [formerly e6bc012925] [formerly 6b859c9a42] [formerly 29ba337367 [formerly 6b859c9a42 [formerly afdfd6b07687c9de20dad3f352db34fba6ade93c]]]
Former-commit-id: 29ba337367
Former-commit-id: 4d7e2eae126edb00fa4f829dd78950b4c1bcb955 [formerly 4887054146]
Former-commit-id: 4796beec29
2014-01-20 17:21:21 -06:00
Max Schenkelberg
33a28153bf Issue #2620 Fixed manifest issues for baseline p2 export
Change-Id: I79d64a0ff17e1b0d39e7ea6e690463968b92b9c3

Former-commit-id: 7073ea5e90 [formerly 1256748c42] [formerly 68aa666045] [formerly 87a6db7853 [formerly 68aa666045 [formerly aaf90365b8855551b0cc22a8a95ae7e0b55f52ff]]]
Former-commit-id: 87a6db7853
Former-commit-id: d89b6e6e6de809f0a3a0a97dbbdaa5ada41e70fd [formerly 2574685291]
Former-commit-id: 424f2282f0
2014-01-20 13:54:27 -06:00
Steve Harris
9843517cb3 Merge branch 'master_14.2.1' into omaha_14.2.1
Conflicts:
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/IFPGridDatabase.java

Former-commit-id: 002b2492ac [formerly 5fcccbff1b] [formerly 454d557884] [formerly 9371eeeee0 [formerly 454d557884 [formerly cf9f10b2e5a4038dce0003a1c0a4f227335d5db4]]]
Former-commit-id: 9371eeeee0
Former-commit-id: 54d4fab62b427e6be3f978f3502c7e059e776520 [formerly 0ba307d616]
Former-commit-id: 7ea285c48b
2014-01-20 10:17:44 -06:00