Commit graph

288 commits

Author SHA1 Message Date
Max Schenkelberg
3e781ede4f Issue #239 Added wireframe shape capability
Former-commit-id: 7900e78944 [formerly 12dcb4b044] [formerly 5be2b4e745 [formerly f56dd661225103b08b1d51a9f0cb174bd73340eb]]
Former-commit-id: 5be2b4e745
Former-commit-id: f6a2f5e55c
2012-04-12 14:46:08 -05:00
Nate Jensen
d61604db1d Issue #444 cleanup and fix numerous small errors
Change-Id: Idc7862a20a3d3a95103bd58ab9417e002ffaced9

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

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

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

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

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

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

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

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

Former-commit-id: 225a8762d1 [formerly c5399687bc] [formerly 2109190752 [formerly b64a623cda4ec00d555d8542da496286e0210dac]]
Former-commit-id: 2109190752
Former-commit-id: 1e4ed16880
2012-04-09 15:16:19 -05:00
Matt Nash
80da3ac38f Issue #429 add resource data to ISerializableObject file to fix error
Former-commit-id: 2a7698e284 [formerly 42ce0e72f0] [formerly b340718346 [formerly b8fc69fc6746566e83b19ed4dfa8611858332aac]]
Former-commit-id: b340718346
Former-commit-id: 22aec07dfd
2012-04-09 12:42:44 -05:00
James Korman
9a7c440f2d Issue #437 - Updated Presence - Add properties and new constructor
Former-commit-id: 9aa0176bb7 [formerly 48397d1d95] [formerly 53dc047d3d [formerly 5f94c705fa50346aca0befcc8eca7b609e685719]]
Former-commit-id: 53dc047d3d
Former-commit-id: 0d6a5312d1
2012-04-09 11:42:19 -05:00
Brad Gonzales
8084909235 Issue #440 added login icon. Changed Logon to Login.
Former-commit-id: 008b670b6a [formerly 44a83e92ed] [formerly 7937986b11 [formerly d2b9c7981006dad91c5781fe0df96113530491df]]
Former-commit-id: 7937986b11
Former-commit-id: 552ce918ef
2012-04-09 11:38:08 -05:00
James Korman
5062cfd2a3 Issue #437 - Add code to update and post roster presence changes.
Former-commit-id: 31a93f32ab [formerly bb31e9e2ea] [formerly df0cdcb563 [formerly 8c5406eb39e9bd8590817e5eda854e20866ebbae]]
Former-commit-id: df0cdcb563
Former-commit-id: f535049780
2012-04-09 10:01:55 -05:00
Max Schenkelberg
532f2d691b 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: a5fa19c914 [formerly cbe92bdf32] [formerly 6812c1ba2b [formerly c7badfd1c2a77d410cd3b841fef967c07c9e6434]]
Former-commit-id: 6812c1ba2b
Former-commit-id: 824b24dfcb
2012-04-06 10:23:24 -05:00
Matt Nash
803d45adfe Issue #429 remove unused com.raytheon.viz.drawing plugin
Former-commit-id: 922fffeeed [formerly af0513690d] [formerly 5bd8e5e47c [formerly b02beff8d7beb6f33e5bcdcfb72a423d7f18584e]]
Former-commit-id: 5bd8e5e47c
Former-commit-id: 437aa74095
2012-04-06 07:16:15 -05:00
Nate Jensen
c5130d8361 Issue #444 initial role transfer code and some cleanup
Change-Id: I45abf42df8da789532a4420259065fbb1f7ed04f

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

Former-commit-id: 48ca9ca105 [formerly 54aaf05209] [formerly 16056d53c5 [formerly e3b171f34fb7610f4f5796d0dcdf32f7a298c8ca]]
Former-commit-id: 16056d53c5
Former-commit-id: b4b754c7cc
2012-04-05 13:52:20 -05:00
Matt Nash
95f85cde78 Issue #429 alert of new messages when in background
Former-commit-id: 5d0ae7ff9f [formerly d62a660e52] [formerly f314b2475d [formerly 8e8fbe73b41f6457c085ab11939fdbd1242d4383]]
Former-commit-id: f314b2475d
Former-commit-id: 7edacef530
2012-04-05 12:38:35 -05:00
Matt Nash
27c3cf3f38 Issue #429 clear,undo,redo
Former-commit-id: 52c0508781 [formerly c53719be8a] [formerly 328d7e1287 [formerly 69fcd977767dec591f2132cc6b13f9e48a3180b0]]
Former-commit-id: 328d7e1287
Former-commit-id: 7dd1657774
2012-04-05 11:49:57 -05:00
Matt Nash
f985ddaa7e Issue #429 telestrator allows all users to draw
Former-commit-id: 916b8428e4 [formerly f200e37a36] [formerly 09c022bda8 [formerly ed59b0803da528f391db3c71aac1184581cc353d]]
Former-commit-id: 09c022bda8
Former-commit-id: fd1b123912
2012-04-05 10:27:10 -05:00
Roger Ferrel
98c83d5322 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: d197ea6fd2 [formerly afc79a14f3] [formerly 72bf5460d7 [formerly 898e1a503af21abef70afc734924332e7de249ee]]
Former-commit-id: 72bf5460d7
Former-commit-id: f9aa115a2b
2012-04-05 08:09:15 -05:00
Nate Jensen
a20e542438 Issue #427 fixed subject
Change-Id: Ieb5499e16b2c30169fe49eb06d73b8e3ede6ce70

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

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

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

Former-commit-id: 3d9fcb3273 [formerly 78502719e9] [formerly 46addc13cf [formerly fd8a0cad3ded983308f1f0d983a9f9a42ade7f2b]]
Former-commit-id: 46addc13cf
Former-commit-id: 7cf6e6166d
2012-04-03 16:20:07 -05:00
Roger Ferrel
4b49ba50a7 Merge branch 'new_devel' into 11-Collaboration
Former-commit-id: 6ae33324f3 [formerly b8df9f46e4] [formerly 395ae5ae63 [formerly a441dcd259dbf3ecd77464d1bd0cbe1f4cdb1cb6]]
Former-commit-id: 395ae5ae63
Former-commit-id: 5b943096c5
2012-04-03 15:29:53 -05:00