Commit graph

1130 commits

Author SHA1 Message Date
Nate Jensen
7e20b0350c Merge "Issue #429 telestrator merging" into 11-Collaboration
Former-commit-id: 5999d295f4 [formerly aaba32c4c1] [formerly cf880ddd0d] [formerly 5999d295f4 [formerly aaba32c4c1] [formerly cf880ddd0d] [formerly 676746126c [formerly cf880ddd0d [formerly eda16f8aa5a9aa88a8e947070d8e9df32c36c114]]]]
Former-commit-id: 676746126c
Former-commit-id: 418fa15cc7 [formerly 7d5d70bf55] [formerly 0db4f826ae255081ca710d80835f257db3c69ddc [formerly ec0896c28d]]
Former-commit-id: ffa79a6786e487f4bb1e2fd696315a724eb3dcd2 [formerly f809bbcb0d]
Former-commit-id: 80ea8cc05d
2012-03-28 15:10:34 -05:00
Matt Nash
454e4e94a3 Issue #429 telestrator merging
Change-Id: I18f8f283db617d0865b274dcf6003a24e2cf2028

Former-commit-id: f5eee3d7cc [formerly b86ee8584f] [formerly d55dab5c34] [formerly f5eee3d7cc [formerly b86ee8584f] [formerly d55dab5c34] [formerly 39670f6755 [formerly d55dab5c34 [formerly b1a679a2e37bdd7a887fffe82a3d735cdb60f7f9]]]]
Former-commit-id: 39670f6755
Former-commit-id: 0717f545ca [formerly 4871565ff0] [formerly 61b25ce243bb8fbf9e6499922e3ab168af901387 [formerly aeb022880c]]
Former-commit-id: 25d3843c62e8d28ef2ca1974858fa8d8f4c3fff9 [formerly 6ec5f3b2ea]
Former-commit-id: f58c0816fe
2012-03-28 15:09:18 -05:00
Nate Jensen
1b3258cdff Issue #427 initial input event code
Change-Id: I37dc96ed8dbef37d8e3f7a8ae39fc6fcad59f4aa

Former-commit-id: dc7c88c652 [formerly 40dd73ba4d] [formerly 5fdc253d77] [formerly dc7c88c652 [formerly 40dd73ba4d] [formerly 5fdc253d77] [formerly bbf96992ee [formerly 5fdc253d77 [formerly 6297c04332bb349d8351b07e2ffd1c24c046ccd7]]]]
Former-commit-id: bbf96992ee
Former-commit-id: 4b4b9a03ce [formerly 8fbe658c89] [formerly 43d8d9028dd4a466a9034287dba2bdd45ddb912b [formerly a5d38a0968]]
Former-commit-id: e7473c9397454f5664a17495cb1fc90c7a5d4feb [formerly 454e8a72f8]
Former-commit-id: 6018238348
2012-03-28 14:34:25 -05:00
Max Schenkelberg
e6fcc458e5 Issue #358 Made wireframe shapes rely more on the grid geoemtry of the
descriptor than the actual descriptor as the descriptor is used purely
for convenience 

Former-commit-id: 86d3763df0 [formerly 66eaffb9ee] [formerly 15a9245592] [formerly 86d3763df0 [formerly 66eaffb9ee] [formerly 15a9245592] [formerly f10f1a5319 [formerly 15a9245592 [formerly 265ccb3e22aa0122dbd74e83d0af202596c1941c]]]]
Former-commit-id: f10f1a5319
Former-commit-id: 5fc757226e [formerly bbab188fb9] [formerly 6d1ea66ba9a1390c296443e20785aa9ef4a890fa [formerly ac11dd0c18]]
Former-commit-id: cb1bc79da744506da785204d429e696d9676fb32 [formerly 2f3b9f0067]
Former-commit-id: e73e40dc78
2012-03-28 13:32:04 -05:00
Roger Ferrel
08c8cd1244 Issue #244 Clean up and Link editor to chat now works.
Change-Id: I23b12fa44b8908b6a0c5ce79ca79ad73ff26df9d

Former-commit-id: 2c61bc2a50 [formerly fae1527331] [formerly 5d95a69f39] [formerly 2c61bc2a50 [formerly fae1527331] [formerly 5d95a69f39] [formerly dc2f3316e6 [formerly 5d95a69f39 [formerly 51e85606ad7d7462ce84bb14bd4df0c792997a59]]]]
Former-commit-id: dc2f3316e6
Former-commit-id: f1a9b8265c [formerly d29d2a1c92] [formerly 27bd3129b256af64b1bce9adcab5ca25bc1e9327 [formerly 9712ba2751]]
Former-commit-id: 996507114e4f808d9a2a5758117e98559a4da0d7 [formerly a5b05aeebd]
Former-commit-id: dbb7bdf9a8
2012-03-28 11:23:51 -05:00
James Korman
efff6a8028 Issue #232 - Added addition peer-to-peer events
Former-commit-id: 9791cc693a [formerly fc99959e3c] [formerly e8b23e3687] [formerly 9791cc693a [formerly fc99959e3c] [formerly e8b23e3687] [formerly ae6eddcd68 [formerly e8b23e3687 [formerly 34994534b7e9b80b96e5ca038afef1977ba02383]]]]
Former-commit-id: ae6eddcd68
Former-commit-id: f834bf7ca2 [formerly 356892acd6] [formerly 653449fc2f2973859a684acad815bda3e8ddda5c [formerly 0ff25a5258]]
Former-commit-id: ed85fcbd5271b86e762bd07906ba4a6ba486f8a5 [formerly 64be5deba5]
Former-commit-id: 979397b7be
2012-03-27 16:31:26 -05:00
Nate Jensen
2d15b6b34b Issue #427 minor fixes
Change-Id: I9788992b2de751f75ab2cc5112f2cf0492c214ad

