Commit graph

1037 commits

Author SHA1 Message Date
Nate Jensen
8625a90436 Issue #427 fix non-collaboration sessions
Change-Id: I5f39311d65c16a097692a76e087598d577fe7a4b

Former-commit-id: fa0f61a85e [formerly b8cec96f21 [formerly 607ec4474b96f9670c53ba69295fa66a2880ff7e]]
Former-commit-id: b8cec96f21
Former-commit-id: 58633e1f18
2012-04-18 09:49:38 -05:00
Nate Jensen
2daf829da1 Issue #427 cleanup and fix errors
Change-Id: I4d949cf2e5a874793df875de8eed9b296801e32c

Former-commit-id: 6b0d3a958c [formerly ee90af8052 [formerly ae78675364b412d2b06da0819e87618b8c9ab6a8]]
Former-commit-id: ee90af8052
Former-commit-id: 82906d1200
2012-04-17 18:05:24 -05:00
Max Schenkelberg
71e54d0aa5 Issue #239 Got radar and radar mosaic working for collaboration
Former-commit-id: 96c81a03df [formerly d37d8f9bea [formerly a8c0dd15e221a6415c44f73897a80bc4b69e5ca0]]
Former-commit-id: d37d8f9bea
Former-commit-id: fae382a91a
2012-04-17 17:47:21 -05:00
Nate Jensen
f881116fe4 Issue #427 send input events back as session leader
Change-Id: Ib1dacebdd94892bd9837b9bd91463bc6646fbccb

Former-commit-id: 2d822df43f [formerly 9885949b27 [formerly 16af3874c9416b75edc00b4ad928de8a30e47abf]]
Former-commit-id: 9885949b27
Former-commit-id: 9d3c8321e5
2012-04-17 17:26:49 -05:00
Richard Peter
2f351f13f7 Merge "Issue #449. Fixed problem with simulated time for trend plots in FSS monitors." into 9-Wes2Bridge
Former-commit-id: be060f1b1c [formerly 709be7733b [formerly 2a3492987c4cd9751aad2c6e20230f983e68f4b5]]
Former-commit-id: 709be7733b
Former-commit-id: 5bb20ff4a3
2012-04-17 13:16:22 -05:00
Max Schenkelberg
ee7595c10b Issue #239 Fixed mosaic bug, refactored dispatching colormap images so
mosaic could resuse

Former-commit-id: 29184d46ce [formerly 40ca446e53 [formerly aea5c30443970933bf1517ced6d7e91a1008c9d5]]
Former-commit-id: 40ca446e53
Former-commit-id: c1ebd04d4d
2012-04-17 13:09:07 -05:00
Brad Gonzales
7aeb5fac62 Issue #443 Tools.java, GZIP and ZLIB compression. ZLIB by default.
Former-commit-id: 23c85cd4b5 [formerly 1226cd9996 [formerly a03ed123392d4a8a4864a42f7d3b09e71057fbd0]]
Former-commit-id: 1226cd9996
Former-commit-id: 700347780c
2012-04-17 09:57:01 -05:00
Max Schenkelberg
a9864fa590 Issue #239 Refactored Collaboration rendering so it looks up renderes by
extension point so radar renderer can be injected by a radar
collaboration project

Former-commit-id: 7d2a7d987d [formerly 9b018ea151 [formerly 79f4d46bf18fc03c79df0c80c8dde025fe954f0c]]
Former-commit-id: 9b018ea151
Former-commit-id: 490c75f684
2012-04-16 17:29:59 -05:00
Matt Nash
a75e5d6773 Issue #429 fix spelling
Former-commit-id: 6b4d328bc4 [formerly cd8ce46352 [formerly 2d2a0b492690166e89339300281f44a37e532dec]]
Former-commit-id: cd8ce46352
Former-commit-id: 451a00a558
2012-04-16 16:51:22 -05:00
Matt Nash
6e59bde3d7 Issue #429 change name of editor sharing
Former-commit-id: ac3b674bf3 [formerly 9b7a839cdd [formerly 199c8c6af547dc66e8cb068e2617a96f3b68d515]]
Former-commit-id: 9b7a839cdd
Former-commit-id: dfba9a1d0d
2012-04-16 15:40:37 -05:00
Roger Ferrel
69675cf20b Issue #437 Check for null session in ParticipantsLabelProvider.
Change-Id: Ie327860fdf1feac700e646885a641a283fe54291

