Commit graph

413 commits

Author SHA1 Message Date
Brad Gonzales
0eefb140ac Issue Changed login icon to green.
Former-commit-id: ca2a35d77c [formerly 69549e0e64ff8d14892db9e908692c47aeb3043c]
Former-commit-id: a378fea5d1
2012-04-10 10:01:11 -05:00
Roger Ferrel
57abf56e09 Issue Presence status sent out when logged on to the server.
Change-Id: I44d0cfd8e37aeda4d0eadaf80b9c014494258164

Former-commit-id: 521127b589 [formerly 9391b95b6a26b34675370b3f7347fab4f08444e5]
Former-commit-id: b4c8d3a0d9
2012-04-09 16:00:25 -05:00
Matt Nash
eba8ac8dd9 Issue changing 'private' aspect
Former-commit-id: 98350f4ba5 [formerly 4c475ace9b0803b40bc90eca71a800a1ca2da4b5]
Former-commit-id: 9887678590
2012-04-09 15:21:07 -05:00
Roger Ferrel
225a8762d1 Issue Change to up date Presence in the Group View.
Change-Id: I59d4f4fcc14f59dc3017c118d3613f6f7040dca8

Former-commit-id: 2109190752 [formerly b64a623cda4ec00d555d8542da496286e0210dac]
Former-commit-id: c5399687bc
2012-04-09 15:16:19 -05:00
Matt Nash
2a7698e284 Issue add resource data to ISerializableObject file to fix error
Former-commit-id: b340718346 [formerly b8fc69fc6746566e83b19ed4dfa8611858332aac]
Former-commit-id: 42ce0e72f0
2012-04-09 12:42:44 -05:00
James Korman
9aa0176bb7 Issue - Updated Presence - Add properties and new constructor
Former-commit-id: 53dc047d3d [formerly 5f94c705fa50346aca0befcc8eca7b609e685719]
Former-commit-id: 48397d1d95
2012-04-09 11:42:19 -05:00
Brad Gonzales
008b670b6a Issue added login icon. Changed Logon to Login.
Former-commit-id: 7937986b11 [formerly d2b9c7981006dad91c5781fe0df96113530491df]
Former-commit-id: 44a83e92ed
2012-04-09 11:38:08 -05:00
James Korman
31a93f32ab Issue - Add code to update and post roster presence changes.
Former-commit-id: df0cdcb563 [formerly 8c5406eb39e9bd8590817e5eda854e20866ebbae]
Former-commit-id: bb31e9e2ea
2012-04-09 10:01:55 -05:00
Max Schenkelberg
a5fa19c914 Issue 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: 6812c1ba2b [formerly c7badfd1c2a77d410cd3b841fef967c07c9e6434]
Former-commit-id: cbe92bdf32
2012-04-06 10:23:24 -05:00
Matt Nash
922fffeeed Issue remove unused com.raytheon.viz.drawing plugin
Former-commit-id: 5bd8e5e47c [formerly b02beff8d7beb6f33e5bcdcfb72a423d7f18584e]
Former-commit-id: af0513690d
2012-04-06 07:16:15 -05:00
Nate Jensen
28684fd160 Issue initial role transfer code and some cleanup
Change-Id: I45abf42df8da789532a4420259065fbb1f7ed04f

Former-commit-id: 0ef84129c4 [formerly c7276b7fddee718fd47f1f1b3fb75d5b483e62fc]
Former-commit-id: c1543afc44
2012-04-05 17:49:12 -05:00
Max Schenkelberg
48ca9ca105 Issue Added remote capability injection code through factory
method. Cleaned up old/unmaintained 3D references