Former-commit-id: 1952d1fbfe [formerly ab63accc61] [formerly fa8b5b3400] [formerly 1952d1fbfe [formerly ab63accc61] [formerly fa8b5b3400] [formerly 0f25c8ffa6 [formerly fa8b5b3400 [formerly 40e9906f41f0fa2ae4c87d3c2a2acb2406fd4e25]]]]
Former-commit-id: 0f25c8ffa6
Former-commit-id: 316ee943cd [formerly f1c0104885] [formerly ae7a75e9886a4da3c8fde7c46fdf504fd79b25c1 [formerly a692caba1c]]
Former-commit-id: 57ee24a6f84224f00686d374b7198adaaf101812 [formerly efe77c3542]
Former-commit-id: 30740b4e48
2012-03-27 09:56:46 -05:00
Nate Jensen
01e2a8c6ed Issue #427 small improvements
Change-Id: I9a28888dceb268ab62f60bc9686b0130da01ca0e

Former-commit-id: 2132a997ca [formerly 4180979cf4] [formerly 89d7f5ec7e] [formerly 2132a997ca [formerly 4180979cf4] [formerly 89d7f5ec7e] [formerly 80500eec9c [formerly 89d7f5ec7e [formerly 3a268a54417ee7ed6fcef6549b9c47b86fadfc82]]]]
Former-commit-id: 80500eec9c
Former-commit-id: 3320d18ed5 [formerly 7d6bfd3a0b] [formerly 9d8e2d15c09b14a4f1b60f41a2add68cea557677 [formerly 9602216cda]]
Former-commit-id: c8325f496f4f6be805799fc8938eb13dbb361e2a [formerly 92a9726d83]
Former-commit-id: e2e9fb87dc
2012-03-27 09:42:39 -05:00
Nate Jensen
8abc0aa1f6 Merge "Issue #244 Tied CollaboratonEditor to the view." into 11-Collaboration
Former-commit-id: 16d1762f6d [formerly fc5e53b1c2] [formerly c6e046f11e] [formerly 16d1762f6d [formerly fc5e53b1c2] [formerly c6e046f11e] [formerly b2655debe8 [formerly c6e046f11e [formerly f5ace8ee9561bb02311414ac82b0bbe93a5ff3b6]]]]
Former-commit-id: b2655debe8
Former-commit-id: 95d02a28f3 [formerly 54469fd8b5] [formerly 923ca1bcfb8afff29f419a61aae88a15ffd4bf8e [formerly 43b58266c5]]
Former-commit-id: 5f72d5e0d044713a57a4ea43d16d6421aa0e0ec9 [formerly cc6b5250b3]
Former-commit-id: 272563edbf
2012-03-27 08:36:25 -05:00
Nate Jensen
db3fd4abdc Merge "Issue #244 Localization of login data and removal of messanger and participant listeners." into 11-Collaboration
Former-commit-id: f74079fc42 [formerly 4d32c5e078] [formerly d40b15acc2] [formerly f74079fc42 [formerly 4d32c5e078] [formerly d40b15acc2] [formerly d09c8a9383 [formerly d40b15acc2 [formerly 9dc29b49a619cca5613e72858099029b4ffc724e]]]]
Former-commit-id: d09c8a9383
Former-commit-id: 40a55a68e8 [formerly 4a2d3cd071] [formerly 178e1688c450a9e861bb089ca84a1c5258705ee0 [formerly f95cba545b]]
Former-commit-id: b85fa21cceb7be4f0772063aef314c591642059b [formerly 4653f3dd4f]
Former-commit-id: e839afd355
2012-03-27 08:36:15 -05:00
Nate Jensen
df50b19661 Merge "Issue #232 - Added JAXB serialization support" into 11-Collaboration
Former-commit-id: f9aa0e1d4c [formerly 4073ba7e7d] [formerly 978b76066c] [formerly f9aa0e1d4c [formerly 4073ba7e7d] [formerly 978b76066c] [formerly ed44b0d93f [formerly 978b76066c [formerly 096bb25790809f6f0919d518a29dca4f36bbd7f7]]]]
Former-commit-id: ed44b0d93f
Former-commit-id: 811c0bff6d [formerly d62fc78291] [formerly 54c68ee512f0450e40dde713319fad1e53eb4602 [formerly 8b06b02281]]
Former-commit-id: e8a823ab74eb5ce0f3c9ff95184233e2e16f6e64 [formerly 0805c13d39]
Former-commit-id: 009ae65184
2012-03-27 08:32:19 -05:00
Roger Ferrel
f38ac43930 Issue #244 Tied CollaboratonEditor to the view.
Change-Id: I67b9b2f9f1a71f1f131584cdb138c54788cac165

Former-commit-id: bd96e3040d [formerly 76f9c71d41] [formerly a270259553] [formerly bd96e3040d [formerly 76f9c71d41] [formerly a270259553] [formerly d001287c94 [formerly a270259553 [formerly fd9eb8cbf048ce03bce27c4d1249596f5649d2a7]]]]
Former-commit-id: d001287c94
Former-commit-id: 9817fc2214 [formerly 8dae356572] [formerly a07ca5bee7be77863145825ee6241be901b91e09 [formerly 26122319db]]
Former-commit-id: 71db4aa54d8906f6abd5e0104f0d1dc06224b9ea [formerly ebbf625538]
Former-commit-id: 027e4f4254
2012-03-26 17:30:51 -05:00
Roger Ferrel
d9b1d1715c Issue #244 Localization of login data and removal of messanger and participant listeners.
Change-Id: I247199030152575c82b8320fa0cbdeddb62fa662