Former-commit-id: 208f84da4d [formerly 8dd86fc331 [formerly 7e73af55a678595cb39f58e109235f9a0310d14c]]
Former-commit-id: 8dd86fc331
Former-commit-id: e326edf566
2012-04-16 13:36:27 -05:00
Roger Ferrel
6a1ae6a396 Issue #432 In Collaboration Session View roles now properly update the icon.
Change-Id: I970cd006464359acae17dc71705d76e0083c016e

Former-commit-id: cca947d3ec [formerly 4266d74fb4 [formerly 7ad908ac8ef6d276c3294e4c7590e07972b0fd79]]
Former-commit-id: 4266d74fb4
Former-commit-id: c47521f4b9
2012-04-16 13:07:03 -05:00
Nate Jensen
5fd1dfbe50 Issue #427 attempt to fix collaboration build
Change-Id: I30297eebe969601b5a803ccd58e9e69f5ac0e515

Former-commit-id: a823db85be [formerly 6b84101223 [formerly d011c6f975cae23d5f6dc47ff8faa03f973f28e8]]
Former-commit-id: 6b84101223
Former-commit-id: a876c29a8f
2012-04-16 12:58:56 -05:00
Nate Jensen
af67b7fec0 Issue #427 fix drawing icons
Change-Id: Ib7b04baf7f8ab528070c455c1e3e081be56124e0

Former-commit-id: 1d3666a10e [formerly 446052111f [formerly 50f3e0babfb5c38b814be13802bb61f04e73e56f]]
Former-commit-id: 446052111f
Former-commit-id: 25b8851589
2012-04-16 12:54:29 -05:00
Nate Jensen
cfd65777dd Issue #427 cleanup and refactoring for ease of use
Change-Id: I93f75663ace61b454b52d1e451677a0e42c2d481

Former-commit-id: d9c24599ea [formerly fc1c1d5f16 [formerly 23ba31dc2479e9e1e2b45e9237c92a7adf12a6c5]]
Former-commit-id: fc1c1d5f16
Former-commit-id: 02b0f1bd5f
2012-04-16 12:37:40 -05:00
Matt Nash
4d5368e8b9 Issue #429 minor tooltip fix, and double click fixes for unavailable users
Former-commit-id: 30d5ccc641 [formerly 967b8ed671 [formerly 408c7cfaa970e6b460fda819fba0f02810c2dc19]]
Former-commit-id: 967b8ed671
Former-commit-id: 79088f4129
2012-04-16 11:16:50 -05:00
Matt Nash
1607b7cdb6 Issue #429 set editor and view title the same, add separator to menu above collaboration
Former-commit-id: d20fe3cfff [formerly 780fd03203 [formerly c045890c6da56c258dfa44610e7225a3f914e0ef]]
Former-commit-id: 780fd03203
Former-commit-id: dd88bf775c
2012-04-16 10:03:31 -05:00
James Korman
f9513ac55e Issue #437 - removed Leader presence/modified subscribed handling.
Former-commit-id: defb083771 [formerly dab86c62fc [formerly 57673abac66b21596c71737d0aa1537c13982ac0]]
Former-commit-id: dab86c62fc
Former-commit-id: d87e47a5f3
2012-04-16 09:46:12 -05:00
Roger Ferrel
1a4d155b5a Issue #437 Fixed typo that cause multiple grops siteings in Collaboration View.
Change-Id: I2fc329b101532f3da99a58c320ceb7fa109c7e5b

Former-commit-id: 020f77195a [formerly 3f12223532 [formerly 599563055eb1373601d5623752272130142c3659]]
Former-commit-id: 3f12223532
Former-commit-id: 866472438f
2012-04-16 07:52:28 -05:00
Roger Ferrel
1907f26a0d Issue #437 But fix in group View enent handler, improved tooltip
Change-Id: Ibb6fc5f312f09d72df988c591408fc41e39ad674

