Commit graph

82 commits

Author SHA1 Message Date
Nate Jensen
14883dfa58 Issue #427 clean up
Change-Id: Id4bc3b27bfcbc324138a11998255a6f662f31255

Former-commit-id: d60fcaa4f3 [formerly 9eb405723f355343545b1f9d4fe3925d9d1a1f24]
Former-commit-id: a85aa4595f
2012-03-29 15:45:16 -05:00
Nate Jensen
25cf424a42 Merge "Issue #429 added wrong cursor code" into 11-Collaboration
Former-commit-id: b7fda1f852 [formerly d99655bcb8042378594ef31ad52305120808ca7e]
Former-commit-id: 9ce74d9430
2012-03-29 14:36:24 -05:00
Steve Harris
fbdf4d5c37 Issue #244 Roster groups now display and improved presents.
Change-Id: I7965201692cab4472ce85d2525e39cf3823ab16f

Former-commit-id: bf55bc0d86 [formerly 7f4e485aae341b11beb4a55c895a86cd6ff13635]
Former-commit-id: c27ee0903c
2012-03-29 14:36:53 -05:00
Matt Nash
acf376e126 Issue #429 added wrong cursor code
Former-commit-id: 4e003f8723 [formerly 88143adba6d493b49f87da30773bdd205a6e7948]
Former-commit-id: 3d81840532
2012-03-29 13:46:21 -05:00
Matt Nash
18291c4101 Issue #429 fix proxied handler error, added toolbar for drawing tool
Former-commit-id: 89d401550a [formerly 5728e687e79a54da8313b444a48db18c6671e79e]
Former-commit-id: 9beef61917
2012-03-29 12:24:27 -05:00
Nate Jensen
6aae45687a Issue #427 Right click on editor tab support
Change-Id: Ia9240a01c145c81bbf98268d4df5fd2242ca7987

Former-commit-id: d2d3a245b3 [formerly 7597db5bbc0642072143e4c7ea0291108154eb40]
Former-commit-id: aa000b4b06
2012-03-29 10:44:08 -05:00
James Korman
7f12149d98 Issue #232 - Added message routing/corrected roster creation
Former-commit-id: b45ea1e0a7 [formerly b7040976e3c8fd029a0d821511f977cfd4b4888e]
Former-commit-id: 6149d30b13
2012-03-29 10:16:15 -05:00
Nate Jensen
ec0896c28d Merge "Issue #429 telestrator merging" into 11-Collaboration
Former-commit-id: cf880ddd0d [formerly eda16f8aa5a9aa88a8e947070d8e9df32c36c114]
Former-commit-id: 676746126c
2012-03-28 15:10:34 -05:00
Matt Nash
aeb022880c Issue #429 telestrator merging
Change-Id: I18f8f283db617d0865b274dcf6003a24e2cf2028

Former-commit-id: d55dab5c34 [formerly b1a679a2e37bdd7a887fffe82a3d735cdb60f7f9]
Former-commit-id: 39670f6755
2012-03-28 15:09:18 -05:00
Nate Jensen
a5d38a0968 Issue #427 initial input event code
Change-Id: I37dc96ed8dbef37d8e3f7a8ae39fc6fcad59f4aa

Former-commit-id: 5fdc253d77 [formerly 6297c04332bb349d8351b07e2ffd1c24c046ccd7]
Former-commit-id: bbf96992ee
2012-03-28 14:34:25 -05:00
Roger Ferrel
9712ba2751 Issue #244 Clean up and Link editor to chat now works.
Change-Id: I23b12fa44b8908b6a0c5ce79ca79ad73ff26df9d

Former-commit-id: 5d95a69f39 [formerly 51e85606ad7d7462ce84bb14bd4df0c792997a59]
Former-commit-id: dc2f3316e6
2012-03-28 11:23:51 -05:00
James Korman
0ff25a5258 Issue #232 - Added addition peer-to-peer events
Former-commit-id: e8b23e3687 [formerly 34994534b7e9b80b96e5ca038afef1977ba02383]
Former-commit-id: ae6eddcd68
2012-03-27 16:31:26 -05:00
Nate Jensen
a692caba1c Issue #427 minor fixes
Change-Id: I9788992b2de751f75ab2cc5112f2cf0492c214ad