Former-commit-id: 05c5b5339d [formerly df5a2662ba] [formerly b180f9b45e] [formerly 05c5b5339d [formerly df5a2662ba] [formerly b180f9b45e] [formerly 95d8d85fd0 [formerly b180f9b45e [formerly 4e4a705b98070d2e671133e6acc29dc72617505a]]]]
Former-commit-id: 95d8d85fd0
Former-commit-id: 9d523d8366 [formerly c132fbf641] [formerly 90b8c63352a86a05c76f20466c3ca0e3dd390d83 [formerly 8f75dd68de]]
Former-commit-id: 55b593bebab15bdffba13c00ef7e1c57d05fac2f [formerly c06762598e]
Former-commit-id: cca7866880
2012-03-26 17:30:50 -05:00
James Korman
be149070fb Issue #232 - Added JAXB serialization support
Former-commit-id: 56dd3e7c15 [formerly fc2bd8c666] [formerly 72e9c2eb52] [formerly 56dd3e7c15 [formerly fc2bd8c666] [formerly 72e9c2eb52] [formerly 221a5a65b0 [formerly 72e9c2eb52 [formerly dd4502d4e7d38df28ebd93340d978653b32cd5f5]]]]
Former-commit-id: 221a5a65b0
Former-commit-id: 83190cb431 [formerly eff90a5c4b] [formerly 47ece3d642df95a9db106bc8ce90b932a97a3afb [formerly 02bbe80c7c]]
Former-commit-id: 51c2957995878ca8ba796bcdda8b8ce89d1f2b27 [formerly 745f256590]
Former-commit-id: 0d10f43adb
2012-03-26 16:48:04 -05:00
Nate Jensen
e1e8d6c091 Issue #427 event controllers use ISharedDisplaySession
Change-Id: Ia0e41dcb7f0b49956a4a3c88a037894b972435c9

Former-commit-id: 1af05f177c [formerly ef03821455] [formerly f6226a89d9] [formerly 1af05f177c [formerly ef03821455] [formerly f6226a89d9] [formerly cbf105015f [formerly f6226a89d9 [formerly bf6cf477825be1d19081965ca9e958ebf423c0af]]]]
Former-commit-id: cbf105015f
Former-commit-id: e93c521327 [formerly ff5fec3f09] [formerly 5385afe9ce1d1a6ded716c4d96c0ce04ff2b6cf7 [formerly e28fc62a56]]
Former-commit-id: f2ba609b9ffdb06232123d1fdbdafaa1a5e08879 [formerly b6be43d0e5]
Former-commit-id: e9f2d75d95
2012-03-26 16:37:44 -05:00
Nate Jensen
422f7ea302 Issue #427 fix xml serialization
Change-Id: I795fe5a47fc2ed678a431795a6242382b3ef6654

Former-commit-id: c43746bbf1 [formerly e24039ae5c] [formerly 7c6e0a41f7] [formerly c43746bbf1 [formerly e24039ae5c] [formerly 7c6e0a41f7] [formerly 2a1e40b2d5 [formerly 7c6e0a41f7 [formerly eb39d19f3940ba57e1322a786d0dd535289b2a1e]]]]
Former-commit-id: 2a1e40b2d5
Former-commit-id: e10704c2fa [formerly ecc3dc9a70] [formerly 5a795729fff7ba187286a7ae5aaad4eeaa8b98a9 [formerly a1e2c3173d]]
Former-commit-id: 0346bf396c82f33647996ebe1c35e2ee67c52e45 [formerly c8b94860a0]
Former-commit-id: 4605f1b00a
2012-03-26 15:47:34 -05:00
Nate Jensen
b134fa347e Issue #427 initial role based event handling
Change-Id: I73d4df3f09c7cfa60025142ec5a4dccdad4423bb

Former-commit-id: e76039c56e [formerly bac31f3613] [formerly 4d7a53c583] [formerly e76039c56e [formerly bac31f3613] [formerly 4d7a53c583] [formerly 619d19e24c [formerly 4d7a53c583 [formerly b752ced02d726771a6e11a9982967a892d2e55f3]]]]
Former-commit-id: 619d19e24c
Former-commit-id: 0e9194429e [formerly 998c9df260] [formerly 4440838cbe883a84c237cc8d0f49c75f814df106 [formerly 62b16fef0d]]
Former-commit-id: d7e2ddbfd4840e5201fa1400a1816256f6e2b4e1 [formerly 2e4e000720]
Former-commit-id: 6580f92e65
2012-03-26 13:05:01 -05:00
James Korman
79af426295 Issue #232 : Large refactor - Add command interfaces
Former-commit-id: a32e1d4b85 [formerly 5bb4a7952b] [formerly e408ed1a28] [formerly a32e1d4b85 [formerly 5bb4a7952b] [formerly e408ed1a28] [formerly d51a8521f8 [formerly e408ed1a28 [formerly e82a81cb465b07710b8b2cd6c99e87f97311d316]]]]
Former-commit-id: d51a8521f8
Former-commit-id: c442754471 [formerly fb0614ad9e] [formerly 4daa44c17ead88be2b1a8e6a6f9f3b84f376b884 [formerly e83de7447b]]
Former-commit-id: 84dd38f7c1603c1515e50f75f66c52a543e3cb1d [formerly 61f8b804cb]
Former-commit-id: 551d38bee3
2012-03-26 10:17:17 -05:00
Roger Ferrel
869cbb9156 Issue #244 Added participant even handler for SessionView and put in code to get groups(rosters).
Change-Id: I4a7501859f2681b290ad0babf4dab9cbca80e102