Former-commit-id: 8ab764e56c [formerly 55ab473fd6 [formerly 47c81c08d9a90c271873cfa50525fb40c26db508]]
Former-commit-id: 55ab473fd6
Former-commit-id: 41e4666d55
2012-04-13 15:51:41 -05:00
Nate Jensen
b79ae6a022 Issue #427 cleanup
Change-Id: Ifa48910d765a40d5443b237b6805fe3f71fb1c73

Former-commit-id: 982e2dae13 [formerly fd36f7d987 [formerly 330813db6cf4a1163091116cda4d41f074409d57]]
Former-commit-id: fd36f7d987
Former-commit-id: 6a572eafde
2012-04-13 13:56:38 -05:00
Nate Jensen
5f61fc206c Issue #427 comment for future reference
Change-Id: Ie8ffaef6e14b97bf4284efec67db8c0067cfccd3

Former-commit-id: 28c95001b9 [formerly 6a387ca1ce [formerly fec3497a585e5b260432307b2bcc9c0317b6f2c7]]
Former-commit-id: 6a387ca1ce
Former-commit-id: 5cef808609
2012-04-13 13:45:13 -05:00
Nate Jensen
a1b258a4b4 Issue #427 legend for shared editor
Change-Id: I98832ade44f7019f108e125d4bfefe6e37e4e9f7

Former-commit-id: a1d56fae3f [formerly 71ff27c001 [formerly c0fc780c73d16055b022af269628dfa0b3e5591e]]
Former-commit-id: 71ff27c001
Former-commit-id: 392818bb51
2012-04-13 13:43:23 -05:00
Max Schenkelberg
559bae6041 Issue #239 Got plots working
Former-commit-id: 04ab27895d [formerly 859262ea98 [formerly 9c93f3670bd8c3a7a5e5330b160d5f2206b979b3]]
Former-commit-id: 859262ea98
Former-commit-id: 682576fe84
2012-04-13 12:56:43 -05:00
Matt Nash
4b794adbd7 Issue #429 remove bold from LoginUser
Former-commit-id: 0ed8e97ee1 [formerly 88d6e4ccbd [formerly 56ad67d94ad7a3c8ebfd43f94b7f40012fe8bbb4]]
Former-commit-id: 88d6e4ccbd
Former-commit-id: 9bec72d07b
2012-04-13 10:59:55 -05:00
Matt Nash
e1172dbcaa Issue #429 fix null pointers and make erase first pass possible
Former-commit-id: b133b57c6d [formerly 82c11c4224 [formerly 67a87efe19292a279d42a0104d902afc59e3dd84]]
Former-commit-id: 82c11c4224
Former-commit-id: bdec7aff90
2012-04-13 10:46:53 -05:00
Matt Nash
da2e195b01 Issue #429 telestrator fixes and view changes
Former-commit-id: c6c0483cee [formerly 19e37ff05a [formerly 51969dfc82d750571115d179911333cec55f677f]]
Former-commit-id: 19e37ff05a
Former-commit-id: 244e02a318
2012-04-13 09:50:48 -05:00
Roger Ferrel
353230a7c3 Issue #437 Implemented Roster event handlers.
Change-Id: Ibc6cf9a077eca6893efa048aa780e16ec4f2190d

Former-commit-id: c5fb910ea0 [formerly 711becf60b [formerly 2cf4fbe9225b9442c8368e7fa3d7109976e557b0]]
Former-commit-id: 711becf60b
Former-commit-id: 11f3edb4f2
2012-04-13 09:02:44 -05:00
Max Schenkelberg
ea082a4c2b Issue #239 Added creating of fonts and use in wireframe shapes
Former-commit-id: 99209a054f [formerly f2fe88790d [formerly ab047d007f8835554d2ec08e2e11594f7d88a6cb]]
Former-commit-id: f2fe88790d
Former-commit-id: d0bdc5d6f0
2012-04-12 16:22:12 -05:00
Max Schenkelberg
9b8f9de1fa Issue #239 Added wireframe shape capability
Former-commit-id: 5be2b4e745 [formerly 12dcb4b044 [formerly f56dd661225103b08b1d51a9f0cb174bd73340eb]]
Former-commit-id: 12dcb4b044
Former-commit-id: 7900e78944
2012-04-12 14:46:08 -05:00
Nate Jensen
180a3f76de Issue #444 cleanup and fix numerous small errors
Change-Id: Idc7862a20a3d3a95103bd58ab9417e002ffaced9

