xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
2314 commits 31 branches 40 tags 3.8 GiB
Commit graph

1523 commits

Author SHA1 Message Date
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
Max Schenkelberg
3b9699d896 Issue #239 Start of remote target capabilities 
Former-commit-id: ac1fc79f5b [formerly 6c411ffb07] [formerly d2d03e2c64 [formerly 30b76609cff9a737b8e4190bbfebb5a37a259fad]]
Former-commit-id: d2d03e2c64
Former-commit-id: 5d7e504e89
 2012-04-03 15:11:20 -05:00
Roger Ferrel
034540cb01 Issue #244 Peer to Peer chat implemented. Change Passwor implemtned. 
Change-Id: I4949d5ff82a1046d344cd63e32842b2d67717681

Former-commit-id: 1db237e408 [formerly 7d7ee81855] [formerly 9dd257f28a [formerly dde6ebb7a4ce4cdee62b1d4e31d33694c331309e]]
Former-commit-id: 9dd257f28a
Former-commit-id: 813e91d1cc
 2012-04-03 13:28:40 -05:00
Max Schenkelberg
52d1d31d7b Merge branch '11-Collaboration' of ssh://lightning.omaha.us.ray.com:29418/thunder into 11-Collaboration 
Former-commit-id: ccde60b87e [formerly e78aad4bc5] [formerly 138114e3dc [formerly 5bd4a3ccbcb84443eb342670c2a4ea6e083527b7]]
Former-commit-id: 138114e3dc
Former-commit-id: bdc8c572a5
 2012-04-03 13:15:31 -05:00
James Korman
f86eef9ef6 Issue #232 - Corrected problem using participant identifiers 
Former-commit-id: 9387e6154c [formerly b89a89def3] [formerly 96cd7bea11 [formerly 5b102692838b42ffab97186742338494df78b978]]
Former-commit-id: 96cd7bea11
Former-commit-id: 46a646f7f7
 2012-04-03 12:45:00 -05:00
Matt Nash
f11fcc7d8e #429 fix issue where dialog prevents collaboration view from opening, add collaboration drawing layer, use event bus for message handling, prep work for 
Former-commit-id: 217d707198 [formerly 5cb40430a7] [formerly 8e16194370 [formerly be35f7e75bbeb89fe160e24d9ff691f62753c96b]]
Former-commit-id: 8e16194370
Former-commit-id: ce79d3bec3
 2012-04-03 12:23:11 -05:00
Nate Jensen
b740924cdc Issue #427 open editor when joining session 
Change-Id: I6094a7a909584acb8b10236119ec3eb5dd965e59

Former-commit-id: 19bb87346c [formerly 223eb82fe0] [formerly c29a5a75d9 [formerly f1c0549a84b0aa0d4829ca1bc584165ca98dbbb6]]
Former-commit-id: c29a5a75d9
Former-commit-id: 6319166680
 2012-04-03 08:44:58 -05:00
Max Schenkelberg
c7165384f1 Merge branch 'ss_sync (12.3.1)' into 11-Collaboration 
Former-commit-id: c56707c6bc [formerly 23d65caf2e] [formerly 753de872e0 [formerly e8402b080c7d2a712f4f385293aa9b5d1a18484e]]
Former-commit-id: 753de872e0
Former-commit-id: e3477c90ae
 2012-04-02 16:15:21 -05:00
Roger Ferrel
63bfc3a073 Issue #244 Invite form Creat Session dialog implementd. Change code to use ParticipantRole enum. 
Change-Id: If1c7268bded530312d9c132edacef00cd1dcdfd2

Former-commit-id: 6aa7fb3d65 [formerly 146a421ccb] [formerly dbec72645a [formerly 89978ed4bcf7c3b65c6038c6403874ba812f835b]]
Former-commit-id: dbec72645a
Former-commit-id: bd37fffbeb
 2012-04-02 12:13:26 -05:00
Matt Nash
5e3bebc033 Issue #429 fix minor issues with toolbar and updated eraser code 
Former-commit-id: 25a539a1c8 [formerly 27e850d203] [formerly 236ae6f26c [formerly f6f3bcc2596735c8371256f4274c9b9e21445f1a]]
Former-commit-id: 236ae6f26c
Former-commit-id: 0a97f20f3a
 2012-03-30 16:35:02 -05:00