Former-commit-id: 16056d53c5 [formerly e3b171f34fb7610f4f5796d0dcdf32f7a298c8ca]
Former-commit-id: 54aaf05209
2012-04-05 13:52:20 -05:00
Matt Nash
5d0ae7ff9f Issue alert of new messages when in background
Former-commit-id: f314b2475d [formerly 8e8fbe73b41f6457c085ab11939fdbd1242d4383]
Former-commit-id: d62a660e52
2012-04-05 12:38:35 -05:00
Matt Nash
52c0508781 Issue clear,undo,redo
Former-commit-id: 328d7e1287 [formerly 69fcd977767dec591f2132cc6b13f9e48a3180b0]
Former-commit-id: c53719be8a
2012-04-05 11:49:57 -05:00
Matt Nash
916b8428e4 Issue telestrator allows all users to draw
Former-commit-id: 09c022bda8 [formerly ed59b0803da528f391db3c71aac1184581cc353d]
Former-commit-id: f200e37a36
2012-04-05 10:27:10 -05:00
Roger Ferrel
d197ea6fd2 Issue 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: 72bf5460d7 [formerly 898e1a503af21abef70afc734924332e7de249ee]
Former-commit-id: afc79a14f3
2012-04-05 08:09:15 -05:00
Nate Jensen
d68efe319e Issue fixed subject
Change-Id: Ieb5499e16b2c30169fe49eb06d73b8e3ede6ce70

Former-commit-id: 4999e547a1 [formerly 8908b81e0e47cfe112ad132a82f2b2cb1a0dd55e]
Former-commit-id: b084156a30
2012-04-04 17:06:00 -05:00
Bradley Gonzales
391f8e4d58 Issue more descriptive login failure message
Former-commit-id: 74ce6f2140 [formerly 909362d88423e3c5a39c73b5e5da2d2168f5ed91]
Former-commit-id: 6fc14461ee
2012-04-04 16:26:58 -05:00
Nate Jensen
9c4b29c3aa Issue instantiate collaboration resource
Change-Id: I5aa7ec5d7dfb3f2373730eb40dd9ea3178112d20

Former-commit-id: f06338bcd4 [formerly 5cd5a85bf836ade2da3b43b2797c2a65d61be461]
Former-commit-id: 260c7c10eb
2012-04-04 14:05:12 -05:00
James Korman
fad1fa7362 Issue - Corrected venue command message loopback
Former-commit-id: e663a9e5dc [formerly c3ba8bd9416f18358f2a976ee2104e4e614321c3]
Former-commit-id: 23a2cd033a
2012-04-04 13:41:25 -05:00
Matt Nash
86e2f1a7ad Issue working telestration collaboration capabilities
Former-commit-id: c27a3cf672 [formerly f1c9552a757e7d194e31ed9786cb358c53e631b7]
Former-commit-id: 3c2fcc59d0
2012-04-04 11:23:34 -05:00
Roger Ferrel
7aa926028e Issue Fix bug in handleInvitationEvent
Change-Id: Ic47628203707a8238b1d3c0982d177641bba53a9

Former-commit-id: 46ddf008b8 [formerly 12e29dfb9e3a77e44b7b946f138c84e082e0990a]
Former-commit-id: a39475e04d
2012-04-03 17:28:27 -05:00
James Korman
dcdb98319d Issue - Adding roster api message handling.
Former-commit-id: afeea4d9d2 [formerly 8c7b4a55e6fa10e3e120e12334ba2d04d2d40a32]
Former-commit-id: 4c7f2465fc
2012-04-03 16:57:27 -05:00
Roger Ferrel
3d9fcb3273 Issue Change user status now send Presence update to the server.
Change-Id: Id0a455633693db251d03a85343f526905a9c4364

Former-commit-id: 46addc13cf [formerly fd8a0cad3ded983308f1f0d983a9f9a42ade7f2b]
Former-commit-id: 78502719e9
2012-04-03 16:20:07 -05:00
Roger Ferrel
6ae33324f3 Merge branch 'new_devel' into 11-Collaboration
Former-commit-id: 395ae5ae63 [formerly a441dcd259dbf3ecd77464d1bd0cbe1f4cdb1cb6]
Former-commit-id: b8df9f46e4
2012-04-03 15:29:53 -05:00
Max Schenkelberg
ac1fc79f5b Issue Start of remote target capabilities
Former-commit-id: d2d03e2c64 [formerly 30b76609cff9a737b8e4190bbfebb5a37a259fad]
Former-commit-id: 6c411ffb07
2012-04-03 15:11:20 -05:00
Roger Ferrel
1db237e408 Issue Peer to Peer chat implemented. Change Passwor implemtned.
Change-Id: I4949d5ff82a1046d344cd63e32842b2d67717681

