Commit graph

592 commits

Author SHA1 Message Date
Matt Nash
5fa80650b3 Issue #429 colors matching between telestrator and chat room across clients
Former-commit-id: abbe0c3d6b [formerly d84865ced9] [formerly 09fc05162c [formerly 46a327c929a09c21270f7b6de543e8d742476003]]
Former-commit-id: 09fc05162c
Former-commit-id: 563e76c313
2012-04-25 07:39:05 -05:00
Matt Nash
75a76124f8 Issue #429 colors for collaboration session
Former-commit-id: 190a951b26 [formerly 63dccd6b85] [formerly bc1e35f4b4 [formerly 86a4ba1b10b58f266cfd46a257145717140a3778]]
Former-commit-id: bc1e35f4b4
Former-commit-id: d79ae59e19
2012-04-24 16:39:28 -05:00
Nate Jensen
aec56b4df0 Issue #427 minor fix
Change-Id: I341e046bcde321ae70a2afeb745bedb0078758ca

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

Former-commit-id: a2a6d2d61d [formerly c4afe61f01] [formerly bf3eb689cc [formerly 287dae35ae3566f22a2d9e5a22760f3ef9d29ca2]]
Former-commit-id: bf3eb689cc
Former-commit-id: 0a7a5d44ff
2012-04-24 14:11:27 -05:00
Max Schenkelberg
2248b6ba00 Issue #239 Added persistence capability to Collaboration data events
Former-commit-id: 34f80169fe [formerly f4193b0e4e] [formerly 32ade1a1f7 [formerly 39e1cc313eae6df99483cc657c39cdd5e3d24533]]
Former-commit-id: 32ade1a1f7
Former-commit-id: 1ddbb3ef60
2012-04-24 13:44:16 -05:00
Matt Nash
27855328d0 Issue #429 major refactor of UserId, make CollaborationGroupView use actual objects instead of wrappers
Former-commit-id: b7b1429f2c [formerly 0241e8857f] [formerly fa360c90cf [formerly 68f7aaecfe8c78db56a70e8d33a9d990bf5fa467]]
Former-commit-id: fa360c90cf
Former-commit-id: b428da939c
2012-04-24 12:20:55 -05:00
Nate Jensen
83e6f5acf4 Issue #443 better logging of traffic
Change-Id: Ia968b79a9d6ee1e5224678ac63684fb9c7aa5b81

Former-commit-id: 14f70d1122 [formerly a4b0addeee] [formerly 39ebbc3913 [formerly 4a7faa743900edada4ecf8b42aa3315515617e71]]
Former-commit-id: 39ebbc3913
Former-commit-id: 8130c22b64
2012-04-23 11:23:22 -05:00
Bryan Kowal
dd14feff46 Issue #517 - fix the collaboration pde build.
Former-commit-id: 611fc324ea [formerly 19eb596d88] [formerly d97819a8df [formerly 450b6ad4bb2c3e0b9069256977884d7b89224cae]]
Former-commit-id: d97819a8df
Former-commit-id: de9a48b0c3
2012-04-21 18:17:39 -05:00
Matt Nash
bd87f5c798 Issue #429 fixes for colors, needs to refactor user id to make work
Former-commit-id: ac53206f1f [formerly b418af8aa9] [formerly 7f7bd73014 [formerly a0f919d73ea4d1da7d79e721800079f0698070db]]
Former-commit-id: 7f7bd73014
Former-commit-id: 4f3a414d6d
2012-04-20 15:30:58 -05:00
Matt Nash
b84be3fe98 Issue #429 color fixes
Former-commit-id: 878e798141 [formerly 7116eb79cd] [formerly 1b9c4320fc [formerly 819a0b037d49993e56dc77207809dbf3903ea6ec]]
Former-commit-id: 1b9c4320fc
Former-commit-id: 15478a9e21
2012-04-20 15:30:58 -05:00
Matt Nash
f1d694c70a Issue #429 lots of color changes
Former-commit-id: 7c047a4879 [formerly 064657306f] [formerly fdddff1957 [formerly ac71a592948b71c629f5f535a8d06840b3905c2a]]
Former-commit-id: fdddff1957
Former-commit-id: fa120a1cd0
2012-04-20 15:30:57 -05:00
Matt Nash
0675f46988 Issue #429 first round fixes color
Former-commit-id: 0a81707a7f [formerly 5f47f98662] [formerly d34e2722b0 [formerly 901770d888a39df452e60d9ac6c5d7e071d6a810]]
Former-commit-id: d34e2722b0
Former-commit-id: b5f8783a94
2012-04-20 15:30:57 -05:00
David Gillingham
e8fdf9d48f Issue #473: Fix CWA and TCS plugin's decoders to use ingest file name for datatime.
Change-Id: I54bbf7f1562ff48617721f6d88ef536c0afd7b61