Roger Ferrel
a8b643dc2a Issue #244 Active Sessions node only displays rooms the user is in. 
Change-Id: I2a0ba28e4519102fe26498eb578e83c4a92163a4

Former-commit-id: fac1db8b37 [formerly 442500aeae] [formerly 232df64e22 [formerly 17c8ca27316951cb97c48c8172d669cc65bbd6cd]]
Former-commit-id: 232df64e22
Former-commit-id: 21b19df9db
 2012-03-30 15:06:35 -05:00
James Korman
ae115263ce Issue #232 - Modified invitation methods 
Former-commit-id: a907eeb4ed [formerly 436b967ff1] [formerly 0b6a076129 [formerly 1c9381e1ba1a8b01084717db7ff3e94b26eb0b89]]
Former-commit-id: 0b6a076129
Former-commit-id: 48fb9fe7e4
 2012-03-30 11:27:09 -05:00
Max Schenkelberg
4234b91d5b Issue #358 Fixed merge errors when merging core_exp into ss_sync 
Former-commit-id: 74458bfb73 [formerly 9b0d01f8b5] [formerly 07cf5069ba [formerly beb6a1d49fac8e3e7b2ba8cbc52a8980d06e9885]]
Former-commit-id: 07cf5069ba
Former-commit-id: 993cac891e
 2012-03-30 10:51:31 -05:00
Roger Ferrel
d3a8343de0 Issue #244 Send and accept invites now works. 
Change-Id: I8d2c5e04f0d7dab6eb81a7321130533e5cfd6148

Former-commit-id: dc50eb06d7 [formerly 22fff3a4b8] [formerly 108ac66214 [formerly 6929e4f068cc397d253b3fabd712e093c4c16dbe]]
Former-commit-id: 108ac66214
Former-commit-id: 1fd4aa5cf3
 2012-03-30 10:45:26 -05:00
Steve Harris
9845ef53f9 Merge branch 'core_exp' into ss_sync (Graphics Improvements for NPP/Collaboration) 
Initial reconciliation of Graphics Improvements for NPP/Collaboration with 12.3.1 baseline

Conflicts:
	cave/com.raytheon.uf.viz.derivparam/src/com/raytheon/uf/viz/derivparam/tree/DerivedLevelNode.java*
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/AbstractGLMesh.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/GLCanvasCache.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/GLFactoryAdapter.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/GLGeometryPainter.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/IGLTarget.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/AbstractGLImage.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/GLCMTextureData.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/GLColormappedImage.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/GLImage.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/GLTarget.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/GLWireframeShape2D.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/objects/GLVertexBufferObject.java
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/util/GribDataCubeAdapter.java
	cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/drawables/GeneralPointImageExtension.java
	cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/drawables/IPointImageExtension.java
	cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/rsc/PlotResource2.java*
	cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/mosaic/ext/IRadarMosaicImageExtension.java
	edexOsgi/com.raytheon.uf.common.time/src/com/raytheon/uf/common/time/msgs/GetServerTimeRequest.java

Former-commit-id: a4e4792bb5 [formerly d3ad6095b7] [formerly 5cdda77afb [formerly 879a2e0a4a31999bf4d624ff59e77bbd68195458]]
Former-commit-id: 5cdda77afb
Former-commit-id: 6aa18f74f6
 2012-03-30 09:50:48 -05:00
Steve Harris
8bc60b1e32 12.3.1-10 baseline 
Former-commit-id: 0e4128712b [formerly 4068f5295f] [formerly 22bd792cd9 [formerly 7d62bca046401a670ef7bd917cbcbb073e061b60]]
Former-commit-id: 22bd792cd9
Former-commit-id: ce3b74c605
 2012-03-30 08:38:33 -05:00
Roger Ferrel
7ebba67ec3 Issue #244 Gett color coding on messages 
Change-Id: Ibe54e07c26336899198093b0a104f8796ebc0d47