Former-commit-id: ff6cd0bd75 [formerly 447b8b461b [formerly efcfbbc302ede49acffcf85a792a80dc9862a0b8]]
Former-commit-id: 447b8b461b
Former-commit-id: fec2d463b0
2012-04-12 13:43:24 -05:00
Brad Gonzales
961c6517a2 Issue #443 added more compression configuration to Tools.java.
Former-commit-id: 217ee506e1 [formerly 135b560fb6 [formerly 6d430d5d4f14829ab2b1280c691aadbb966fb48c]]
Former-commit-id: 135b560fb6
Former-commit-id: 2b77db0851
2012-04-12 12:08:37 -05:00
Matt Nash
a87f6f7337 Issue #429 add not yet implemented to a few buttons
Former-commit-id: 8083ddf51e [formerly 31d2720a5c [formerly 2e263d7fe77e1451af775f0c55eb82c5d092e45c]]
Former-commit-id: 31d2720a5c
Former-commit-id: d2a0bb20f6
2012-04-12 10:50:07 -05:00
Max Schenkelberg
73c1e75dba Merge branch '11-Collaboration' of ssh://lightning.omaha.us.ray.com:29418/thunder into 11-Collaboration
Former-commit-id: c376abf87a [formerly 8b514dc862 [formerly df62b7a1fece621ad2c46112e0029da6fc3a230c]]
Former-commit-id: 8b514dc862
Former-commit-id: d53a9faa9a
2012-04-12 10:47:08 -05:00
Max Schenkelberg
da48c4f6ac Issue #239 got offscreen rendering working for clients
Former-commit-id: 2de39bb487 [formerly 5ae0ed10d5 [formerly f41733465eb0ee048fb76a0d5467ce456d1cf7c9]]
Former-commit-id: 5ae0ed10d5
Former-commit-id: b1687af0ac
2012-04-12 10:45:50 -05:00
Nate Jensen
ed02fbb8d5 Issue #444 filter right click menu and tooltips based on role
Change-Id: Iab6942a6b58066df6e816e3425e717868aa36337

Former-commit-id: e7e5a34655 [formerly 3d9bfcdb12 [formerly f99b871ce5556840f8b90eead59f8a2659d6bc9a]]
Former-commit-id: 3d9bfcdb12
Former-commit-id: 4390eed955
2012-04-12 10:23:39 -05:00
Matt Nash
f629464521 Issue #429 fix error as well as add checks
Former-commit-id: a6c6695e5b [formerly cf24a2cee9 [formerly 317bf0f2ebdc76ee55f2db9eb81b80731f504847]]
Former-commit-id: cf24a2cee9
Former-commit-id: 9eb69d57f9
2012-04-12 09:45:37 -05:00
Brad Gonzales
225881d7f8 Issue #443 added optional jaxb and thrift compression to collaboration, Tools.java.
Former-commit-id: 2a405eb253 [formerly 137b337f4b [formerly b07cd0c2157e72d679d76ec54987b2de41c10aae]]
Former-commit-id: 137b337f4b
Former-commit-id: e039330b0d
2012-04-11 18:34:58 -05:00
Matt Nash
ed088cca79 Issue #429 drawing additions, code cleanup, toolbar fixes
Former-commit-id: b707408a0a [formerly 8e83184569 [formerly fa78aa2f7f4738770b37beb6b02fe5adbb074fae]]
Former-commit-id: 8e83184569
Former-commit-id: df7ddc0fa2
2012-04-11 16:45:28 -05:00
James Korman
3e7b1a14f3 Issue #437 - Add debug output to support roster development
Former-commit-id: 14b193ad6f [formerly 826105c621 [formerly b502e55a4b95dc0483e5502154ba61f04e9132cc]]
Former-commit-id: 826105c621
Former-commit-id: 4a22bdb915
2012-04-11 16:23:04 -05:00
James Korman
60f690d126 Issue #437 - Added event notification for roster/roster status updates
Former-commit-id: f25744ed0f [formerly d664e77844 [formerly 90f4901c8b7f86a8a0da3be7801d3a5b48b284a8]]
Former-commit-id: d664e77844
Former-commit-id: b23bd53519
2012-04-11 15:37:16 -05:00
Roger Ferrel
2e61538905 Issue #437 Bug fixes to user status
Change-Id: Idd46418cc6f40a1f8a4f247942f5b730b851444f

