Commit graph

355 commits

Author SHA1 Message Date
Matt Nash
1e75e1b24d Issue add preference page for collaboration, currently only enabling and disabling notifications
Former-commit-id: cc313ebcac [formerly cc313ebcac [formerly 1a0bc57f249f3b757c6226526ba05b2f8d1ab2e6]]
Former-commit-id: 00d11cdeaa
Former-commit-id: af819b2e0d
2012-04-27 14:34:55 -05:00
Max Schenkelberg
8a4f34223e Issue Added render frame merging capability
Change-Id: Ie16e650693de6e07453357740b3c2bae21bd999d

Former-commit-id: ff0827b51d [formerly ff0827b51d [formerly ad6d31300e0ac41375a3eb65ce337a6105be72ee]]
Former-commit-id: df07bff0bc
Former-commit-id: e5e13fc3b3
2012-04-27 11:57:53 -05:00
Matt Nash
c930a63797 Issue add better notification to chat
Former-commit-id: e0d11ae8b1 [formerly e0d11ae8b1 [formerly 40db7caa4b6bd45537f4cb37a3f034a907cd8f79]]
Former-commit-id: 3b2fdaa579
Former-commit-id: 91035ee253
2012-04-27 10:10:05 -05:00
Matt Nash
32772c5ecc Issue make chatting append to message before sending out to prevent delay, add notification method so if CAVE is minimized the user will still get the notification that a new chat has happened
Former-commit-id: 25201fcbad [formerly 25201fcbad [formerly 9c0f7ee82b7a844620f1f2e00947a256582b86ef]]
Former-commit-id: 16de1dbafe
Former-commit-id: 501b74478e
2012-04-27 10:08:27 -05:00
Matt Nash
20b7f4c34b Issue remove listener to help prevent exceptions
Former-commit-id: 29b39a1df4 [formerly 29b39a1df4 [formerly 66ac99ff89a3347d528d09081d41c248f4ff4783]]
Former-commit-id: b69e13d795
Former-commit-id: fcecab2afb
2012-04-26 09:17:27 -05:00
Max Schenkelberg
936fa688c0 Added network logging for http traffic
Change-Id: I69f571fba23fc03e0d850180650f61b4581e8a25

Former-commit-id: a912786429 [formerly a912786429 [formerly 7696dd610b5d6f0fc3620db461de68ba06c61699]]
Former-commit-id: f74b6b4a93
Former-commit-id: 2d25e8bb78
2012-04-25 17:28:52 -05:00
Nate Jensen
4eb455b7b1 Issue remove sysouts
Change-Id: I82dd5bcd8e7eb20afcf516c0b8d33e37d72d45db

Former-commit-id: ed4303158c [formerly ed4303158c [formerly 5b87a033a88899b1ca033b18efc9532002b047c0]]
Former-commit-id: e17dad1b54
Former-commit-id: 0c523369c4
2012-04-25 16:56:19 -05:00
Max Schenkelberg
0ba535a60b Got efficient sending of events working where it only sends if events changed
Change-Id: I499a38c1b9cbbd3ede5b04356d2f7788153f836b

Former-commit-id: 84b8ffa490 [formerly 84b8ffa490 [formerly 2f1f6dd97555c46547a7440c97a5314f7a26dc8d]]
Former-commit-id: 28693e6991
Former-commit-id: e608125f9d
2012-04-25 16:18:41 -05:00
Matt Nash
9d0fd819ff Issue slight changes to data provider and session leader indicators
Former-commit-id: 06d71f13ad [formerly 06d71f13ad [formerly 61bcce04de9bf4e4756140903ed3dd861333fd2b]]
Former-commit-id: 8f93192385
Former-commit-id: f212b1d1ae
2012-04-25 15:07:14 -05:00
Nate Jensen
9c7af0cfeb Issue renamed data provider rsc
Change-Id: I05b417c3f7d65908a52910f9d847cc188c7c4a9c

