Commit graph

193 commits

Author SHA1 Message Date
Nate Jensen
78d5b1dad6 Issue #444 filter right click menu and tooltips based on role
Change-Id: Iab6942a6b58066df6e816e3425e717868aa36337

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

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

Former-commit-id: 4405320bc8 [formerly 7731d22c58ee05a1c663a1d0da8f047ce49aa09c]
Former-commit-id: f32611df47
2012-04-11 09:33:56 -05:00
Nate Jensen
ae769c490b 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: 0f20bba406 [formerly 4aa478bd573ad7d9a801658c37a1d229d7bf5862]
Former-commit-id: 9b4b691ca9
2012-04-10 18:15:36 -05:00
Bryan Kowal
61d0a876dd 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: 82783e27fd [formerly b1420977f92e3b5b206f33ce2e1275aee53cc2ae]
Former-commit-id: 3baf9d03c2
2012-04-10 17:40:58 -05:00
Brad Gonzales
1b7e35f876 Issue #440 keep login window up when a username or password is incorrect.
Former-commit-id: ac35f8f2fb [formerly dc4bf6dfbb2f0c58f9986b524ad49f18656cebc7]
Former-commit-id: 107c8ba7b9
2012-04-10 17:20:38 -05:00
Roger Ferrel
8fa193bcbe Issue #437 Added change status menu option.
Change-Id: Ie4b1d453aa3e75b77e360c26dcc838c13b7b6223

Former-commit-id: 69ea7c724e [formerly 82ae4e9433e71e9027566aed4595046ce0ef6dfa]
Former-commit-id: 020be00301
2012-04-10 16:50:26 -05:00
Bryan Kowal
10a291afa1 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: 6ddeef48fa [formerly b6c8b811ad911f13503859f7af09b916eb16a1d4]
Former-commit-id: ce99417a2a
2012-04-10 16:42:36 -05:00
James Korman
7272ede3c4 Issue #437 - Updates to status handling - Added SessionManager user presence.
Former-commit-id: 7bf01ecbc9 [formerly 77520e5b98de679a1f08b523fb85464a31bd4c02]
Former-commit-id: 07bc1bf83e
2012-04-10 15:55:12 -05:00
Max Schenkelberg
0d21a9a35e Issue #239 Got zoom/pan events working for remote users
Former-commit-id: 6e0c5c3cdf [formerly a817a720868fe887deca6ce6589014f0cd439c2d]
Former-commit-id: 18e9f2c6ad
2012-04-10 14:40:51 -05:00
Matt Nash
52e27b63f7 Issue #429 comment out ability to start in debug mode for the connection
Former-commit-id: 202fe2bb5e [formerly 8293c897e3b11c026b2f07eb45e72f48897f8d9f]
Former-commit-id: f05b486e33
2012-04-10 13:22:42 -05:00
Roger Ferrel
57e809d913 Issue #437 User status now properly displayed and updated in sessions.
Change-Id: I7b0e077cb87f97388fddff27b846ce856cb6a999

Former-commit-id: d2e2fd8da3 [formerly 8ee6d7cf1a8b7e0bd2fa0abfe016cb221c60f2b3]
Former-commit-id: 3fd25ff1cf
2012-04-10 11:11:26 -05:00
Nate Jensen
a924bd6489 Issue #427 cleanup
Change-Id: I3ae5c84feead4bccf49007ddb16a9ed61fa49024

Former-commit-id: 2e5272cff9 [formerly 93a7d3b6f52331034efe1e02fdd073959eee56ee]
Former-commit-id: ec92c842c4
2012-04-10 10:35:03 -05:00
Brad Gonzales
8d170cd14b Issue #440 Changed login icon to green.
Former-commit-id: a378fea5d1 [formerly 69549e0e64ff8d14892db9e908692c47aeb3043c]
Former-commit-id: ca2a35d77c
2012-04-10 10:01:11 -05:00
Roger Ferrel
946f7963c4 Issue #437 Presence status sent out when logged on to the server.
Change-Id: I44d0cfd8e37aeda4d0eadaf80b9c014494258164

Former-commit-id: b4c8d3a0d9 [formerly 9391b95b6a26b34675370b3f7347fab4f08444e5]
Former-commit-id: 521127b589
2012-04-09 16:00:25 -05:00
Matt Nash
d6731254d6 Issue #429 changing 'private' aspect
Former-commit-id: 9887678590 [formerly 4c475ace9b0803b40bc90eca71a800a1ca2da4b5]
Former-commit-id: 98350f4ba5
2012-04-09 15:21:07 -05:00
Roger Ferrel
1e4ed16880 Issue #437 Change to up date Presence in the Group View.
Change-Id: I59d4f4fcc14f59dc3017c118d3613f6f7040dca8