Former-commit-id: 30d5e0d2dd [formerly bdbc16d31c] [formerly 58e7a0f310 [formerly d3681dc1ed59d0f85b7de44277c52907d242aa29]]
Former-commit-id: 58e7a0f310
Former-commit-id: 5850d4cfb1
2012-04-19 17:10:08 -05:00
Max Schenkelberg
baf778717f Issue #239 Started persistable object event pattern. Made construction
of single color images cheaper to allow object construction to happen
immediately 

Former-commit-id: 9d0eecb9b1 [formerly 523c90b697] [formerly da5e17d6e3 [formerly 995ddaebb670eb1689aeb44e3cb760731db46e80]]
Former-commit-id: da5e17d6e3
Former-commit-id: f05528979d
2012-04-19 16:03:07 -05:00
Nate Jensen
26f41aa6ad Issue #427 fix peer to peer
Change-Id: Iae7f0d4c5f3f28360a957768fa755809fe47c171

Former-commit-id: 38dcb603b2 [formerly 8da43825d0] [formerly 62c5527e17 [formerly b8ca7f7c0d329c1d7bb527317fc89794ea4dbac0]]
Former-commit-id: 62c5527e17
Former-commit-id: 7fdc45a275
2012-04-19 15:27:52 -05:00
Nate Jensen
629be1f9ab Issue #427 cleanup
Change-Id: I74f9d6e99849f66ef33340685fbb08b4c9c1b768

Former-commit-id: 7398c40a72 [formerly efc911ac9d] [formerly 7f08b7cd22 [formerly ee08cc7a0d81fd83b90398119add8fad3428283b]]
Former-commit-id: 7f08b7cd22
Former-commit-id: 0951143f26
2012-04-19 13:38:16 -05:00
Bryan Kowal
0514785b3a Issue #501 - eliminated (duplicate statements) unreachable code to fix the Wes2Bridge build.
Former-commit-id: 72068507a9 [formerly b1561d67a0] [formerly b90b6f101e [formerly 28f2145d82ce3030cebfb0a14aa8457fee992e13]]
Former-commit-id: b90b6f101e
Former-commit-id: a9b51192d2
2012-04-19 13:09:58 -05:00
Max Schenkelberg
51a826384e Issue #358 Fixed merge errors when merging core_exp into ss_sync
Former-commit-id: e03ee60c75 [formerly 1294fa0ca1] [formerly 90a5c20b5a [formerly bd93246cccd1b123598006d7343eac265392695d]]
Former-commit-id: 90a5c20b5a
Former-commit-id: 65c864aff2
2012-04-19 11:11:34 -05:00
Steve Harris
e86dc647be 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: 63f11892e8 [formerly 4d7572a632] [formerly 625cd4262c [formerly 5e1b9319941eed516a08a135a2049c14bad77863]]
Former-commit-id: 625cd4262c
Former-commit-id: def458753d
2012-04-19 11:11:02 -05:00
Nate Jensen
14f83aaf72 Issue #427 consolidated user ids
Change-Id: I008c47320bbb5819db0607e7f695b3ecffa30387

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

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

Former-commit-id: 7157aea007 [formerly a54660c377] [formerly 8124a47b94 [formerly 1d24813371c2dec40ff90657705048083e03a9db]]
Former-commit-id: 8124a47b94
Former-commit-id: 888d927468
2012-04-18 16:20:39 -05:00
Steve Harris
a2a6a18fae 12.4.1-4 baseline
Former-commit-id: 750b7543dd [formerly 67a5a68300] [formerly 2a216f333c [formerly ad648deaf4d3edaabdda15184289b3a927308bd7]]
Former-commit-id: 2a216f333c
Former-commit-id: a4e519f3cd
2012-04-18 15:18:16 -05:00
Nate Jensen
fba5e2c176 Issue #427 more cleanup
Change-Id: Id2ad63a51e9a891801d2422547f855cd769a83d3