Former-commit-id: 069f809596 [formerly 069f809596 [formerly 35ef9c2c228ac97ef623edd1e50800495d9ab8f7]]
Former-commit-id: b3723bc986
Former-commit-id: a14bccc7ac
2012-04-25 14:41:37 -05:00
Matt Nash
23c3615fd6 Issue first pass at alias
Former-commit-id: 7d870434f6 [formerly 7d870434f6 [formerly 34f230b550a886cad03e3ffeeeaeeaebe480defc]]
Former-commit-id: b20b9530fd
Former-commit-id: f3467023a2
2012-04-25 14:25:52 -05:00
Matt Nash
d51f16cd6c Issue color final fixes
Former-commit-id: 9bc3f0c75d [formerly 9bc3f0c75d [formerly 51b937b9be5c9f1a1e17317e241cd93337e9fd0c]]
Former-commit-id: 506d3e8989
Former-commit-id: 76e8b2e192
2012-04-25 14:22:12 -05:00
Max Schenkelberg
bf92452419 #Issue 239 Got bulk event sending and only sending events when previous frame changes.
Former-commit-id: 001c52bd3a [formerly 001c52bd3a [formerly 4ac2f1ac53970f57936d3b8cd5dfcd90f718c6ce]]
Former-commit-id: 9607d3dd41
Former-commit-id: 9d8dbba20b
2012-04-25 11:27:19 -05:00
Matt Nash
8739f702d0 Issue colors matching between telestrator and chat room across clients
Former-commit-id: d84865ced9 [formerly d84865ced9 [formerly 46a327c929a09c21270f7b6de543e8d742476003]]
Former-commit-id: 09fc05162c
Former-commit-id: 563e76c313
2012-04-25 07:39:05 -05:00
Matt Nash
f614a5bb04 Issue colors for collaboration session
Former-commit-id: 63dccd6b85 [formerly 63dccd6b85 [formerly 86a4ba1b10b58f266cfd46a257145717140a3778]]
Former-commit-id: bc1e35f4b4
Former-commit-id: d79ae59e19
2012-04-24 16:39:28 -05:00
Nate Jensen
a867e1ab82 Issue minor fix
Change-Id: I341e046bcde321ae70a2afeb745bedb0078758ca

Former-commit-id: fd1f337a92 [formerly fd1f337a92 [formerly 2d544b5c2fb48870173ea9d38b4c7370f6ebe49f]]
Former-commit-id: bcc435ac28
Former-commit-id: 7c727f5a0e
2012-04-24 15:28:36 -05:00
Nate Jensen
23bd871123 Issue login data stored in preferences
Change-Id: I0ac9d34f6a7eaf8f6db80d6c573115bd43e2e11c

Former-commit-id: c4afe61f01 [formerly c4afe61f01 [formerly 287dae35ae3566f22a2d9e5a22760f3ef9d29ca2]]
Former-commit-id: bf3eb689cc
Former-commit-id: 0a7a5d44ff
2012-04-24 14:11:27 -05:00
Max Schenkelberg
836eec0684 Issue Added persistence capability to Collaboration data events
Former-commit-id: f4193b0e4e [formerly f4193b0e4e [formerly 39e1cc313eae6df99483cc657c39cdd5e3d24533]]
Former-commit-id: 32ade1a1f7
Former-commit-id: 1ddbb3ef60
2012-04-24 13:44:16 -05:00
Matt Nash
2c8dfc611b Issue major refactor of UserId, make CollaborationGroupView use actual objects instead of wrappers
Former-commit-id: 0241e8857f [formerly 0241e8857f [formerly 68f7aaecfe8c78db56a70e8d33a9d990bf5fa467]]
Former-commit-id: fa360c90cf
Former-commit-id: b428da939c
2012-04-24 12:20:55 -05:00
Nate Jensen
776ef738f7 Issue better logging of traffic
Change-Id: Ia968b79a9d6ee1e5224678ac63684fb9c7aa5b81

Former-commit-id: a4b0addeee [formerly a4b0addeee [formerly 4a7faa743900edada4ecf8b42aa3315515617e71]]
Former-commit-id: 39ebbc3913
Former-commit-id: 8130c22b64
2012-04-23 11:23:22 -05:00
Bryan Kowal
160a359b30 Issue - fix the collaboration pde build.
Former-commit-id: 19eb596d88 [formerly 19eb596d88 [formerly 450b6ad4bb2c3e0b9069256977884d7b89224cae]]
Former-commit-id: d97819a8df
Former-commit-id: de9a48b0c3
2012-04-21 18:17:39 -05:00
Matt Nash
451a6f1b2e Issue fixes for colors, needs to refactor user id to make work
Former-commit-id: b418af8aa9 [formerly b418af8aa9 [formerly a0f919d73ea4d1da7d79e721800079f0698070db]]
Former-commit-id: 7f7bd73014
Former-commit-id: 4f3a414d6d
2012-04-20 15:30:58 -05:00
Matt Nash
06bd050bb0 Issue color fixes
Former-commit-id: 7116eb79cd [formerly 7116eb79cd [formerly 819a0b037d49993e56dc77207809dbf3903ea6ec]]
Former-commit-id: 1b9c4320fc
Former-commit-id: 15478a9e21
2012-04-20 15:30:58 -05:00
Matt Nash
add3189b75 Issue lots of color changes
Former-commit-id: 064657306f [formerly 064657306f [formerly ac71a592948b71c629f5f535a8d06840b3905c2a]]
Former-commit-id: fdddff1957
Former-commit-id: fa120a1cd0
2012-04-20 15:30:57 -05:00
Matt Nash
36f8d74418 Issue first round fixes color
Former-commit-id: 5f47f98662 [formerly 5f47f98662 [formerly 901770d888a39df452e60d9ac6c5d7e071d6a810]]
Former-commit-id: d34e2722b0
Former-commit-id: b5f8783a94
2012-04-20 15:30:57 -05:00
Max Schenkelberg
04cf9dba60 Issue Started persistable object event pattern. Made construction
of single color images cheaper to allow object construction to happen
immediately 