Former-commit-id: c5399687bc [formerly b64a623cda4ec00d555d8542da496286e0210dac]
Former-commit-id: 2109190752
2012-04-09 15:16:19 -05:00
Matt Nash
22aec07dfd Issue #429 add resource data to ISerializableObject file to fix error
Former-commit-id: 42ce0e72f0 [formerly b8fc69fc6746566e83b19ed4dfa8611858332aac]
Former-commit-id: b340718346
2012-04-09 12:42:44 -05:00
James Korman
0d6a5312d1 Issue #437 - Updated Presence - Add properties and new constructor
Former-commit-id: 48397d1d95 [formerly 5f94c705fa50346aca0befcc8eca7b609e685719]
Former-commit-id: 53dc047d3d
2012-04-09 11:42:19 -05:00
Brad Gonzales
552ce918ef Issue #440 added login icon. Changed Logon to Login.
Former-commit-id: 44a83e92ed [formerly d2b9c7981006dad91c5781fe0df96113530491df]
Former-commit-id: 7937986b11
2012-04-09 11:38:08 -05:00
James Korman
f535049780 Issue #437 - Add code to update and post roster presence changes.
Former-commit-id: bb31e9e2ea [formerly 8c5406eb39e9bd8590817e5eda854e20866ebbae]
Former-commit-id: df0cdcb563
2012-04-09 10:01:55 -05:00
Max Schenkelberg
824b24dfcb Issue #239 Fixed D2D context activation so as not to override important
keys when a unrelated view is active such as Product Browser or
Collaboration views.

Former-commit-id: cbe92bdf32 [formerly c7badfd1c2a77d410cd3b841fef967c07c9e6434]
Former-commit-id: 6812c1ba2b
2012-04-06 10:23:24 -05:00
Matt Nash
437aa74095 Issue #429 remove unused com.raytheon.viz.drawing plugin
Former-commit-id: af0513690d [formerly b02beff8d7beb6f33e5bcdcfb72a423d7f18584e]
Former-commit-id: 5bd8e5e47c
2012-04-06 07:16:15 -05:00
Nate Jensen
ac109d3e72 Issue #444 initial role transfer code and some cleanup
Change-Id: I45abf42df8da789532a4420259065fbb1f7ed04f

Former-commit-id: c1543afc44 [formerly c7276b7fddee718fd47f1f1b3fb75d5b483e62fc]
Former-commit-id: 0ef84129c4
2012-04-05 17:49:12 -05:00
Max Schenkelberg
b4b754c7cc Issue #239 Added remote capability injection code through factory
method. Cleaned up old/unmaintained 3D references

Former-commit-id: 54aaf05209 [formerly e3b171f34fb7610f4f5796d0dcdf32f7a298c8ca]
Former-commit-id: 16056d53c5
2012-04-05 13:52:20 -05:00
Matt Nash
7edacef530 Issue #429 alert of new messages when in background
Former-commit-id: d62a660e52 [formerly 8e8fbe73b41f6457c085ab11939fdbd1242d4383]
Former-commit-id: f314b2475d
2012-04-05 12:38:35 -05:00
Matt Nash
7dd1657774 Issue #429 clear,undo,redo
Former-commit-id: c53719be8a [formerly 69fcd977767dec591f2132cc6b13f9e48a3180b0]
Former-commit-id: 328d7e1287
2012-04-05 11:49:57 -05:00
Matt Nash
fd1b123912 Issue #429 telestrator allows all users to draw
Former-commit-id: f200e37a36 [formerly ed59b0803da528f391db3c71aac1184581cc353d]
Former-commit-id: 09c022bda8
2012-04-05 10:27:10 -05:00
Roger Ferrel
f9aa115a2b Issue #439 added filter to prevent illegal characters in the session name. Also made changes to throw exceptions when creation fails.
Change-Id: Ieb5fcbb433f8165d8cd711224dc095fe96e5162c

Former-commit-id: afc79a14f3 [formerly 898e1a503af21abef70afc734924332e7de249ee]
Former-commit-id: 72bf5460d7
2012-04-05 08:09:15 -05:00
Nate Jensen
477d1bb013 Issue #427 fixed subject
Change-Id: Ieb5499e16b2c30169fe49eb06d73b8e3ede6ce70

