Commit graph

307 commits

Author SHA1 Message Date
Nate Jensen
c6f42b4a70 Issue #427 attempt to fix collaboration build
Change-Id: I30297eebe969601b5a803ccd58e9e69f5ac0e515

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

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

Former-commit-id: 02b0f1bd5f [formerly fc1c1d5f16] [formerly d9c24599ea [formerly 23ba31dc2479e9e1e2b45e9237c92a7adf12a6c5]]
Former-commit-id: d9c24599ea
Former-commit-id: e3c7b4d2e2
2012-04-16 12:37:40 -05:00
Matt Nash
477c842174 Issue #429 minor tooltip fix, and double click fixes for unavailable users
Former-commit-id: 79088f4129 [formerly 967b8ed671] [formerly 30d5ccc641 [formerly 408c7cfaa970e6b460fda819fba0f02810c2dc19]]
Former-commit-id: 30d5ccc641
Former-commit-id: ed644a9031
2012-04-16 11:16:50 -05:00
Matt Nash
d2f183205a Issue #429 set editor and view title the same, add separator to menu above collaboration
Former-commit-id: dd88bf775c [formerly 780fd03203] [formerly d20fe3cfff [formerly c045890c6da56c258dfa44610e7225a3f914e0ef]]
Former-commit-id: d20fe3cfff
Former-commit-id: ef0e2814ef
2012-04-16 10:03:31 -05:00
James Korman
0822fc6ae6 Issue #437 - removed Leader presence/modified subscribed handling.
Former-commit-id: d87e47a5f3 [formerly dab86c62fc] [formerly defb083771 [formerly 57673abac66b21596c71737d0aa1537c13982ac0]]
Former-commit-id: defb083771
Former-commit-id: 8e84ed72f7
2012-04-16 09:46:12 -05:00
Bryan Kowal
ba54e9da49 Merge "Issue #450 - add the cave viz collaboration rpm to the yum groups." into 11-Collaboration
Former-commit-id: 66f48c3586 [formerly ffe22bdedc] [formerly adb56099a5 [formerly 170d1e2a92debece0efd0a1b30a281e70c7a8b77]]
Former-commit-id: adb56099a5
Former-commit-id: a0225560cc
2012-04-16 09:40:36 -05:00
Roger Ferrel
1d5d56dcc7 Issue #437 Fixed typo that cause multiple grops siteings in Collaboration View.
Change-Id: I2fc329b101532f3da99a58c320ceb7fa109c7e5b

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

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

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

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

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

Former-commit-id: 11f3edb4f2 [formerly 711becf60b] [formerly c5fb910ea0 [formerly 2cf4fbe9225b9442c8368e7fa3d7109976e557b0]]
Former-commit-id: c5fb910ea0
Former-commit-id: 775d70567c
2012-04-13 09:02:44 -05:00
Max Schenkelberg
43a4688404 Issue #239 Added creating of fonts and use in wireframe shapes
Former-commit-id: d0bdc5d6f0 [formerly f2fe88790d] [formerly 99209a054f [formerly ab047d007f8835554d2ec08e2e11594f7d88a6cb]]
Former-commit-id: 99209a054f
Former-commit-id: 41d3652701
2012-04-12 16:22:12 -05:00
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
Bryan Kowal
30c2ed6fed Issue #450 - add the cave viz collaboration rpm to the yum groups.
Former-commit-id: b561cc5c85 [formerly 58b10dd9ae] [formerly 25c3f269bf [formerly 56612b7cd64e16aa7af358ca251679a76781e36a]]
Former-commit-id: 25c3f269bf
Former-commit-id: 4dec6ced9f
2012-04-11 10:28:30 -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