Former-commit-id: 8d7cad314e [formerly cd66a9c29c] [formerly 04b5a92838] [formerly 8d7cad314e [formerly cd66a9c29c] [formerly 04b5a92838] [formerly ce72b7b583 [formerly 04b5a92838 [formerly a264abfff059a9c5942ef1db91a6390fad12a110]]]]
Former-commit-id: ce72b7b583
Former-commit-id: 15245a25d6 [formerly e649f9da42] [formerly 3e15f252346e997b4631ee9819dc1ded143057fb [formerly 053c4ba597]]
Former-commit-id: 2274356808f6d699c33a0cb2f7dafe5be436ccc5 [formerly 3f08de49fd]
Former-commit-id: ff4822d3ef
2012-03-22 16:57:30 -05:00
Nate Jensen
b54807f36a Issue #427 Share maps and editor
Change-Id: I6bd3148ec199c348ffd85d08322fdb8befa4096c

Former-commit-id: e9b2e70892 [formerly 37d4401747] [formerly 615962f5dd] [formerly e9b2e70892 [formerly 37d4401747] [formerly 615962f5dd] [formerly 0e214bcd7c [formerly 615962f5dd [formerly 7a58d8a17be53fc504cafe32d19de2f52121eeff]]]]
Former-commit-id: 0e214bcd7c
Former-commit-id: 2ba6735324 [formerly 8d94771854] [formerly 2f70306617907f26efb4f42d9c736b68c3f4f5a2 [formerly 2801c4fdfb]]
Former-commit-id: 02922d354abd7bde98ea1ad74b2d1aa2c178b78f [formerly 98fb91164b]
Former-commit-id: 28931de3c6
2012-03-22 09:39:59 -05:00
James Korman
266eef93fa Issue #232 - Delete files from original locations
Former-commit-id: 9c17874f37 [formerly 4dabfd8c2a] [formerly 90b74b258a] [formerly 9c17874f37 [formerly 4dabfd8c2a] [formerly 90b74b258a] [formerly 55f269100c [formerly 90b74b258a [formerly b34ddc7ead0853a152baa8b95c950f9c714a4ff7]]]]
Former-commit-id: 55f269100c
Former-commit-id: ef3fdd7171 [formerly d0976e4703] [formerly 4d86c3e4eddb68e0dd4e867b58d0cb40e7d9c96c [formerly 9badd0fb07]]
Former-commit-id: 17cd4afec08291d9dbd8eb15c752b80e0e01b4d1 [formerly f3f6778df2]
Former-commit-id: 5702fc837c
2012-03-20 14:55:27 -05:00
James Korman
01711bd11f Issue #232 - Considerable refactoring/event processing
Former-commit-id: cbe20ea7ca [formerly 60ff4d139b] [formerly 4ba4ccb404] [formerly cbe20ea7ca [formerly 60ff4d139b] [formerly 4ba4ccb404] [formerly cc5cc2d409 [formerly 4ba4ccb404 [formerly 0b229e6992b40060d43ac560e0a3fa532635f5a1]]]]
Former-commit-id: cc5cc2d409
Former-commit-id: 34eeb34b66 [formerly 8be6351348] [formerly 341fef17dc14e38a04e3f4f94ca5a333eca1128e [formerly c5e9df26c1]]
Former-commit-id: e9fdce70700c9e3594e32595761afa08bbd875e2 [formerly 7f895ac63d]
Former-commit-id: 9d51b9c893
2012-03-20 13:59:55 -05:00
Roger Ferrel
6730ac0a98 Issue #244 Creted AbstarctSessonView and PeerToPeerView. Code clean up so CAVE exits properly.
Change-Id: Ibd5feeb0412e4afbe8e1f0eac79944bb059b4687

Former-commit-id: 3ea86c6609 [formerly ce3b5728c5] [formerly 1f4edd08e4] [formerly 3ea86c6609 [formerly ce3b5728c5] [formerly 1f4edd08e4] [formerly a7f1fc18b1 [formerly 1f4edd08e4 [formerly e92969cb1440f3f6477a7003b031faab6ed484fc]]]]
Former-commit-id: a7f1fc18b1
Former-commit-id: e5a1786d4f [formerly 002e7eab3f] [formerly f37ef7c801a95dba643b2270726b5d75cbb30f5d [formerly 9f6642d572]]
Former-commit-id: cdd69c632a5500993bcb56095ae1f03e5392fb57 [formerly f58fa980f2]
Former-commit-id: 3d8af5815a
2012-03-20 10:42:57 -05:00
Max Schenkelberg
5706cf4610 Issue #422 Set "numericValue" to null in RadarDefaultInterrogator in
case of "NO DATA"

Former-commit-id: a0663a2791 [formerly 468c812dde] [formerly cd6ebd80d4] [formerly a0663a2791 [formerly 468c812dde] [formerly cd6ebd80d4] [formerly b9085db25d [formerly cd6ebd80d4 [formerly 89521a4df36d18ecb64b4cce248f150f0a0e4957]]]]
Former-commit-id: b9085db25d
Former-commit-id: 13f08a98a9 [formerly 81bc45f071] [formerly 46b9ad1c87f0e0eaf7fe167226e5b9dfa00844ed [formerly 954073b38c]]
Former-commit-id: d43b048af219f6ced6cf70ae84cf53f92bf3cae7 [formerly 645900727c]
Former-commit-id: 8878a9732d
2012-03-16 10:13:31 -05:00
Max Schenkelberg
893bc3d143 Issue #358 Fixed sampling issue with mosaic resource with best
res resources

Former-commit-id: 1b8beb3f8d [formerly 97edff9f7c] [formerly cc111ab9ac] [formerly 1b8beb3f8d [formerly 97edff9f7c] [formerly cc111ab9ac] [formerly 258d57e825 [formerly cc111ab9ac [formerly 8aaf5e65d7c8ecbced6252d4a98af6223c77d5a0]]]]
Former-commit-id: 258d57e825
Former-commit-id: 712815ee18 [formerly 4e81d2432c] [formerly 6ca4a7d453c44b2e3a855ba1e88fd28485927549 [formerly 1e5c074e3b]]
Former-commit-id: 98df734d7d4b6cec5aaffaedd02aad173354c879 [formerly a3bda1957c]
Former-commit-id: e220ddf515
2012-03-16 09:03:50 -05:00
Max Schenkelberg
6b7a3c0976 Issue #358 Fixed painting and sampling regression in radar mosaic due to
core improvements from NPP in GL mosaic imaging extension and discovered
while testing IMesh improvements