Former-commit-id: f5c1e766af [formerly c33cf2538c] [formerly fa9c91e03d [formerly 258df7c2187c1ebcecf1abf905ec2cc4e60464e0]]
Former-commit-id: fa9c91e03d
Former-commit-id: 8830e1c1c9
2012-04-18 14:15:18 -05:00
Max Schenkelberg
8096fc5ad3 Issue #239 Got reprojection event working
Former-commit-id: 6efccf10a5 [formerly 29f24e3ec5] [formerly 005beff18a [formerly 99e432cd258c9bf570a66be4702d28ac68204052]]
Former-commit-id: 005beff18a
Former-commit-id: 044f21e405
2012-04-18 14:01:09 -05:00
Nate Jensen
033e7768ed Issue #427 cleanup
Change-Id: I2a294a679f8cfb1ed62a63a95bcd21b4954194a3

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

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

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

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

Former-commit-id: 9d3c8321e5 [formerly 9885949b27] [formerly 2d822df43f [formerly 16af3874c9416b75edc00b4ad928de8a30e47abf]]
Former-commit-id: 2d822df43f
Former-commit-id: 1b0975e7fa
2012-04-17 17:26:49 -05:00
Richard Peter
9c49c39669 Merge "Issue #449. Fixed problem with simulated time for trend plots in FSS monitors." into 9-Wes2Bridge
Former-commit-id: 5bb20ff4a3 [formerly 709be7733b] [formerly be060f1b1c [formerly 2a3492987c4cd9751aad2c6e20230f983e68f4b5]]
Former-commit-id: be060f1b1c
Former-commit-id: 4a93a365bd
2012-04-17 13:16:22 -05:00
Max Schenkelberg
e68e6130a0 Issue #239 Fixed mosaic bug, refactored dispatching colormap images so
mosaic could resuse

Former-commit-id: c1ebd04d4d [formerly 40ca446e53] [formerly 29184d46ce [formerly aea5c30443970933bf1517ced6d7e91a1008c9d5]]
Former-commit-id: 29184d46ce
Former-commit-id: a82f07b25d
2012-04-17 13:09:07 -05:00
Brad Gonzales
f57e108e2d Issue #443 Tools.java, GZIP and ZLIB compression. ZLIB by default.
Former-commit-id: 700347780c [formerly 1226cd9996] [formerly 23c85cd4b5 [formerly a03ed123392d4a8a4864a42f7d3b09e71057fbd0]]
Former-commit-id: 23c85cd4b5
Former-commit-id: 9a81f16961
2012-04-17 09:57:01 -05:00
Nate Jensen
44ff9ea68d Merge "Issue #453 - 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: b57be7c646 [formerly 28b643ad74] [formerly 0f5a451fa5 [formerly a02a78e1a44df9bfe90cf7a65c8b16176b48e535]]
Former-commit-id: 0f5a451fa5
Former-commit-id: 7fc2de9425
2012-04-17 08:53:01 -05:00
Max Schenkelberg
fcb459e91d Issue #239 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: 490c75f684 [formerly 9b018ea151] [formerly 7d2a7d987d [formerly 79f4d46bf18fc03c79df0c80c8dde025fe954f0c]]
Former-commit-id: 7d2a7d987d
Former-commit-id: fa3d39c5e2
2012-04-16 17:29:59 -05:00
Bryan Kowal
fb02245232 Issue #453 - 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: 51688bb591 [formerly fadb50446d] [formerly 298ab2e057 [formerly 5afc6ff942850e0781da96bdeaa1fb4ee7d54000]]
Former-commit-id: 298ab2e057
Former-commit-id: 62e4e0bbea
2012-04-16 17:00:30 -05:00
Matt Nash
cf4bc37883 Issue #429 fix spelling
Former-commit-id: 451a00a558 [formerly cd8ce46352] [formerly 6b4d328bc4 [formerly 2d2a0b492690166e89339300281f44a37e532dec]]
Former-commit-id: 6b4d328bc4
Former-commit-id: 86954f6071
2012-04-16 16:51:22 -05:00
Matt Nash
b71d725791 Issue #429 change name of editor sharing
Former-commit-id: dfba9a1d0d [formerly 9b7a839cdd] [formerly ac3b674bf3 [formerly 199c8c6af547dc66e8cb068e2617a96f3b68d515]]
Former-commit-id: ac3b674bf3
Former-commit-id: 87a5511a7c
2012-04-16 15:40:37 -05:00
Roger Ferrel
05399a980f Issue #437 Check for null session in ParticipantsLabelProvider.
Change-Id: Ie327860fdf1feac700e646885a641a283fe54291

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

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

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