Former-commit-id: fa8b5b3400 [formerly 40e9906f41f0fa2ae4c87d3c2a2acb2406fd4e25]
Former-commit-id: 0f25c8ffa6
2012-03-27 09:56:46 -05:00
Nate Jensen
9602216cda Issue #427 small improvements
Change-Id: I9a28888dceb268ab62f60bc9686b0130da01ca0e

Former-commit-id: 89d7f5ec7e [formerly 3a268a54417ee7ed6fcef6549b9c47b86fadfc82]
Former-commit-id: 80500eec9c
2012-03-27 09:42:39 -05:00
Nate Jensen
43b58266c5 Merge "Issue #244 Tied CollaboratonEditor to the view." into 11-Collaboration
Former-commit-id: c6e046f11e [formerly f5ace8ee9561bb02311414ac82b0bbe93a5ff3b6]
Former-commit-id: b2655debe8
2012-03-27 08:36:25 -05:00
Nate Jensen
f95cba545b Merge "Issue #244 Localization of login data and removal of messanger and participant listeners." into 11-Collaboration
Former-commit-id: d40b15acc2 [formerly 9dc29b49a619cca5613e72858099029b4ffc724e]
Former-commit-id: d09c8a9383
2012-03-27 08:36:15 -05:00
Nate Jensen
8b06b02281 Merge "Issue #232 - Added JAXB serialization support" into 11-Collaboration
Former-commit-id: 978b76066c [formerly 096bb25790809f6f0919d518a29dca4f36bbd7f7]
Former-commit-id: ed44b0d93f
2012-03-27 08:32:19 -05:00
Roger Ferrel
26122319db Issue #244 Tied CollaboratonEditor to the view.
Change-Id: I67b9b2f9f1a71f1f131584cdb138c54788cac165

Former-commit-id: a270259553 [formerly fd9eb8cbf048ce03bce27c4d1249596f5649d2a7]
Former-commit-id: d001287c94
2012-03-26 17:30:51 -05:00
Roger Ferrel
8f75dd68de Issue #244 Localization of login data and removal of messanger and participant listeners.
Change-Id: I247199030152575c82b8320fa0cbdeddb62fa662

Former-commit-id: b180f9b45e [formerly 4e4a705b98070d2e671133e6acc29dc72617505a]
Former-commit-id: 95d8d85fd0
2012-03-26 17:30:50 -05:00
James Korman
02bbe80c7c Issue #232 - Added JAXB serialization support
Former-commit-id: 72e9c2eb52 [formerly dd4502d4e7d38df28ebd93340d978653b32cd5f5]
Former-commit-id: 221a5a65b0
2012-03-26 16:48:04 -05:00
Nate Jensen
e28fc62a56 Issue #427 event controllers use ISharedDisplaySession
Change-Id: Ia0e41dcb7f0b49956a4a3c88a037894b972435c9

Former-commit-id: f6226a89d9 [formerly bf6cf477825be1d19081965ca9e958ebf423c0af]
Former-commit-id: cbf105015f
2012-03-26 16:37:44 -05:00
Nate Jensen
a1e2c3173d Issue #427 fix xml serialization
Change-Id: I795fe5a47fc2ed678a431795a6242382b3ef6654

Former-commit-id: 7c6e0a41f7 [formerly eb39d19f3940ba57e1322a786d0dd535289b2a1e]
Former-commit-id: 2a1e40b2d5
2012-03-26 15:47:34 -05:00
Nate Jensen
62b16fef0d Issue #427 initial role based event handling
Change-Id: I73d4df3f09c7cfa60025142ec5a4dccdad4423bb

Former-commit-id: 4d7a53c583 [formerly b752ced02d726771a6e11a9982967a892d2e55f3]
Former-commit-id: 619d19e24c
2012-03-26 13:05:01 -05:00
James Korman
e83de7447b Issue #232 : Large refactor - Add command interfaces
Former-commit-id: e408ed1a28 [formerly e82a81cb465b07710b8b2cd6c99e87f97311d316]
Former-commit-id: d51a8521f8
2012-03-26 10:17:17 -05:00
Roger Ferrel
053c4ba597 Issue #244 Added participant even handler for SessionView and put in code to get groups(rosters).
Change-Id: I4a7501859f2681b290ad0babf4dab9cbca80e102