Former-commit-id: 523c90b697 [formerly 523c90b697 [formerly 995ddaebb670eb1689aeb44e3cb760731db46e80]]
Former-commit-id: da5e17d6e3
Former-commit-id: f05528979d
2012-04-19 16:03:07 -05:00
Nate Jensen
3b749bfff8 Issue fix peer to peer
Change-Id: Iae7f0d4c5f3f28360a957768fa755809fe47c171

Former-commit-id: 8da43825d0 [formerly 8da43825d0 [formerly b8ca7f7c0d329c1d7bb527317fc89794ea4dbac0]]
Former-commit-id: 62c5527e17
Former-commit-id: 7fdc45a275
2012-04-19 15:27:52 -05:00
Nate Jensen
6367124fcf Issue cleanup
Change-Id: I74f9d6e99849f66ef33340685fbb08b4c9c1b768

Former-commit-id: efc911ac9d [formerly efc911ac9d [formerly ee08cc7a0d81fd83b90398119add8fad3428283b]]
Former-commit-id: 7f08b7cd22
Former-commit-id: 0951143f26
2012-04-19 13:38:16 -05:00
Nate Jensen
877ebfe2c0 Issue consolidated user ids
Change-Id: I008c47320bbb5819db0607e7f695b3ecffa30387

Former-commit-id: 006785e374 [formerly 006785e374 [formerly 9e137757a7ed7bd9f319a1984aed40b6de960a35]]
Former-commit-id: 919f6907d3
Former-commit-id: 35d4ef153f
2012-04-19 10:45:25 -05:00
Nate Jensen
c1271c3377 Issue exceptions are good
Change-Id: I67bb428804d025d20423b9e2320006c70e9b4c68

Former-commit-id: 47639de899 [formerly 47639de899 [formerly ec20a1f9d6076c2f72909f9fb9a6c88598201dcf]]
Former-commit-id: 24ae50a37b
Former-commit-id: 0cbcc74457
2012-04-18 17:05:27 -05:00
Nate Jensen
acc96c95b9 Issue more cleanup
Change-Id: I82018bb21bed8c2e0d948da915f80ef33061615e

Former-commit-id: a54660c377 [formerly a54660c377 [formerly 1d24813371c2dec40ff90657705048083e03a9db]]
Former-commit-id: 8124a47b94
Former-commit-id: 888d927468
2012-04-18 16:20:39 -05:00
Nate Jensen
cd30e96235 Issue more cleanup
Change-Id: Id2ad63a51e9a891801d2422547f855cd769a83d3

Former-commit-id: c33cf2538c [formerly c33cf2538c [formerly 258df7c2187c1ebcecf1abf905ec2cc4e60464e0]]
Former-commit-id: fa9c91e03d
Former-commit-id: 8830e1c1c9
2012-04-18 14:15:18 -05:00
Max Schenkelberg
fef058d9c6 Issue Got reprojection event working
Former-commit-id: 29f24e3ec5 [formerly 29f24e3ec5 [formerly 99e432cd258c9bf570a66be4702d28ac68204052]]
Former-commit-id: 005beff18a
Former-commit-id: 044f21e405
2012-04-18 14:01:09 -05:00
Nate Jensen
3de8de66ab Issue cleanup
Change-Id: I2a294a679f8cfb1ed62a63a95bcd21b4954194a3

Former-commit-id: ec2a0e39ed [formerly ec2a0e39ed [formerly feaa63a200183b87c45a4fcea6b655cf4b1a826f]]
Former-commit-id: d6e119bde1
Former-commit-id: 601b6628f7
2012-04-18 13:44:24 -05:00
Max Schenkelberg
03039f66a1 Issue Added ability to remove remote graphics functionality from
editor.  Execute on session shutdown

Former-commit-id: bbb8d0e596 [formerly bbb8d0e596 [formerly 8a2d8b0ce27364eae1bc7e696a5d1074e03169dc]]
Former-commit-id: c64d84d1b5
Former-commit-id: d4bff8bbc5
2012-04-18 10:49:15 -05:00
Nate Jensen
6be9c44303 Issue fix non-collaboration sessions
Change-Id: I5f39311d65c16a097692a76e087598d577fe7a4b