Former-commit-id: 25b8851589 [formerly 446052111f] [formerly 1d3666a10e [formerly 50f3e0babfb5c38b814be13802bb61f04e73e56f]]
Former-commit-id: 1d3666a10e
Former-commit-id: 6c381ceb01
2012-04-16 12:54:29 -05:00
Nate Jensen
69061ada62 Issue #427 cleanup and refactoring for ease of use
Change-Id: I93f75663ace61b454b52d1e451677a0e42c2d481

Former-commit-id: 02b0f1bd5f [formerly fc1c1d5f16] [formerly d9c24599ea [formerly 23ba31dc2479e9e1e2b45e9237c92a7adf12a6c5]]
Former-commit-id: d9c24599ea
Former-commit-id: e3c7b4d2e2
2012-04-16 12:37:40 -05:00
Matt Nash
477c842174 Issue #429 minor tooltip fix, and double click fixes for unavailable users
Former-commit-id: 79088f4129 [formerly 967b8ed671] [formerly 30d5ccc641 [formerly 408c7cfaa970e6b460fda819fba0f02810c2dc19]]
Former-commit-id: 30d5ccc641
Former-commit-id: ed644a9031
2012-04-16 11:16:50 -05:00
Matt Nash
d2f183205a Issue #429 set editor and view title the same, add separator to menu above collaboration
Former-commit-id: dd88bf775c [formerly 780fd03203] [formerly d20fe3cfff [formerly c045890c6da56c258dfa44610e7225a3f914e0ef]]
Former-commit-id: d20fe3cfff
Former-commit-id: ef0e2814ef
2012-04-16 10:03:31 -05:00
James Korman
0822fc6ae6 Issue #437 - removed Leader presence/modified subscribed handling.
Former-commit-id: d87e47a5f3 [formerly dab86c62fc] [formerly defb083771 [formerly 57673abac66b21596c71737d0aa1537c13982ac0]]
Former-commit-id: defb083771
Former-commit-id: 8e84ed72f7
2012-04-16 09:46:12 -05:00
Bryan Kowal
ba54e9da49 Merge "Issue #450 - add the cave viz collaboration rpm to the yum groups." into 11-Collaboration
Former-commit-id: 66f48c3586 [formerly ffe22bdedc] [formerly adb56099a5 [formerly 170d1e2a92debece0efd0a1b30a281e70c7a8b77]]
Former-commit-id: adb56099a5
Former-commit-id: a0225560cc
2012-04-16 09:40:36 -05:00
Roger Ferrel
1d5d56dcc7 Issue #437 Fixed typo that cause multiple grops siteings in Collaboration View.
Change-Id: I2fc329b101532f3da99a58c320ceb7fa109c7e5b

Former-commit-id: 866472438f [formerly 3f12223532] [formerly 020f77195a [formerly 599563055eb1373601d5623752272130142c3659]]
Former-commit-id: 020f77195a
Former-commit-id: 588302da22
2012-04-16 07:52:28 -05:00
Roger Ferrel
7e30ab3c0f Issue #437 But fix in group View enent handler, improved tooltip
Change-Id: Ibb6fc5f312f09d72df988c591408fc41e39ad674

Former-commit-id: 41e4666d55 [formerly 55ab473fd6] [formerly 8ab764e56c [formerly 47c81c08d9a90c271873cfa50525fb40c26db508]]
Former-commit-id: 8ab764e56c
Former-commit-id: 1a96e80459
2012-04-13 15:51:41 -05:00