Former-commit-id: 04b5a92838 [formerly a264abfff059a9c5942ef1db91a6390fad12a110]
Former-commit-id: ce72b7b583
2012-03-22 16:57:30 -05:00
Nate Jensen
2801c4fdfb Issue #427 Share maps and editor
Change-Id: I6bd3148ec199c348ffd85d08322fdb8befa4096c

Former-commit-id: 615962f5dd [formerly 7a58d8a17be53fc504cafe32d19de2f52121eeff]
Former-commit-id: 0e214bcd7c
2012-03-22 09:39:59 -05:00
James Korman
9badd0fb07 Issue #232 - Delete files from original locations
Former-commit-id: 90b74b258a [formerly b34ddc7ead0853a152baa8b95c950f9c714a4ff7]
Former-commit-id: 55f269100c
2012-03-20 14:55:27 -05:00
James Korman
c5e9df26c1 Issue #232 - Considerable refactoring/event processing
Former-commit-id: 4ba4ccb404 [formerly 0b229e6992b40060d43ac560e0a3fa532635f5a1]
Former-commit-id: cc5cc2d409
2012-03-20 13:59:55 -05:00
Roger Ferrel
9f6642d572 Issue #244 Creted AbstarctSessonView and PeerToPeerView. Code clean up so CAVE exits properly.
Change-Id: Ibd5feeb0412e4afbe8e1f0eac79944bb059b4687

Former-commit-id: 1f4edd08e4 [formerly e92969cb1440f3f6477a7003b031faab6ed484fc]
Former-commit-id: a7f1fc18b1
2012-03-20 10:42:57 -05:00
Nate Jensen
8d78571942 Merge "Issue #232 - Added guava lib project - Adding error checking/reporting - Added VenueInitationListener" into 11-Collaboration
Former-commit-id: 8f8e690470 [formerly 62d92c57d9d004427a74fc0353e2ca94411bf488]
Former-commit-id: dc62171533
2012-03-14 11:23:55 -05:00
Matt Nash
5b949aeacf Issue #244 icons and login changes
Former-commit-id: e06101f9c3 [formerly ef2993a8545265adbc325080765baef0ee939923]
Former-commit-id: 2fd6e28569
2012-03-14 10:54:13 -05:00
James Korman
b29c262362 Issue #232 - Added guava lib project - Adding error checking/reporting - Added VenueInitationListener
Former-commit-id: 095ab0eeab [formerly 92a842f56632399d3b43d7d560dbc5d6bbbd5662]
Former-commit-id: d6003d1e71
2012-03-14 10:24:17 -05:00
Roger Ferrel
b21f1555e2 Issue #244 Close Session connction when view closed. Tighen up dialogs.
Change-Id: I874058fde36f521cfd4bbbf602798896b6887be5

Former-commit-id: 97a3884017 [formerly 486b2186014a14a845e48dac222c293a7891e39e]
Former-commit-id: c321d2aacf
2012-03-14 09:26:23 -05:00
Matt Nash
22eb44eb26 Issue #244 new icons for collaboration
Former-commit-id: 79f1cbec74 [formerly da2177babfe9fa8b7efbad9bf9d938e4ecb4313b]
Former-commit-id: 39bce3d793
2012-03-12 08:03:54 -05:00
Roger Ferrel
6c8db0d6a4 Issue #244 Bug Fix.
Change-Id: Ic144fc7354f12aec2c5dd76997b38977c8b2986c

Former-commit-id: be9fe19d9a [formerly 3ecb104c403decb5889cf9d97d3a1dd2b9114b85]
Former-commit-id: d17ef23899
2012-03-08 17:16:48 -06:00
Roger Ferrel
674cc116b2 Issue #244 Added join and refresh actions.
Change-Id: I85b9c07f73319fc9c7ff3c61cda452e6990e7f20