Former-commit-id: 732c2ddb5c [formerly 10b720381b] [formerly 719f87c261] [formerly 732c2ddb5c [formerly 10b720381b] [formerly 719f87c261] [formerly 556a270a09 [formerly 719f87c261 [formerly f739d79bfd547adc295c716a1804f55f09b1bde1]]]]
Former-commit-id: 556a270a09
Former-commit-id: f51a9e5571 [formerly a4b859ae54] [formerly c943e46db5cb54b3fb026d1fe63057721df3c99d [formerly ba8af4dcc1]]
Former-commit-id: 0c6e6c289a70731ede2efaff64d0abccd158358b [formerly 682aca1dda]
Former-commit-id: d585d19f48
2012-03-14 18:03:44 -05:00
Nate Jensen
78a6e2b3d0 Merge "Issue #232 - Added guava lib project - Adding error checking/reporting - Added VenueInitationListener" into 11-Collaboration
Former-commit-id: d73d150241 [formerly feeb8cba7e] [formerly 8f8e690470] [formerly d73d150241 [formerly feeb8cba7e] [formerly 8f8e690470] [formerly dc62171533 [formerly 8f8e690470 [formerly 62d92c57d9d004427a74fc0353e2ca94411bf488]]]]
Former-commit-id: dc62171533
Former-commit-id: e142a16d66 [formerly 77a50a5e25] [formerly edbe99a40abf943e962f6ce713562626cac22991 [formerly 8d78571942]]
Former-commit-id: 38bf5250dc163856711cedd1ff3e0f4444994345 [formerly 7f88a56232]
Former-commit-id: 8e796d06de
2012-03-14 11:23:55 -05:00
Matt Nash
72bbfde15b Issue #244 icons and login changes
Former-commit-id: 0e68f12509 [formerly f5c9cfd285] [formerly e06101f9c3] [formerly 0e68f12509 [formerly f5c9cfd285] [formerly e06101f9c3] [formerly 2fd6e28569 [formerly e06101f9c3 [formerly ef2993a8545265adbc325080765baef0ee939923]]]]
Former-commit-id: 2fd6e28569
Former-commit-id: 503b172a11 [formerly d6ef74a95b] [formerly 9ec069a70a96b24f2d5167df34cd67f927eb2dda [formerly 5b949aeacf]]
Former-commit-id: 99ba9fd145f667cef654e45711f302b6721ea0b9 [formerly ab5e4cb2de]
Former-commit-id: 1236a90d7e
2012-03-14 10:54:13 -05:00
James Korman
f58209af03 Issue #232 - Added guava lib project - Adding error checking/reporting - Added VenueInitationListener
Former-commit-id: 4756721ef6 [formerly ee20250305] [formerly 095ab0eeab] [formerly 4756721ef6 [formerly ee20250305] [formerly 095ab0eeab] [formerly d6003d1e71 [formerly 095ab0eeab [formerly 92a842f56632399d3b43d7d560dbc5d6bbbd5662]]]]
Former-commit-id: d6003d1e71
Former-commit-id: 860d24bf25 [formerly 578594cdfd] [formerly 5d7c36a75d50d27fdad5a4fa6b944c79100578f6 [formerly b29c262362]]
Former-commit-id: 71b45e798bc6b282639b3003ec5b024a412bd27d [formerly 072c79a582]
Former-commit-id: 0d4ccaf2e6
2012-03-14 10:24:17 -05:00
Max Schenkelberg
42696fd296 Issue #358 Cleaned up mesh extension and API to use geotools for
defining a mesh.  This is better practice than using arbitrary
MathTransform objects as it is well defined and allows for serialization
of the mesh to occur.

Former-commit-id: 5a61f3ae23 [formerly 8fb7eccb73] [formerly 6e5964df9d] [formerly 5a61f3ae23 [formerly 8fb7eccb73] [formerly 6e5964df9d] [formerly 50765e8a34 [formerly 6e5964df9d [formerly 7e4abe637edacca71e1e1c98d99521cd33415fb0]]]]
Former-commit-id: 50765e8a34
Former-commit-id: 458f5970aa [formerly 8f08fab0a7] [formerly 87c83af55da8aec24c975aa2f80b06b4449fa969 [formerly cf440b3884]]
Former-commit-id: 732d389245ce92a580088b9302b87702dca2b03d [formerly 6378e8c4ee]
Former-commit-id: 9366a5f308
2012-03-14 09:49:32 -05:00
Roger Ferrel
45ae943d31 Issue #244 Close Session connction when view closed. Tighen up dialogs.
Change-Id: I874058fde36f521cfd4bbbf602798896b6887be5