Former-commit-id: b8cec96f21 [formerly b8cec96f21 [formerly 607ec4474b96f9670c53ba69295fa66a2880ff7e]]
Former-commit-id: fa0f61a85e
Former-commit-id: 9f055f8ec9
2012-04-18 09:49:38 -05:00
Nate Jensen
81370cd7c9 Issue cleanup and fix errors
Change-Id: I4d949cf2e5a874793df875de8eed9b296801e32c

Former-commit-id: ee90af8052 [formerly ee90af8052 [formerly ae78675364b412d2b06da0819e87618b8c9ab6a8]]
Former-commit-id: 6b0d3a958c
Former-commit-id: e6bce354e8
2012-04-17 18:05:24 -05:00
Max Schenkelberg
4dd82a9211 Issue Got radar and radar mosaic working for collaboration
Former-commit-id: d37d8f9bea [formerly d37d8f9bea [formerly a8c0dd15e221a6415c44f73897a80bc4b69e5ca0]]
Former-commit-id: 96c81a03df
Former-commit-id: dbe18c16d2
2012-04-17 17:47:21 -05:00
Nate Jensen
bdd6e1d211 Issue send input events back as session leader
Change-Id: Ib1dacebdd94892bd9837b9bd91463bc6646fbccb

Former-commit-id: 9885949b27 [formerly 9885949b27 [formerly 16af3874c9416b75edc00b4ad928de8a30e47abf]]
Former-commit-id: 2d822df43f
Former-commit-id: 1b0975e7fa
2012-04-17 17:26:49 -05:00
Max Schenkelberg
78126cd777 Issue Fixed mosaic bug, refactored dispatching colormap images so
mosaic could resuse

Former-commit-id: 40ca446e53 [formerly 40ca446e53 [formerly aea5c30443970933bf1517ced6d7e91a1008c9d5]]
Former-commit-id: 29184d46ce
Former-commit-id: a82f07b25d
2012-04-17 13:09:07 -05:00
Brad Gonzales
c8263a8e5e Issue Tools.java, GZIP and ZLIB compression. ZLIB by default.
Former-commit-id: 1226cd9996 [formerly 1226cd9996 [formerly a03ed123392d4a8a4864a42f7d3b09e71057fbd0]]
Former-commit-id: 23c85cd4b5
Former-commit-id: 9a81f16961
2012-04-17 09:57:01 -05:00
Nate Jensen
8ba092ee17 Merge "Issue - defined a new generic xmpp rpm specification that will currently be used to create the awips2-openfire rpm. Updated the soon-to-be deprecated nightly and release builds to build the new rpm." into 11-Collaboration
Former-commit-id: 28b643ad74 [formerly 28b643ad74 [formerly a02a78e1a44df9bfe90cf7a65c8b16176b48e535]]
Former-commit-id: 0f5a451fa5
Former-commit-id: 7fc2de9425
2012-04-17 08:53:01 -05:00
Max Schenkelberg
ab94346224 Issue 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: 9b018ea151 [formerly 9b018ea151 [formerly 79f4d46bf18fc03c79df0c80c8dde025fe954f0c]]
Former-commit-id: 7d2a7d987d
Former-commit-id: fa3d39c5e2
2012-04-16 17:29:59 -05:00
Bryan Kowal
b00be4fdeb Issue - defined a new generic xmpp rpm specification that will currently be used to create the awips2-openfire rpm. Updated the soon-to-be deprecated nightly and release builds to build the new rpm.
Former-commit-id: fadb50446d [formerly fadb50446d [formerly 5afc6ff942850e0781da96bdeaa1fb4ee7d54000]]
Former-commit-id: 298ab2e057
Former-commit-id: 62e4e0bbea
2012-04-16 17:00:30 -05:00
Matt Nash
2f4cb1c5bf Issue fix spelling
Former-commit-id: cd8ce46352 [formerly cd8ce46352 [formerly 2d2a0b492690166e89339300281f44a37e532dec]]
Former-commit-id: 6b4d328bc4
Former-commit-id: 86954f6071
2012-04-16 16:51:22 -05:00
Matt Nash
98a0dd0f67 Issue change name of editor sharing
Former-commit-id: 9b7a839cdd [formerly 9b7a839cdd [formerly 199c8c6af547dc66e8cb068e2617a96f3b68d515]]
Former-commit-id: ac3b674bf3
Former-commit-id: 87a5511a7c
2012-04-16 15:40:37 -05:00
Roger Ferrel
64b9af0895 Issue Check for null session in ParticipantsLabelProvider.
Change-Id: Ie327860fdf1feac700e646885a641a283fe54291

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

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

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

Former-commit-id: 446052111f [formerly 446052111f [formerly 50f3e0babfb5c38b814be13802bb61f04e73e56f]]
Former-commit-id: 1d3666a10e
Former-commit-id: 6c381ceb01
2012-04-16 12:54:29 -05:00