Former-commit-id: b084156a30 [formerly 8908b81e0e47cfe112ad132a82f2b2cb1a0dd55e]
Former-commit-id: 4999e547a1
2012-04-04 17:06:00 -05:00
Bradley Gonzales
c345b2614e Issue #440 more descriptive login failure message
Former-commit-id: 6fc14461ee [formerly 909362d88423e3c5a39c73b5e5da2d2168f5ed91]
Former-commit-id: 74ce6f2140
2012-04-04 16:26:58 -05:00
Nate Jensen
0f5b0f7e9e Issue #427 instantiate collaboration resource
Change-Id: I5aa7ec5d7dfb3f2373730eb40dd9ea3178112d20

Former-commit-id: 260c7c10eb [formerly 5cd5a85bf836ade2da3b43b2797c2a65d61be461]
Former-commit-id: f06338bcd4
2012-04-04 14:05:12 -05:00
James Korman
44b07395fb Issue #437 - Corrected venue command message loopback
Former-commit-id: 23a2cd033a [formerly c3ba8bd9416f18358f2a976ee2104e4e614321c3]
Former-commit-id: e663a9e5dc
2012-04-04 13:41:25 -05:00
Matt Nash
28df06150e Issue #429 working telestration collaboration capabilities
Former-commit-id: 3c2fcc59d0 [formerly f1c9552a757e7d194e31ed9786cb358c53e631b7]
Former-commit-id: c27a3cf672
2012-04-04 11:23:34 -05:00
Roger Ferrel
5145bb9e7e Issue #244 Fix bug in handleInvitationEvent
Change-Id: Ic47628203707a8238b1d3c0982d177641bba53a9

Former-commit-id: a39475e04d [formerly 12e29dfb9e3a77e44b7b946f138c84e082e0990a]
Former-commit-id: 46ddf008b8
2012-04-03 17:28:27 -05:00
James Korman
f496523681 Issue #437 - Adding roster api message handling.
Former-commit-id: 4c7f2465fc [formerly 8c7b4a55e6fa10e3e120e12334ba2d04d2d40a32]
Former-commit-id: afeea4d9d2
2012-04-03 16:57:27 -05:00
Roger Ferrel
7cf6e6166d Issue #244 Change user status now send Presence update to the server.
Change-Id: Id0a455633693db251d03a85343f526905a9c4364

Former-commit-id: 78502719e9 [formerly fd8a0cad3ded983308f1f0d983a9f9a42ade7f2b]
Former-commit-id: 46addc13cf
2012-04-03 16:20:07 -05:00
Roger Ferrel
5b943096c5 Merge branch 'new_devel' into 11-Collaboration
Former-commit-id: b8df9f46e4 [formerly a441dcd259dbf3ecd77464d1bd0cbe1f4cdb1cb6]
Former-commit-id: 395ae5ae63
2012-04-03 15:29:53 -05:00
Max Schenkelberg
5d7e504e89 Issue #239 Start of remote target capabilities
Former-commit-id: 6c411ffb07 [formerly 30b76609cff9a737b8e4190bbfebb5a37a259fad]
Former-commit-id: d2d03e2c64
2012-04-03 15:11:20 -05:00
Roger Ferrel
813e91d1cc Issue #244 Peer to Peer chat implemented. Change Passwor implemtned.
Change-Id: I4949d5ff82a1046d344cd63e32842b2d67717681

Former-commit-id: 7d7ee81855 [formerly dde6ebb7a4ce4cdee62b1d4e31d33694c331309e]
Former-commit-id: 9dd257f28a
2012-04-03 13:28:40 -05:00
Max Schenkelberg
bdc8c572a5 Merge branch '11-Collaboration' of ssh://lightning.omaha.us.ray.com:29418/thunder into 11-Collaboration
Former-commit-id: e78aad4bc5 [formerly 5bd4a3ccbcb84443eb342670c2a4ea6e083527b7]
Former-commit-id: 138114e3dc
2012-04-03 13:15:31 -05:00
James Korman
46a646f7f7 Issue #232 - Corrected problem using participant identifiers
Former-commit-id: b89a89def3 [formerly 5b102692838b42ffab97186742338494df78b978]
Former-commit-id: 96cd7bea11
2012-04-03 12:45:00 -05:00
Matt Nash
ce79d3bec3 #429 fix issue where dialog prevents collaboration view from opening, add collaboration drawing layer, use event bus for message handling, prep work for
Former-commit-id: 5cb40430a7 [formerly be35f7e75bbeb89fe160e24d9ff691f62753c96b]
Former-commit-id: 8e16194370
2012-04-03 12:23:11 -05:00
Nate Jensen
6319166680 Issue #427 open editor when joining session
Change-Id: I6094a7a909584acb8b10236119ec3eb5dd965e59

Former-commit-id: 223eb82fe0 [formerly f1c0549a84b0aa0d4829ca1bc584165ca98dbbb6]
Former-commit-id: c29a5a75d9
2012-04-03 08:44:58 -05:00