Former-commit-id: bdc8744ea6 [formerly 186aac5b77] [formerly 97a3884017] [formerly bdc8744ea6 [formerly 186aac5b77] [formerly 97a3884017] [formerly c321d2aacf [formerly 97a3884017 [formerly 486b2186014a14a845e48dac222c293a7891e39e]]]]
Former-commit-id: c321d2aacf
Former-commit-id: 56421e0e85 [formerly a64f2e6070] [formerly 0d5bd2eff5ad104e085cbcb075e99e36774a84b0 [formerly b21f1555e2]]
Former-commit-id: a195f6d30eac1ce4c469f36654761adb91de27dc [formerly 8474561724]
Former-commit-id: 69552760cd
2012-03-14 09:26:23 -05:00
Steve Harris
31c739aec3 Issue #16 - Recovering mpduff 9-Wes2Bridge code that fell out of a rebase while fixing a review set
Former-commit-id: 229fa2944d [formerly 6d2af585b1] [formerly 5bbf80a384] [formerly 229fa2944d [formerly 6d2af585b1] [formerly 5bbf80a384] [formerly 10dc140747 [formerly 5bbf80a384 [formerly a8ca6db2b2df5f7bd8a6a2fec3496dc1f37aa20c]]]]
Former-commit-id: 10dc140747
Former-commit-id: 4d58cdca1b [formerly 7fc8cf3d94] [formerly 80cb0b251d26c0d96f2c7ee6601e3e0f30708bf4 [formerly 7bdde9f690]]
Former-commit-id: 3641f7427bca19a3448d6e5ab052df768969a1af [formerly a97a9f80c9]
Former-commit-id: 749ee2f4f4
2012-03-12 13:10:34 -05:00
Matt Nash
9ae8f5e381 Issue #244 new icons for collaboration
Former-commit-id: 8271eb002a [formerly 6398c01aec] [formerly 79f1cbec74] [formerly 8271eb002a [formerly 6398c01aec] [formerly 79f1cbec74] [formerly 39bce3d793 [formerly 79f1cbec74 [formerly da2177babfe9fa8b7efbad9bf9d938e4ecb4313b]]]]
Former-commit-id: 39bce3d793
Former-commit-id: 00e3ac6c24 [formerly c743c0c44b] [formerly 464bc504c69009a8a5c6135d429a9919623a9dd1 [formerly 22eb44eb26]]
Former-commit-id: efad84a1d7fdb706af034401bff586e1397a05db [formerly cd16dd73a4]
Former-commit-id: 164c1d3715
2012-03-12 08:03:54 -05:00
Max Schenkelberg
714bb7dfec Issue #358 Merging core drawing API improvements from Collaboration
Former-commit-id: 3beecc1cdf [formerly 18805c68f7] [formerly d43b0456d8] [formerly 3beecc1cdf [formerly 18805c68f7] [formerly d43b0456d8] [formerly 89f603f448 [formerly d43b0456d8 [formerly a266a93ec2dca3ffbd7d2fd1f9dc47d7e18e6904]]]]
Former-commit-id: 89f603f448
Former-commit-id: 8b6aa63464 [formerly f78b932abb] [formerly 69a2b029e678fdd8a18305144330e4c95774ec78 [formerly 4662ece060]]
Former-commit-id: 633ae123a39ad609c62c4173a428f3bfbc1fedbd [formerly 1303289d12]
Former-commit-id: 0f005d3521
2012-03-09 12:31:50 -06:00
Roger Ferrel
c96ba2b334 Issue #244 Bug Fix.
Change-Id: Ic144fc7354f12aec2c5dd76997b38977c8b2986c

Former-commit-id: 118c5abe09 [formerly 1871be89e7] [formerly be9fe19d9a] [formerly 118c5abe09 [formerly 1871be89e7] [formerly be9fe19d9a] [formerly d17ef23899 [formerly be9fe19d9a [formerly 3ecb104c403decb5889cf9d97d3a1dd2b9114b85]]]]
Former-commit-id: d17ef23899
Former-commit-id: 3fa7fe49be [formerly e8887a6189] [formerly 2b16c0e3112c6a98ed1c1384c2103bb389942c83 [formerly 6c8db0d6a4]]
Former-commit-id: d4a9c17eda3d83b7577d9a82e6a6bdb7de293585 [formerly c692a2da94]
Former-commit-id: c828bfb110
2012-03-08 17:16:48 -06:00
Roger Ferrel
bf3f90e199 Issue #244 Added join and refresh actions.
Change-Id: I85b9c07f73319fc9c7ff3c61cda452e6990e7f20

Former-commit-id: c8b8a30875 [formerly 71a5524380] [formerly f492b082dc] [formerly c8b8a30875 [formerly 71a5524380] [formerly f492b082dc] [formerly f04f775a66 [formerly f492b082dc [formerly 4854c999ed0128c8b639f8b070ec4738591d9ff4]]]]
Former-commit-id: f04f775a66
Former-commit-id: 21e9061d08 [formerly d6a4919b9a] [formerly 6a269d0f74acd65b94c33c6edfce2cdfd2153abb [formerly 674cc116b2]]
Former-commit-id: def6a874ed7dd0b6205b63cd88c907d96d56d464 [formerly 31c8dddd6c]
Former-commit-id: 59c235974b
2012-03-08 12:37:56 -06:00
Matt Nash
2867701200 Issue #244 added work on the chat for presence notifications
Former-commit-id: b8cb02de4c [formerly c96c33169b] [formerly d264743199] [formerly b8cb02de4c [formerly c96c33169b] [formerly d264743199] [formerly 6f354374d6 [formerly d264743199 [formerly ead836fb1bc7f5843a29dc26cf3d634c80e22a81]]]]
Former-commit-id: 6f354374d6
Former-commit-id: bf1a187e49 [formerly b4a5aaea11] [formerly 855d12bbe7f26f52a1fcdfe7ec7faffbaff0c8fb [formerly 4f35191a6b]]
Former-commit-id: 78722ee5b5485ad72c94f535de43c1d8df3b2f35 [formerly 825570f37c]
Former-commit-id: f060c674d7
2012-03-08 09:08:41 -06:00
Matt Nash
c592c351e5 Merge "Issue #244 update" into 11-Collaboration
Former-commit-id: b73877e9a5 [formerly 1e4472cd78] [formerly 04ae9b48ea] [formerly b73877e9a5 [formerly 1e4472cd78] [formerly 04ae9b48ea] [formerly bbacd337b4 [formerly 04ae9b48ea [formerly f1c93e1e97f5f6cc2cf8b4d9a0d14ea93863d173]]]]
Former-commit-id: bbacd337b4
Former-commit-id: 0ef60a57f3 [formerly dd57ff6b7f] [formerly b87a5a6e0ba1906d19de0e9c7ce07edc116f66e4 [formerly 7efd993e18]]
Former-commit-id: 42419e5ff88ea6413c1c608cfd1a1bd922f161c8 [formerly 9ec70444da]
Former-commit-id: 347a36704a
2012-03-08 08:33:32 -06:00
Roger Ferrel
4141f698d2 Issue #244 update
Change-Id: I6f92dbd64d95cc853f6dcf43d39c209607a70105