Former-commit-id: 9dd257f28a [formerly dde6ebb7a4ce4cdee62b1d4e31d33694c331309e]
Former-commit-id: 7d7ee81855
2012-04-03 13:28:40 -05:00
Max Schenkelberg
ccde60b87e Merge branch '11-Collaboration' of ssh://lightning.omaha.us.ray.com:29418/thunder into 11-Collaboration
Former-commit-id: 138114e3dc [formerly 5bd4a3ccbcb84443eb342670c2a4ea6e083527b7]
Former-commit-id: e78aad4bc5
2012-04-03 13:15:31 -05:00
James Korman
9387e6154c Issue - Corrected problem using participant identifiers
Former-commit-id: 96cd7bea11 [formerly 5b102692838b42ffab97186742338494df78b978]
Former-commit-id: b89a89def3
2012-04-03 12:45:00 -05:00
Matt Nash
217d707198 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: 8e16194370 [formerly be35f7e75bbeb89fe160e24d9ff691f62753c96b]
Former-commit-id: 5cb40430a7
2012-04-03 12:23:11 -05:00
Nate Jensen
19bb87346c Issue open editor when joining session
Change-Id: I6094a7a909584acb8b10236119ec3eb5dd965e59

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

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

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

Former-commit-id: 108ac66214 [formerly 6929e4f068cc397d253b3fabd712e093c4c16dbe]
Former-commit-id: 22fff3a4b8
2012-03-30 10:45:26 -05:00
Steve Harris
a4e4792bb5 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: 5cdda77afb [formerly 879a2e0a4a31999bf4d624ff59e77bbd68195458]
Former-commit-id: d3ad6095b7
2012-03-30 09:50:48 -05:00
Steve Harris
0e4128712b 12.3.1-10 baseline
Former-commit-id: 22bd792cd9 [formerly 7d62bca046401a670ef7bd917cbcbb073e061b60]
Former-commit-id: 4068f5295f
2012-03-30 08:38:33 -05:00
Roger Ferrel
24affbfe73 Issue Gett color coding on messages
Change-Id: Ibe54e07c26336899198093b0a104f8796ebc0d47

Former-commit-id: d9ca310d94 [formerly 3fa0c543f02ccb556b5d1898e359f1e2b6e63819]
Former-commit-id: 9bd5aa57b6
2012-03-29 16:52:11 -05:00
Nate Jensen
97898c1a3c Merge "Issue - Added support for session creation from invitation" into 11-Collaboration
Former-commit-id: 0338159662 [formerly 459aa33b196c8c37897575636ae670505d959330]
Former-commit-id: 7facfe9b7c
2012-03-29 16:32:15 -05:00
James Korman
08db3b2920 Issue - Added support for session creation from invitation
Former-commit-id: 6381932f6e [formerly 7d17d39b73ff66275ba247bd21e28b468ae87892]
Former-commit-id: d048f0f324
2012-03-29 16:30:29 -05:00
Nate Jensen
ddfab0e4e3 Issue clean up
Change-Id: Id4bc3b27bfcbc324138a11998255a6f662f31255

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

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

Former-commit-id: aa000b4b06 [formerly 7597db5bbc0642072143e4c7ea0291108154eb40]
Former-commit-id: d2d3a245b3
2012-03-29 10:44:08 -05:00
James Korman
8dde3a0798 Issue - Added message routing/corrected roster creation
Former-commit-id: 6149d30b13 [formerly b7040976e3c8fd029a0d821511f977cfd4b4888e]
Former-commit-id: b45ea1e0a7
2012-03-29 10:16:15 -05:00