Former-commit-id: d45396d9f0 [formerly 74c98303d5 [formerly 140fa8efdba2cd5c6cf8b2a1c9696e08d1dc931a]]
Former-commit-id: 74c98303d5
Former-commit-id: 3421463f53
2012-04-11 12:26:46 -05:00
Max Schenkelberg
a94f6388f3 Issue #239 Got maps resources syncing across users
Former-commit-id: ea6b58c226 [formerly 8865c35e69 [formerly d3864aaf812ed78137a7c4124515a1f4300cd2b1]]
Former-commit-id: 8865c35e69
Former-commit-id: 60879f83bd
2012-04-11 09:46:53 -05:00
Nate Jensen
3b0f399ac7 Issue #444 some cleanup
Change-Id: Ic790969f95e59fbf16a18d05bcc11cfe09a94916

Former-commit-id: f32611df47 [formerly 4405320bc8 [formerly 7731d22c58ee05a1c663a1d0da8f047ce49aa09c]]
Former-commit-id: 4405320bc8
Former-commit-id: da1163d487
2012-04-11 09:33:56 -05:00
Nate Jensen
93bfd726cf Issue #444 fix peer to peer send, remove redundancy of ID classes, send session leader and data provider with invite
Change-Id: If381a0dab94e39da4e78e59e33e637f10a4057d7

Former-commit-id: 9b4b691ca9 [formerly 0f20bba406 [formerly 4aa478bd573ad7d9a801658c37a1d229d7bf5862]]
Former-commit-id: 0f20bba406
Former-commit-id: ff36181458
2012-04-10 18:15:36 -05:00
Bryan Kowal
354b3907fb Merge "Issue #450 - the pde build will now build a p2 repository for collaboration. Removed org.jivesoftware.smack from the collaboration feature because it is already in the cots feature which is included in the collaboration feature. Had to remove and re-add log4j to the alertviz and cots features." into 11-Collaboration
Former-commit-id: 3baf9d03c2 [formerly 82783e27fd [formerly b1420977f92e3b5b206f33ce2e1275aee53cc2ae]]
Former-commit-id: 82783e27fd
Former-commit-id: 5d1892242a
2012-04-10 17:40:58 -05:00
Brad Gonzales
3a9a646cf7 Issue #440 keep login window up when a username or password is incorrect.
Former-commit-id: 107c8ba7b9 [formerly ac35f8f2fb [formerly dc4bf6dfbb2f0c58f9986b524ad49f18656cebc7]]
Former-commit-id: ac35f8f2fb
Former-commit-id: 7229f9b92a
2012-04-10 17:20:38 -05:00
Roger Ferrel
d6cd8ffdc1 Issue #437 Added change status menu option.
Change-Id: Ie4b1d453aa3e75b77e360c26dcc838c13b7b6223

Former-commit-id: 020be00301 [formerly 69ea7c724e [formerly 82ae4e9433e71e9027566aed4595046ce0ef6dfa]]
Former-commit-id: 69ea7c724e
Former-commit-id: ced485f863
2012-04-10 16:50:26 -05:00
Bryan Kowal
db3f60b23a Issue #450 - the pde build will now build a p2 repository for collaboration. Removed org.jivesoftware.smack from the collaboration feature because it is already in the cots feature which is included in the collaboration feature. Had to remove and re-add log4j to the alertviz and cots features.
Former-commit-id: ce99417a2a [formerly 6ddeef48fa [formerly b6c8b811ad911f13503859f7af09b916eb16a1d4]]
Former-commit-id: 6ddeef48fa
Former-commit-id: b1a5abc6b3
2012-04-10 16:42:36 -05:00
James Korman
64313163fb Issue #437 - Updates to status handling - Added SessionManager user presence.
Former-commit-id: 07bc1bf83e [formerly 7bf01ecbc9 [formerly 77520e5b98de679a1f08b523fb85464a31bd4c02]]
Former-commit-id: 7bf01ecbc9
Former-commit-id: 44eae46180
2012-04-10 15:55:12 -05:00