Former-commit-id: b1a69aafff [formerly c22d5ef573] [formerly c9459e2e8c] [formerly b1a69aafff [formerly c22d5ef573] [formerly c9459e2e8c] [formerly 2114b95a0b [formerly c9459e2e8c [formerly 28969960d80066def0ef02930875e40d7693c234]]]]
Former-commit-id: 2114b95a0b
Former-commit-id: ab81628692 [formerly 40b910c05e] [formerly 9c709d5af9cfb0e1e37a724c243c0fbbb12057a5 [formerly 1a2608a2fa]]
Former-commit-id: 167604570df5cb15f9ed2339b8f92afdef5e0f49 [formerly 890f2bffb9]
Former-commit-id: 12df2e3f0b
2012-03-08 08:30:02 -06:00
James Korman
e1d06f7ede Issue #232 Initial collaboration framework plugin checkin
Former-commit-id: 373f5b4060 [formerly 4368616970] [formerly 526a2633ce] [formerly 373f5b4060 [formerly 4368616970] [formerly 526a2633ce] [formerly 5a91d71c12 [formerly 526a2633ce [formerly 2351a53e68bbc8cfe11917d202cbc5424768b5a6]]]]
Former-commit-id: 5a91d71c12
Former-commit-id: 7a91f24e27 [formerly f242c1a430] [formerly 30ad0a0f992968ee55254e2e103edff30614f710 [formerly 2fea86a591]]
Former-commit-id: 344796166471e73d32ced316f8c6095cb8561054 [formerly e40ee702aa]
Former-commit-id: fe7db93589
2012-03-07 15:38:20 -06:00
Nate Jensen
fb69a4c0e9 Merge "Issue #244 Inital creation" into 11-Collaboration
Former-commit-id: a448a80004 [formerly 13228ab7cc] [formerly f950b30463] [formerly a448a80004 [formerly 13228ab7cc] [formerly f950b30463] [formerly 412ceb9561 [formerly f950b30463 [formerly 3a87a9a75f96d72a3f4bb378f9d2c913b441a5e3]]]]
Former-commit-id: 412ceb9561
Former-commit-id: 1747d01347 [formerly 39f89588a1] [formerly 9ce5eb6c5b02138237e3f9860e90c4d32e19f1ee [formerly d0672cf2b6]]
Former-commit-id: 50c36e22454fb8dff5105b152e2ad9e94061b010 [formerly 54ab82c837]
Former-commit-id: 9c3c717032
2012-03-06 14:27:15 -06:00
Roger Ferrel
8a3106597f Issue #244 Inital creation
Change-Id: Ib73fdcccc4e5b521deae2249024bdd1464996ab4

Former-commit-id: 5e63f5b576 [formerly c62418dcf3] [formerly c26e98376e] [formerly 5e63f5b576 [formerly c62418dcf3] [formerly c26e98376e] [formerly 3161380f4d [formerly c26e98376e [formerly 25cee2c90c2403e31f27b67fd49d312d31baa575]]]]
Former-commit-id: 3161380f4d
Former-commit-id: f406bca886 [formerly 0cf600a16c] [formerly c93492e46d7634f4442b5821cc164ccf698b4647 [formerly ccfadae952]]
Former-commit-id: bc19aec92806023c18ecd79ed56f4c1f0e6131e4 [formerly 8395a3937e]
Former-commit-id: 192093aa37
2012-03-06 14:08:39 -06:00
David Gillingham
65b8db12e8 Issue #354: Refactor AbstractParmManager to better handle ISC parm
pre-loading.

Former-commit-id: 364b9e19b3 [formerly 1908212c27] [formerly d68e3a7eea] [formerly 364b9e19b3 [formerly 1908212c27] [formerly d68e3a7eea] [formerly 494fbe93db [formerly d68e3a7eea [formerly e2c66b33fd8c71b0da6518c419296ab8141a07e3]]]]
Former-commit-id: 494fbe93db
Former-commit-id: e0987cc993 [formerly 29f03b0d2a] [formerly 22e522451d0eb5f0c7b3b2a357bfc73d015795c9 [formerly bc61eb1e43]]
Former-commit-id: c6da80d0d4984844822b65b3e0c4d22fd8ce459b [formerly ad8efe180e]
Former-commit-id: 678953ae76
2012-03-05 11:23:11 -06:00
David Gillingham
4ed8de501b Issue #346: Convert GFE to use identity-based ListenerLists, increase
synchronization in Parm/VCParm to prevent leaking of VCParms through
ListenerLists.

Former-commit-id: 87de9d067b [formerly bd01975367] [formerly f6f0ca24df] [formerly 87de9d067b [formerly bd01975367] [formerly f6f0ca24df] [formerly 0c0f659896 [formerly f6f0ca24df [formerly 5fc74409511903afa97949bc3cd1b3acf91c35e0]]]]
Former-commit-id: 0c0f659896
Former-commit-id: f670f3c950 [formerly bce9ad39ae] [formerly de321dd91cb8346ac092574ed9b7c81299c63edf [formerly b3df043f97]]
Former-commit-id: 26f66133ee05397f66e892ce87225a06441ee4f2 [formerly 788007ff63]
Former-commit-id: 0b79b9ea21
2012-03-02 13:22:46 -06:00
Max Schenkelberg
67b1edb767 Issue #358 Committing NPP core rendering improvements merged with Thin
Client core improvements