Former-commit-id: f492b082dc [formerly 4854c999ed0128c8b639f8b070ec4738591d9ff4]
Former-commit-id: f04f775a66
2012-03-08 12:37:56 -06:00
Matt Nash
4f35191a6b Issue #244 added work on the chat for presence notifications
Former-commit-id: d264743199 [formerly ead836fb1bc7f5843a29dc26cf3d634c80e22a81]
Former-commit-id: 6f354374d6
2012-03-08 09:08:41 -06:00
Matt Nash
7efd993e18 Merge "Issue #244 update" into 11-Collaboration
Former-commit-id: 04ae9b48ea [formerly f1c93e1e97f5f6cc2cf8b4d9a0d14ea93863d173]
Former-commit-id: bbacd337b4
2012-03-08 08:33:32 -06:00
Roger Ferrel
1a2608a2fa Issue #244 update
Change-Id: I6f92dbd64d95cc853f6dcf43d39c209607a70105

Former-commit-id: c9459e2e8c [formerly 28969960d80066def0ef02930875e40d7693c234]
Former-commit-id: 2114b95a0b
2012-03-08 08:30:02 -06:00
James Korman
2fea86a591 Issue #232 Initial collaboration framework plugin checkin
Former-commit-id: 526a2633ce [formerly 2351a53e68bbc8cfe11917d202cbc5424768b5a6]
Former-commit-id: 5a91d71c12
2012-03-07 15:38:20 -06:00
Nate Jensen
d0672cf2b6 Merge "Issue #244 Inital creation" into 11-Collaboration
Former-commit-id: f950b30463 [formerly 3a87a9a75f96d72a3f4bb378f9d2c913b441a5e3]
Former-commit-id: 412ceb9561
2012-03-06 14:27:15 -06:00
Roger Ferrel
ccfadae952 Issue #244 Inital creation
Change-Id: Ib73fdcccc4e5b521deae2249024bdd1464996ab4

Former-commit-id: c26e98376e [formerly 25cee2c90c2403e31f27b67fd49d312d31baa575]
Former-commit-id: 3161380f4d
2012-03-06 14:08:39 -06:00
Steve Harris
c1e626d256 Merge branch 'ss_sync' (OB12.2.1) into 11-Collaboration
Former-commit-id: 7817380140 [formerly a606419ccbf3cc1503cbe058af2264d0448b31af]
Former-commit-id: fb9896b8c9
2012-02-28 09:55:05 -06:00
Steve Harris
a9b900821a removed .gitignore.orig & cots/uframe-eclipse. Added *.orig files to .gitignore
Former-commit-id: c502603907 [formerly cccea1aa13ad987a8c1f2b06c2dfcaa77967544d]
Former-commit-id: ecb38ba165
2012-02-23 12:45:50 -06:00
Steve Harris
5f6715ed05 Merge branch 'OB12.2.1_test' into ss_sync
Former-commit-id: 6f7f678590 [formerly 76967f2151dcfb275be389c04060ff34be4a5018]
Former-commit-id: 830038b0c6
2012-02-23 07:53:15 -06:00
Bryan Kowal
5ca7ce8373 Issue #202 - no longer attempt to build awips2-edex-ncep-nsharp.
Former-commit-id: 9a63901c0e [formerly 979af119b4da4e99e0ee2f090b9c28c02db7f7a3]
Former-commit-id: cd35220cf7
2012-02-22 17:07:15 -06:00
Steve Harris
aaf2fbd05b creating OB12.2.1 from ss_sync for testing
Former-commit-id: a7b68a50be [formerly 5ea9539870491d7ea3d1a050b700a17d18ecee1d]
Former-commit-id: 1fc25c6cb2
2012-02-22 13:06:47 -06:00
Steve Harris
4450cf8963 Merging SS OB12.2.1 into ss_sync
Former-commit-id: c8aae98741 [formerly 60f30af0c9e3203e2ff623d420165201dff41601]
Former-commit-id: 54be9660f1
2012-02-22 11:14:43 -06:00
Steve Harris
aaead73ec5 Merge branch 14-NCEP into 'ss_sync'
Former-commit-id: 94c2ea985b [formerly a04c1c31c89566279953d2a270df8d652a3a82ff]
Former-commit-id: 9995d22e25
2012-02-22 10:12:49 -06:00
Steve Harris
ff6c744fa7 Merge branch 'ss_sync' (OB12.1.2) into 11-Collaboration
Conflicts:
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/parm/vcparm/IVcModuleArgument.java
Added

Former-commit-id: eca4aef9a8 [formerly d74a1285a30ce98a656668c93c71462e7dc51c2a]
Former-commit-id: e5a5b3eefa
2012-02-20 14:02:14 -06:00