Former-commit-id: 24affbfe73 [formerly 9bd5aa57b6] [formerly d9ca310d94 [formerly 3fa0c543f02ccb556b5d1898e359f1e2b6e63819]]
Former-commit-id: d9ca310d94
Former-commit-id: 30fe4140ba
 2012-03-29 16:52:11 -05:00
Nate Jensen
43f59bf791 Merge "Issue #232 - Added support for session creation from invitation" into 11-Collaboration 
Former-commit-id: 97898c1a3c [formerly 7facfe9b7c] [formerly 0338159662 [formerly 459aa33b196c8c37897575636ae670505d959330]]
Former-commit-id: 0338159662
Former-commit-id: 40839a5c6e
 2012-03-29 16:32:15 -05:00
James Korman
ea7a6ea10b Issue #232 - Added support for session creation from invitation 
Former-commit-id: 08db3b2920 [formerly d048f0f324] [formerly 6381932f6e [formerly 7d17d39b73ff66275ba247bd21e28b468ae87892]]
Former-commit-id: 6381932f6e
Former-commit-id: 2eedb16808
 2012-03-29 16:30:29 -05:00
Nate Jensen
d775bee7ae Issue #427 clean up 
Change-Id: Id4bc3b27bfcbc324138a11998255a6f662f31255

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

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

Former-commit-id: 202bd0adf8 [formerly d2d3a245b3] [formerly aa000b4b06 [formerly 7597db5bbc0642072143e4c7ea0291108154eb40]]
Former-commit-id: aa000b4b06
Former-commit-id: 6aae45687a
 2012-03-29 10:44:08 -05:00
James Korman
842b2c6f7d Issue #232 - Added message routing/corrected roster creation 
Former-commit-id: 8dde3a0798 [formerly b45ea1e0a7] [formerly 6149d30b13 [formerly b7040976e3c8fd029a0d821511f977cfd4b4888e]]
Former-commit-id: 6149d30b13
Former-commit-id: 7f12149d98
 2012-03-29 10:16:15 -05:00
Steve Harris
65aa72fee7 Merge branch 'sync_test' (VCModules) into ss_sync 
Former-commit-id: 0665862abe [formerly 70357d90bc] [formerly a0abcf8120 [formerly e68338cecbe85a62835633e9aba0925344fb80f1]]
Former-commit-id: a0abcf8120
Former-commit-id: 6884520750
 2012-03-29 10:03:05 -05:00
Nate Jensen
7d5d70bf55 Merge "Issue #429 telestrator merging" into 11-Collaboration 
Former-commit-id: aaba32c4c1 [formerly cf880ddd0d] [formerly 676746126c [formerly eda16f8aa5a9aa88a8e947070d8e9df32c36c114]]
Former-commit-id: 676746126c
Former-commit-id: ec0896c28d
 2012-03-28 15:10:34 -05:00
Matt Nash
4871565ff0 Issue #429 telestrator merging 
Change-Id: I18f8f283db617d0865b274dcf6003a24e2cf2028

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

Former-commit-id: 40dd73ba4d [formerly 5fdc253d77] [formerly bbf96992ee [formerly 6297c04332bb349d8351b07e2ffd1c24c046ccd7]]
Former-commit-id: bbf96992ee
Former-commit-id: a5d38a0968
 2012-03-28 14:34:25 -05:00
Max Schenkelberg
bbab188fb9 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: 66eaffb9ee [formerly 15a9245592] [formerly f10f1a5319 [formerly 265ccb3e22aa0122dbd74e83d0af202596c1941c]]
Former-commit-id: f10f1a5319
Former-commit-id: ac11dd0c18
 2012-03-28 13:32:04 -05:00
Roger Ferrel
d29d2a1c92 Issue #244 Clean up and Link editor to chat now works. 
Change-Id: I23b12fa44b8908b6a0c5ce79ca79ad73ff26df9d

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

Former-commit-id: ab63accc61 [formerly fa8b5b3400] [formerly 0f25c8ffa6 [formerly 40e9906f41f0fa2ae4c87d3c2a2acb2406fd4e25]]
Former-commit-id: 0f25c8ffa6
Former-commit-id: a692caba1c
 2012-03-27 09:56:46 -05:00