Former-commit-id: fe1811c167 [formerly e2cd95d3f4] [formerly ae47d9683e] [formerly fe1811c167 [formerly e2cd95d3f4] [formerly ae47d9683e] [formerly 48b6d45f00 [formerly ae47d9683e [formerly 206bd0450140b6bcdb3ec8f1e1e417c4c37746d6]]]]
Former-commit-id: 48b6d45f00
Former-commit-id: 52c7dec2e8 [formerly 0554abdde0] [formerly 22d12e35f7b0f5789a9dd62c8684fad371d63859 [formerly 3212cc6ebb]]
Former-commit-id: de90ce0a3f7817cfc15c75089e7f6a081fef0acc [formerly 585e979c76]
Former-commit-id: ae389f0b57
2012-03-01 16:59:40 -06:00
Steve Harris
4ee0ec25ea Merge branch 'ss_sync' into sync_test
Former-commit-id: 994e79cfb3 [formerly 3b9c3e3474] [formerly 951ecfe3dd] [formerly 994e79cfb3 [formerly 3b9c3e3474] [formerly 951ecfe3dd] [formerly 787aed90f8 [formerly 951ecfe3dd [formerly 7ebcf63686d75d58f8bfea92e825edaf49a30df1]]]]
Former-commit-id: 787aed90f8
Former-commit-id: 6fdae68267 [formerly b3f831a7b4] [formerly 64c60f8d4b42c0f811914474c3baf46e1940786e [formerly db45babec8]]
Former-commit-id: 840d838fc0fb5c246c5a324aa5695ebb80f9cd44 [formerly 376edad3c9]
Former-commit-id: cdc4d1cb44
2012-03-01 14:01:16 -06:00
Steve Harris
ddca739093 Merge branch '4-Thin_Client' into 104-integration
Former-commit-id: 5bf956755a [formerly 8794c4bcf6] [formerly c21bd2719c] [formerly 5bf956755a [formerly 8794c4bcf6] [formerly c21bd2719c] [formerly 9bdea0399f [formerly c21bd2719c [formerly c6eacfe2d5898deacf756f059a71b1c9f41500bb]]]]
Former-commit-id: 9bdea0399f
Former-commit-id: 13597e2d3d [formerly fe0b1eed94] [formerly 79ca895e04be795aebb8555aa0b0ba51850c543e [formerly 6f5c182af0]]
Former-commit-id: 06451943fd06a64b038ac1ecd053dc62e0c6d417 [formerly 6cdedca0a3]
Former-commit-id: 9ce7c680d7
2012-03-01 13:19:04 -06:00
Ben Steffensmeier
94770ece64 Issue #353 apply the server time offset before requesting updates instead of after so that way there is no time gap for the first request
Change-Id: I3ceb8cefbedc3b64ca207c559e8cd381f6f184fd

Former-commit-id: 5395e71757 [formerly aa90109f45] [formerly 49cce84edf] [formerly 5395e71757 [formerly aa90109f45] [formerly 49cce84edf] [formerly 7c2409eab0 [formerly 49cce84edf [formerly 059b4fcb3224b37b4a235f57e2065b9506f29d46]]]]
Former-commit-id: 7c2409eab0
Former-commit-id: 6ec01d1d19 [formerly f8c2ad7136] [formerly 691ebf923ce51c7c2978a0c30511852ac7042b3c [formerly 3220ee4745]]
Former-commit-id: b51eb6e37b89c7532969074ffcbece5003a934be [formerly e0ad3aee33]
Former-commit-id: 4e0ec11a6f
2012-03-01 12:44:43 -06:00
Steve Harris
a92abefb52 Merge branch '4-Thin_Client' into 104-integration
Former-commit-id: 27fb50d455 [formerly 98d1fbeb0e] [formerly 703cb6e748] [formerly 27fb50d455 [formerly 98d1fbeb0e] [formerly 703cb6e748] [formerly dd52eb4d40 [formerly 703cb6e748 [formerly 152f05b5ab3dc736f1d3d21dba09de79d98d4c9e]]]]
Former-commit-id: dd52eb4d40
Former-commit-id: f5db44b7aa [formerly 3e4d618486] [formerly fe7d53e8a206e849dc25fe40d0bef8cfe7ab3606 [formerly 06baad5169]]
Former-commit-id: eee203cb31afb34d2d81e92c3211de866f2b3b6f [formerly a4d8f58c90]
Former-commit-id: 3306848158
2012-02-29 16:08:39 -06:00
Ben Steffensmeier
029c938b45 Issue #353 add logic to syncronize times for thin client data updates..
Change-Id: Id1f8e31bc95f0b0262821050be6660bfe66df9d1

Former-commit-id: 07d98eb7dc [formerly 56d97c95d5] [formerly 5c303ed189] [formerly 07d98eb7dc [formerly 56d97c95d5] [formerly 5c303ed189] [formerly c61e40c426 [formerly 5c303ed189 [formerly f94248823eed52b2d9f8c56af3dc7607b323fc1e]]]]
Former-commit-id: c61e40c426
Former-commit-id: cc8e7897cf [formerly 390700efb0] [formerly bc3ac83b421a21ffdbc670c12096f7c96ca7c87f [formerly 84e6c9beb8]]
Former-commit-id: d164073f91d0b2a6b493c5bba3ad3cafd728023d [formerly 588432f980]
Former-commit-id: da7275d80b
2012-02-29 15:49:47 -06:00