Commit graph

5738 commits

Author SHA1 Message Date
Max Schenkelberg
74b3843b34 Issue #239 Added persistence capability to Collaboration data events
Former-commit-id: a2d730a537 [formerly 34f80169fe] [formerly f4193b0e4e] [formerly a2d730a537 [formerly 34f80169fe] [formerly f4193b0e4e] [formerly 32ade1a1f7 [formerly f4193b0e4e [formerly 39e1cc313eae6df99483cc657c39cdd5e3d24533]]]]
Former-commit-id: 32ade1a1f7
Former-commit-id: 0b1e9de1a3 [formerly 2248b6ba00] [formerly d99b1b8e424819aa687ea38c079bbd2a3d08bf34 [formerly 1ddbb3ef60]]
Former-commit-id: 405c9af2dd5c82d700f3e510eed67e2a35c20334 [formerly 836eec0684]
Former-commit-id: f07147578f
2012-04-24 13:44:16 -05:00
Matt Nash
54d0244bf4 Issue #429 major refactor of UserId, make CollaborationGroupView use actual objects instead of wrappers
Former-commit-id: 9c5efdfd26 [formerly b7b1429f2c] [formerly 0241e8857f] [formerly 9c5efdfd26 [formerly b7b1429f2c] [formerly 0241e8857f] [formerly fa360c90cf [formerly 0241e8857f [formerly 68f7aaecfe8c78db56a70e8d33a9d990bf5fa467]]]]
Former-commit-id: fa360c90cf
Former-commit-id: f01ac5b787 [formerly 27855328d0] [formerly 11b02280ce4c3db8d863cdc64e4e24dc47a6d28f [formerly b428da939c]]
Former-commit-id: d429c8462975533524f6dff9d741de5b7370b220 [formerly 2c8dfc611b]
Former-commit-id: 5e889362c1
2012-04-24 12:20:55 -05:00
Nate Jensen
b930b25977 Issue #443 better logging of traffic
Change-Id: Ia968b79a9d6ee1e5224678ac63684fb9c7aa5b81

Former-commit-id: 36c4c4e66e [formerly 14f70d1122] [formerly a4b0addeee] [formerly 36c4c4e66e [formerly 14f70d1122] [formerly a4b0addeee] [formerly 39ebbc3913 [formerly a4b0addeee [formerly 4a7faa743900edada4ecf8b42aa3315515617e71]]]]
Former-commit-id: 39ebbc3913
Former-commit-id: 49d8f6c799 [formerly 83e6f5acf4] [formerly 529b68b96d852df4ba7ded4f9d68e14a00cc3e18 [formerly 8130c22b64]]
Former-commit-id: a83d2bb5a6626f09d2951421f7552384f89a7fdc [formerly 776ef738f7]
Former-commit-id: 2bce81c6c8
2012-04-23 11:23:22 -05:00
Bryan Kowal
bfe9c3e330 Issue #517 - fix the collaboration pde build.
Former-commit-id: 70d956f8ca [formerly 611fc324ea] [formerly 19eb596d88] [formerly 70d956f8ca [formerly 611fc324ea] [formerly 19eb596d88] [formerly d97819a8df [formerly 19eb596d88 [formerly 450b6ad4bb2c3e0b9069256977884d7b89224cae]]]]
Former-commit-id: d97819a8df
Former-commit-id: 4a529bba46 [formerly dd14feff46] [formerly 7cc285b2ae9bde5764df3230f9a6e94ee3c0312f [formerly de9a48b0c3]]
Former-commit-id: a495aeb9420e6815bdc83f317e21020566e1c136 [formerly 160a359b30]
Former-commit-id: a9bd4c797e
2012-04-21 18:17:39 -05:00
Matt Nash
646770c683 Issue #429 fixes for colors, needs to refactor user id to make work
Former-commit-id: 31510dae8d [formerly ac53206f1f] [formerly b418af8aa9] [formerly 31510dae8d [formerly ac53206f1f] [formerly b418af8aa9] [formerly 7f7bd73014 [formerly b418af8aa9 [formerly a0f919d73ea4d1da7d79e721800079f0698070db]]]]
Former-commit-id: 7f7bd73014
Former-commit-id: 5df26c4d05 [formerly bd87f5c798] [formerly 58a7b49922dc1994ad90e5f3e4c2c8b7f6fa7bda [formerly 4f3a414d6d]]
Former-commit-id: c2271b73b317515cc19f7df529e7fb4b98ec6e6e [formerly 451a6f1b2e]
Former-commit-id: 2782102d68
2012-04-20 15:30:58 -05:00
Matt Nash
5a1565bee4 Issue #429 color fixes
Former-commit-id: f061b5e11c [formerly 878e798141] [formerly 7116eb79cd] [formerly f061b5e11c [formerly 878e798141] [formerly 7116eb79cd] [formerly 1b9c4320fc [formerly 7116eb79cd [formerly 819a0b037d49993e56dc77207809dbf3903ea6ec]]]]
Former-commit-id: 1b9c4320fc
Former-commit-id: 825b7531fc [formerly b84be3fe98] [formerly 6a57fc31e6c27f05deaaa2355a047b18eae33bab [formerly 15478a9e21]]
Former-commit-id: b5af66c37867d1731b1ab4eec8b0d1e0e9fe6e97 [formerly 06bd050bb0]
Former-commit-id: 572b2b8cf6
2012-04-20 15:30:58 -05:00
Matt Nash
bc43a6017e Issue #429 lots of color changes
Former-commit-id: ecddf3fee7 [formerly 7c047a4879] [formerly 064657306f] [formerly ecddf3fee7 [formerly 7c047a4879] [formerly 064657306f] [formerly fdddff1957 [formerly 064657306f [formerly ac71a592948b71c629f5f535a8d06840b3905c2a]]]]
Former-commit-id: fdddff1957
Former-commit-id: 441228a0ab [formerly f1d694c70a] [formerly 405eeb370c5614701c57fdbafb95d65745ea51dc [formerly fa120a1cd0]]
Former-commit-id: 289581854902b6b7afca298a5206205b3b06131f [formerly add3189b75]
Former-commit-id: 90d755c919
2012-04-20 15:30:57 -05:00
Matt Nash
0472be6d25 Issue #429 first round fixes color
Former-commit-id: 71c193409d [formerly 0a81707a7f] [formerly 5f47f98662] [formerly 71c193409d [formerly 0a81707a7f] [formerly 5f47f98662] [formerly d34e2722b0 [formerly 5f47f98662 [formerly 901770d888a39df452e60d9ac6c5d7e071d6a810]]]]
Former-commit-id: d34e2722b0
Former-commit-id: 5142935ba3 [formerly 0675f46988] [formerly d5463082f48a5fc9672040fd917bfacce67292cd [formerly b5f8783a94]]
Former-commit-id: 1818b4ddb01addaa97e56117c7d86c418e6a7d91 [formerly 36f8d74418]
Former-commit-id: 370d8a36b4
2012-04-20 15:30:57 -05:00
David Gillingham
b3332b11bf Issue #473: Fix CWA and TCS plugin's decoders to use ingest file name for datatime.
Change-Id: I54bbf7f1562ff48617721f6d88ef536c0afd7b61

Former-commit-id: 715dce7557 [formerly 30d5e0d2dd] [formerly bdbc16d31c] [formerly 715dce7557 [formerly 30d5e0d2dd] [formerly bdbc16d31c] [formerly 58e7a0f310 [formerly bdbc16d31c [formerly d3681dc1ed59d0f85b7de44277c52907d242aa29]]]]
Former-commit-id: 58e7a0f310
Former-commit-id: 102d8422bd [formerly e8fdf9d48f] [formerly ff55759d39974cfeacc3f63affe868b26ce230a0 [formerly 5850d4cfb1]]
Former-commit-id: 4b2c95a7187d74cbbaf13ae3aeabb2b9741c4291 [formerly 7fa9358be9]
Former-commit-id: 1be4f67cbb
2012-04-19 17:10:08 -05:00
Max Schenkelberg
70c1389120 Issue #239 Started persistable object event pattern. Made construction
of single color images cheaper to allow object construction to happen
immediately 

Former-commit-id: 3f4defd7a4 [formerly 9d0eecb9b1] [formerly 523c90b697] [formerly 3f4defd7a4 [formerly 9d0eecb9b1] [formerly 523c90b697] [formerly da5e17d6e3 [formerly 523c90b697 [formerly 995ddaebb670eb1689aeb44e3cb760731db46e80]]]]
Former-commit-id: da5e17d6e3
Former-commit-id: 005381bf33 [formerly baf778717f] [formerly 99493f0a6512f938cc206c6c3028723ee75fa6ad [formerly f05528979d]]
Former-commit-id: e630994f79260e9196ebbd39360478c957ab5c8d [formerly 04cf9dba60]
Former-commit-id: f6a582c033
2012-04-19 16:03:07 -05:00
Nate Jensen
f52b87ea27 Issue #427 fix peer to peer
Change-Id: Iae7f0d4c5f3f28360a957768fa755809fe47c171

Former-commit-id: 565d9e18c4 [formerly 38dcb603b2] [formerly 8da43825d0] [formerly 565d9e18c4 [formerly 38dcb603b2] [formerly 8da43825d0] [formerly 62c5527e17 [formerly 8da43825d0 [formerly b8ca7f7c0d329c1d7bb527317fc89794ea4dbac0]]]]
Former-commit-id: 62c5527e17
Former-commit-id: 4756c0274b [formerly 26f41aa6ad] [formerly 4f4c3f804ffc342d500ba13600f4badb63c6d9ce [formerly 7fdc45a275]]
Former-commit-id: 7958e7b00dc4c51421e4ecfa2063c00fa809927f [formerly 3b749bfff8]
Former-commit-id: 4fa7c6a38f
2012-04-19 15:27:52 -05:00
Nate Jensen
97777345e5 Issue #427 cleanup
Change-Id: I74f9d6e99849f66ef33340685fbb08b4c9c1b768

Former-commit-id: 5677f8e788 [formerly 7398c40a72] [formerly efc911ac9d] [formerly 5677f8e788 [formerly 7398c40a72] [formerly efc911ac9d] [formerly 7f08b7cd22 [formerly efc911ac9d [formerly ee08cc7a0d81fd83b90398119add8fad3428283b]]]]
Former-commit-id: 7f08b7cd22
Former-commit-id: 0e64b04ff3 [formerly 629be1f9ab] [formerly cf36d6d0c0706d43f650541919673ae7bcf1b8ca [formerly 0951143f26]]
Former-commit-id: cdc17e966647b48c39554a4f31ef9da343981430 [formerly 6367124fcf]
Former-commit-id: f0e56aa8b8
2012-04-19 13:38:16 -05:00
Bryan Kowal
f3fc0d0c89 Issue #501 - eliminated (duplicate statements) unreachable code to fix the Wes2Bridge build.
Former-commit-id: dbcc538fa8 [formerly 72068507a9] [formerly b1561d67a0] [formerly dbcc538fa8 [formerly 72068507a9] [formerly b1561d67a0] [formerly b90b6f101e [formerly b1561d67a0 [formerly 28f2145d82ce3030cebfb0a14aa8457fee992e13]]]]
Former-commit-id: b90b6f101e
Former-commit-id: 562a5377f0 [formerly 0514785b3a] [formerly 8c618e7da663f49943d266edd03a91c9b60e6eb4 [formerly a9b51192d2]]
Former-commit-id: 791fcbd072a534d67245c9440c80f6ea097a6365 [formerly a610f40857]
Former-commit-id: e14e8e473e
2012-04-19 13:09:58 -05:00
Max Schenkelberg
f0a90ad028 Issue #358 Fixed merge errors when merging core_exp into ss_sync
Former-commit-id: 9126809973 [formerly e03ee60c75] [formerly 1294fa0ca1] [formerly 9126809973 [formerly e03ee60c75] [formerly 1294fa0ca1] [formerly 90a5c20b5a [formerly 1294fa0ca1 [formerly bd93246cccd1b123598006d7343eac265392695d]]]]
Former-commit-id: 90a5c20b5a
Former-commit-id: 937f4b6aa3 [formerly 51a826384e] [formerly 2e1507a1308f6373329e72eb1d9ccc52bd416fb3 [formerly 65c864aff2]]
Former-commit-id: 7d5e1d641386de98262499c8ba677d6c85554bf1 [formerly 72a27b7ae0]
Former-commit-id: 33d08f1496
2012-04-19 11:11:34 -05:00
Steve Harris
0cf19dc505 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: 634d40a156 [formerly 63f11892e8] [formerly 4d7572a632] [formerly 634d40a156 [formerly 63f11892e8] [formerly 4d7572a632] [formerly 625cd4262c [formerly 4d7572a632 [formerly 5e1b9319941eed516a08a135a2049c14bad77863]]]]
Former-commit-id: 625cd4262c
Former-commit-id: 6aa0898aae [formerly e86dc647be] [formerly f6efcfd8ee5a2a4ca8ad3ed217945853b75bfa5f [formerly def458753d]]
Former-commit-id: 8ce2584572b74cd38fac4b323558490c8c29e686 [formerly 19657ae52d]
Former-commit-id: 9b8c6e395d
2012-04-19 11:11:02 -05:00
Nate Jensen
4525465ff9 Issue #427 consolidated user ids
Change-Id: I008c47320bbb5819db0607e7f695b3ecffa30387

Former-commit-id: c41304a6b3 [formerly a7122f032d] [formerly 006785e374] [formerly c41304a6b3 [formerly a7122f032d] [formerly 006785e374] [formerly 919f6907d3 [formerly 006785e374 [formerly 9e137757a7ed7bd9f319a1984aed40b6de960a35]]]]
Former-commit-id: 919f6907d3
Former-commit-id: 55a55ac45e [formerly 14f83aaf72] [formerly a8091c1e3479bf21ba2e26f9268972064067bdd0 [formerly 35d4ef153f]]
Former-commit-id: 124ab2ce8e8bc52fb3e14acb15702e86bed10ecf [formerly 877ebfe2c0]
Former-commit-id: 20b78b632b
2012-04-19 10:45:25 -05:00
Nate Jensen
0a797c374e Issue #427 exceptions are good
Change-Id: I67bb428804d025d20423b9e2320006c70e9b4c68

Former-commit-id: 591fece195 [formerly 818467680e] [formerly 47639de899] [formerly 591fece195 [formerly 818467680e] [formerly 47639de899] [formerly 24ae50a37b [formerly 47639de899 [formerly ec20a1f9d6076c2f72909f9fb9a6c88598201dcf]]]]
Former-commit-id: 24ae50a37b
Former-commit-id: 2005e2aab2 [formerly 2af95d03e8] [formerly 9ab7edc0e870591cd06166afaa39c1d01f392519 [formerly 0cbcc74457]]
Former-commit-id: b10b45d5527546c88f7655aa082c3ff956ab7920 [formerly c1271c3377]
Former-commit-id: 64f6cb3fb0
2012-04-18 17:05:27 -05:00
Nate Jensen
c7b6ba49fb Issue #427 more cleanup
Change-Id: I82018bb21bed8c2e0d948da915f80ef33061615e

Former-commit-id: 9b0d08a25d [formerly 7157aea007] [formerly a54660c377] [formerly 9b0d08a25d [formerly 7157aea007] [formerly a54660c377] [formerly 8124a47b94 [formerly a54660c377 [formerly 1d24813371c2dec40ff90657705048083e03a9db]]]]
Former-commit-id: 8124a47b94
Former-commit-id: cfac54682a [formerly 904c93d394] [formerly 282b17e07f5c33e7ada97f6fdf14417b9f1ddb85 [formerly 888d927468]]
Former-commit-id: 556d88bf2b571576b90c51d45b497075e89a25ec [formerly acc96c95b9]
Former-commit-id: 61039a63d8
2012-04-18 16:20:39 -05:00
Steve Harris
5b35d8a6e0 12.4.1-4 baseline
Former-commit-id: 4767b0e069 [formerly 750b7543dd] [formerly 67a5a68300] [formerly 4767b0e069 [formerly 750b7543dd] [formerly 67a5a68300] [formerly 2a216f333c [formerly 67a5a68300 [formerly ad648deaf4d3edaabdda15184289b3a927308bd7]]]]
Former-commit-id: 2a216f333c
Former-commit-id: 98d8b3f188 [formerly a2a6a18fae] [formerly e8514db31c64b82122112f0e87cbbf3cda2d8c2b [formerly a4e519f3cd]]
Former-commit-id: 816045b74a6ddb3791f4e241a6f25a4d4ab3391a [formerly 8cd5974f4c]
Former-commit-id: 74b66d9683
2012-04-18 15:18:16 -05:00
Nate Jensen
d8b5336d50 Issue #427 more cleanup
Change-Id: Id2ad63a51e9a891801d2422547f855cd769a83d3

Former-commit-id: 3aa4f62ac6 [formerly f5c1e766af] [formerly c33cf2538c] [formerly 3aa4f62ac6 [formerly f5c1e766af] [formerly c33cf2538c] [formerly fa9c91e03d [formerly c33cf2538c [formerly 258df7c2187c1ebcecf1abf905ec2cc4e60464e0]]]]
Former-commit-id: fa9c91e03d
Former-commit-id: 81657c1a77 [formerly fba5e2c176] [formerly 38ac0e6719dadb670dbfdc771c364e8223e7c8f3 [formerly 8830e1c1c9]]
Former-commit-id: a217ddec397c70273a21fdbe94c7e486efaf50bb [formerly cd30e96235]
Former-commit-id: 6cd9b40e0f
2012-04-18 14:15:18 -05:00
Max Schenkelberg
acf9369ddf Issue #239 Got reprojection event working
Former-commit-id: 46c1cf8e39 [formerly 6efccf10a5] [formerly 29f24e3ec5] [formerly 46c1cf8e39 [formerly 6efccf10a5] [formerly 29f24e3ec5] [formerly 005beff18a [formerly 29f24e3ec5 [formerly 99e432cd258c9bf570a66be4702d28ac68204052]]]]
Former-commit-id: 005beff18a
Former-commit-id: 819dd84dd6 [formerly 8096fc5ad3] [formerly 8a78d45f0fa487976a4676705a2ced495365e4af [formerly 044f21e405]]
Former-commit-id: fb0b45cfb9dda20064ca4b44df06d4e89c58424a [formerly fef058d9c6]
Former-commit-id: 0e60d7deb0
2012-04-18 14:01:09 -05:00
Nate Jensen
14c52b992c Issue #427 cleanup
Change-Id: I2a294a679f8cfb1ed62a63a95bcd21b4954194a3

Former-commit-id: fe0baf5515 [formerly c986c29e6c] [formerly ec2a0e39ed] [formerly fe0baf5515 [formerly c986c29e6c] [formerly ec2a0e39ed] [formerly d6e119bde1 [formerly ec2a0e39ed [formerly feaa63a200183b87c45a4fcea6b655cf4b1a826f]]]]
Former-commit-id: d6e119bde1
Former-commit-id: 5b5d7d0e7c [formerly 033e7768ed] [formerly f7707c6b096715da51ec34551f58decf2cd0391e [formerly 601b6628f7]]
Former-commit-id: 0efc903708726d0d9e19d19426195391060a5868 [formerly 3de8de66ab]
Former-commit-id: c685802c45
2012-04-18 13:44:24 -05:00
Max Schenkelberg
82ab3e438f Issue #239 Added ability to remove remote graphics functionality from
editor.  Execute on session shutdown

Former-commit-id: 7c09df3cc0 [formerly cc6386f9f6] [formerly bbb8d0e596] [formerly 7c09df3cc0 [formerly cc6386f9f6] [formerly bbb8d0e596] [formerly c64d84d1b5 [formerly bbb8d0e596 [formerly 8a2d8b0ce27364eae1bc7e696a5d1074e03169dc]]]]
Former-commit-id: c64d84d1b5
Former-commit-id: add307f5bd [formerly f7616d9c15] [formerly 4661f0efcc23248722873b2218c7e248eb554c0e [formerly d4bff8bbc5]]
Former-commit-id: a13cda88944579fc7e5015de2982163bf85c33c6 [formerly 03039f66a1]
Former-commit-id: 1bb54b82df
2012-04-18 10:49:15 -05:00
Nate Jensen
79d81e92e4 Issue #427 fix non-collaboration sessions
Change-Id: I5f39311d65c16a097692a76e087598d577fe7a4b

Former-commit-id: 8625a90436 [formerly 58633e1f18] [formerly b8cec96f21] [formerly 8625a90436 [formerly 58633e1f18] [formerly b8cec96f21] [formerly fa0f61a85e [formerly b8cec96f21 [formerly 607ec4474b96f9670c53ba69295fa66a2880ff7e]]]]
Former-commit-id: fa0f61a85e
Former-commit-id: 347cf62f56 [formerly 504f0768f0] [formerly 4e92eef5bdc3650a2b4727cb75c5997f41d09866 [formerly 9f055f8ec9]]
Former-commit-id: 96caf7d2303813696cf66f24913a22ca10bac6b5 [formerly 6be9c44303]
Former-commit-id: a21876d150
2012-04-18 09:49:38 -05:00
Nate Jensen
fff330e866 Issue #427 cleanup and fix errors
Change-Id: I4d949cf2e5a874793df875de8eed9b296801e32c

Former-commit-id: 2daf829da1 [formerly 82906d1200] [formerly ee90af8052] [formerly 2daf829da1 [formerly 82906d1200] [formerly ee90af8052] [formerly 6b0d3a958c [formerly ee90af8052 [formerly ae78675364b412d2b06da0819e87618b8c9ab6a8]]]]
Former-commit-id: 6b0d3a958c
Former-commit-id: 4c83cb567c [formerly 5aeccb9ed5] [formerly 80b0af7b683700c0174333695c2e49c7398a7663 [formerly e6bce354e8]]
Former-commit-id: d671c01bc53e8c460e9f0514b21c19855f4812ae [formerly 81370cd7c9]
Former-commit-id: 25f299e811
2012-04-17 18:05:24 -05:00
Max Schenkelberg
794a8c4eff Issue #239 Got radar and radar mosaic working for collaboration
Former-commit-id: 71e54d0aa5 [formerly fae382a91a] [formerly d37d8f9bea] [formerly 71e54d0aa5 [formerly fae382a91a] [formerly d37d8f9bea] [formerly 96c81a03df [formerly d37d8f9bea [formerly a8c0dd15e221a6415c44f73897a80bc4b69e5ca0]]]]
Former-commit-id: 96c81a03df
Former-commit-id: 142730720e [formerly c6761afce5] [formerly e5f7d10250129ff8077a4d8393b247168d687b5d [formerly dbe18c16d2]]
Former-commit-id: 272097beab1ae876448aaa583ddec2dc9cd4ed08 [formerly 4dd82a9211]
Former-commit-id: 554e519e8c
2012-04-17 17:47:21 -05:00
Nate Jensen
8361c24243 Issue #427 send input events back as session leader
Change-Id: Ib1dacebdd94892bd9837b9bd91463bc6646fbccb

Former-commit-id: f881116fe4 [formerly 9d3c8321e5] [formerly 9885949b27] [formerly f881116fe4 [formerly 9d3c8321e5] [formerly 9885949b27] [formerly 2d822df43f [formerly 9885949b27 [formerly 16af3874c9416b75edc00b4ad928de8a30e47abf]]]]
Former-commit-id: 2d822df43f
Former-commit-id: 8e29ac4298 [formerly 09b67f9d5d] [formerly e612e2e02f64061e5327cbe2800fd693686911d0 [formerly 1b0975e7fa]]
Former-commit-id: 3a774bc55dab7360d249ad2214d77d072e8bbfae [formerly bdd6e1d211]
Former-commit-id: 4a010704a5
2012-04-17 17:26:49 -05:00
Richard Peter
daa9ee3dff Merge "Issue #449. Fixed problem with simulated time for trend plots in FSS monitors." into 9-Wes2Bridge
Former-commit-id: 2f351f13f7 [formerly 5bb20ff4a3] [formerly 709be7733b] [formerly 2f351f13f7 [formerly 5bb20ff4a3] [formerly 709be7733b] [formerly be060f1b1c [formerly 709be7733b [formerly 2a3492987c4cd9751aad2c6e20230f983e68f4b5]]]]
Former-commit-id: be060f1b1c
Former-commit-id: a8ab19c6f2 [formerly 9c49c39669] [formerly 17dcac1fcd432101a572e81e1a87d3a53a7d0082 [formerly 4a93a365bd]]
Former-commit-id: bd06abc51621344835c54065591dda85b12a90ec [formerly 797ee329df]
Former-commit-id: 58e6f4140d
2012-04-17 13:16:22 -05:00
Max Schenkelberg
c1dcff8853 Issue #239 Fixed mosaic bug, refactored dispatching colormap images so
mosaic could resuse

Former-commit-id: ee7595c10b [formerly c1ebd04d4d] [formerly 40ca446e53] [formerly ee7595c10b [formerly c1ebd04d4d] [formerly 40ca446e53] [formerly 29184d46ce [formerly 40ca446e53 [formerly aea5c30443970933bf1517ced6d7e91a1008c9d5]]]]
Former-commit-id: 29184d46ce
Former-commit-id: cda6539168 [formerly e68e6130a0] [formerly d1c4de5262708c6e3906138f931f0ffb04bab9b6 [formerly a82f07b25d]]
Former-commit-id: d904e2ed0b4a7ac3c464191af37ad8415e5b07e3 [formerly 78126cd777]
Former-commit-id: b681ea25a2
2012-04-17 13:09:07 -05:00
Brad Gonzales
53c16b6ef3 Issue #443 Tools.java, GZIP and ZLIB compression. ZLIB by default.
Former-commit-id: 7aeb5fac62 [formerly 700347780c] [formerly 1226cd9996] [formerly 7aeb5fac62 [formerly 700347780c] [formerly 1226cd9996] [formerly 23c85cd4b5 [formerly 1226cd9996 [formerly a03ed123392d4a8a4864a42f7d3b09e71057fbd0]]]]
Former-commit-id: 23c85cd4b5
Former-commit-id: 87b4aa406d [formerly f57e108e2d] [formerly 50f6f6a9353ffbbdc62c39a5a652b1e57c6a4cb7 [formerly 9a81f16961]]
Former-commit-id: 9c4d9c539bc189d489f11d19423542d583b8571c [formerly c8263a8e5e]
Former-commit-id: 9431deb71d
2012-04-17 09:57:01 -05:00
Nate Jensen
dec0435887 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: 18b0a5c622 [formerly b57be7c646] [formerly 28b643ad74] [formerly 18b0a5c622 [formerly b57be7c646] [formerly 28b643ad74] [formerly 0f5a451fa5 [formerly 28b643ad74 [formerly a02a78e1a44df9bfe90cf7a65c8b16176b48e535]]]]
Former-commit-id: 0f5a451fa5
Former-commit-id: 76a5f4a718 [formerly 44ff9ea68d] [formerly d4f08edda4adf325b99f6a6f3b4320f3a7cd96c8 [formerly 7fc2de9425]]
Former-commit-id: 7a65158d26ae94d1a440258db4796c99b76b4553 [formerly 8ba092ee17]
Former-commit-id: 2d1481f82a
2012-04-17 08:53:01 -05:00
Max Schenkelberg
0e28862552 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: a9864fa590 [formerly 490c75f684] [formerly 9b018ea151] [formerly a9864fa590 [formerly 490c75f684] [formerly 9b018ea151] [formerly 7d2a7d987d [formerly 9b018ea151 [formerly 79f4d46bf18fc03c79df0c80c8dde025fe954f0c]]]]
Former-commit-id: 7d2a7d987d
Former-commit-id: 652dc33e7f [formerly fcb459e91d] [formerly ea904c0632a530246f3994e307cb058b799313b4 [formerly fa3d39c5e2]]
Former-commit-id: fc9e8981c63fc38e320856e656d775ffd1034960 [formerly ab94346224]
Former-commit-id: 6f1c372790
2012-04-16 17:29:59 -05:00
Bryan Kowal
af724d221a 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: e5c1761860 [formerly 51688bb591] [formerly fadb50446d] [formerly e5c1761860 [formerly 51688bb591] [formerly fadb50446d] [formerly 298ab2e057 [formerly fadb50446d [formerly 5afc6ff942850e0781da96bdeaa1fb4ee7d54000]]]]
Former-commit-id: 298ab2e057
Former-commit-id: 706deb7c81 [formerly fb02245232] [formerly c9ae7cff3acaca8aa2da593554b31f3a03757a19 [formerly 62e4e0bbea]]
Former-commit-id: 0a517de94bd683b763a00f53701f6f88f16d1af0 [formerly b00be4fdeb]
Former-commit-id: f6e4e22f23
2012-04-16 17:00:30 -05:00
Matt Nash
7ff544dca5 Issue #429 fix spelling
Former-commit-id: a75e5d6773 [formerly 451a00a558] [formerly cd8ce46352] [formerly a75e5d6773 [formerly 451a00a558] [formerly cd8ce46352] [formerly 6b4d328bc4 [formerly cd8ce46352 [formerly 2d2a0b492690166e89339300281f44a37e532dec]]]]
Former-commit-id: 6b4d328bc4
Former-commit-id: dbf4971339 [formerly cf4bc37883] [formerly 5b25d8e9880b2eb50aac3c1617beb4fc68d038d4 [formerly 86954f6071]]
Former-commit-id: 28533f29088104bc4a02ce521619a826370b60bb [formerly 2f4cb1c5bf]
Former-commit-id: a872e1cc33
2012-04-16 16:51:22 -05:00
Matt Nash
d0ed0b4f59 Issue #429 change name of editor sharing
Former-commit-id: 6e59bde3d7 [formerly dfba9a1d0d] [formerly 9b7a839cdd] [formerly 6e59bde3d7 [formerly dfba9a1d0d] [formerly 9b7a839cdd] [formerly ac3b674bf3 [formerly 9b7a839cdd [formerly 199c8c6af547dc66e8cb068e2617a96f3b68d515]]]]
Former-commit-id: ac3b674bf3
Former-commit-id: d54f9d9ca7 [formerly b71d725791] [formerly 3d0b7cd83ba6a112cf97ba910f244ff7a2204533 [formerly 87a5511a7c]]
Former-commit-id: 8574634f1bb6a543b18c807811d9dcc30cd00b8a [formerly 98a0dd0f67]
Former-commit-id: 494f81ffcf
2012-04-16 15:40:37 -05:00
Roger Ferrel
97137b1eb8 Issue #437 Check for null session in ParticipantsLabelProvider.
Change-Id: Ie327860fdf1feac700e646885a641a283fe54291

Former-commit-id: 69675cf20b [formerly e326edf566] [formerly 8dd86fc331] [formerly 69675cf20b [formerly e326edf566] [formerly 8dd86fc331] [formerly 208f84da4d [formerly 8dd86fc331 [formerly 7e73af55a678595cb39f58e109235f9a0310d14c]]]]
Former-commit-id: 208f84da4d
Former-commit-id: 3f7f7666b8 [formerly 05399a980f] [formerly cbd2235651f41b2540abd22793276b3487ecf1f5 [formerly 11d59449ca]]
Former-commit-id: d69a46a8bef1533e9c9490aaf8831bede3463fa3 [formerly 64b9af0895]
Former-commit-id: c9fcb71cb7
2012-04-16 13:36:27 -05:00
Roger Ferrel
d29e1fa4d8 Issue #432 In Collaboration Session View roles now properly update the icon.
Change-Id: I970cd006464359acae17dc71705d76e0083c016e

Former-commit-id: 6a1ae6a396 [formerly c47521f4b9] [formerly 4266d74fb4] [formerly 6a1ae6a396 [formerly c47521f4b9] [formerly 4266d74fb4] [formerly cca947d3ec [formerly 4266d74fb4 [formerly 7ad908ac8ef6d276c3294e4c7590e07972b0fd79]]]]
Former-commit-id: cca947d3ec
Former-commit-id: 4290f8477e [formerly d13d6c63d0] [formerly 4958d366641efd2c4a81fd15cce49d296e6154d1 [formerly b290f3beb6]]
Former-commit-id: 7480c7223c7903285d63cad0cfacb3a07b6736bb [formerly 68cb6f4104]
Former-commit-id: e2d2ee6a6a
2012-04-16 13:07:03 -05:00
Nate Jensen
e1b018a1ed Issue #427 attempt to fix collaboration build
Change-Id: I30297eebe969601b5a803ccd58e9e69f5ac0e515

Former-commit-id: 5fd1dfbe50 [formerly a876c29a8f] [formerly 6b84101223] [formerly 5fd1dfbe50 [formerly a876c29a8f] [formerly 6b84101223] [formerly a823db85be [formerly 6b84101223 [formerly d011c6f975cae23d5f6dc47ff8faa03f973f28e8]]]]
Former-commit-id: a823db85be
Former-commit-id: 3aa29dcd35 [formerly c6f42b4a70] [formerly 1961fdb86854a9301e4380d20b476561b8415277 [formerly c278bcd9fe]]
Former-commit-id: 62c44f7a2387c5a5a5871f7c0a4c7410ac83441a [formerly 95d0a0e282]
Former-commit-id: 29fec3f19c
2012-04-16 12:58:56 -05:00
Nate Jensen
6545e483be Issue #427 fix drawing icons
Change-Id: Ib7b04baf7f8ab528070c455c1e3e081be56124e0

Former-commit-id: af67b7fec0 [formerly 25b8851589] [formerly 446052111f] [formerly af67b7fec0 [formerly 25b8851589] [formerly 446052111f] [formerly 1d3666a10e [formerly 446052111f [formerly 50f3e0babfb5c38b814be13802bb61f04e73e56f]]]]
Former-commit-id: 1d3666a10e
Former-commit-id: 8385590d1e [formerly 58fec0767d] [formerly 28d502fab55e6c56f49074fa0610d25997957e9c [formerly 6c381ceb01]]
Former-commit-id: 78df5a1a7c5a57c03811b7a11761c8184238370b [formerly bb8235126d]
Former-commit-id: 5d490fe2f4
2012-04-16 12:54:29 -05:00
Nate Jensen
3097bbed6a Issue #427 cleanup and refactoring for ease of use
Change-Id: I93f75663ace61b454b52d1e451677a0e42c2d481

Former-commit-id: cfd65777dd [formerly 02b0f1bd5f] [formerly fc1c1d5f16] [formerly cfd65777dd [formerly 02b0f1bd5f] [formerly fc1c1d5f16] [formerly d9c24599ea [formerly fc1c1d5f16 [formerly 23ba31dc2479e9e1e2b45e9237c92a7adf12a6c5]]]]
Former-commit-id: d9c24599ea
Former-commit-id: c234f0cfdb [formerly 69061ada62] [formerly b8e63e2dfe8e14521c85c28d063596d80554ff95 [formerly e3c7b4d2e2]]
Former-commit-id: 7fd77321c791b8b3f383bc5dcc0dc0ddfd009600 [formerly 72c5485597]
Former-commit-id: cbfa2649d4
2012-04-16 12:37:40 -05:00
Matt Nash
cbc3994353 Issue #429 minor tooltip fix, and double click fixes for unavailable users
Former-commit-id: 4d5368e8b9 [formerly 79088f4129] [formerly 967b8ed671] [formerly 4d5368e8b9 [formerly 79088f4129] [formerly 967b8ed671] [formerly 30d5ccc641 [formerly 967b8ed671 [formerly 408c7cfaa970e6b460fda819fba0f02810c2dc19]]]]
Former-commit-id: 30d5ccc641
Former-commit-id: 2038e8123a [formerly 477c842174] [formerly ddfa020b2016c31a30ed3dfc39848250fa8bb228 [formerly ed644a9031]]
Former-commit-id: 7762450eb587dcfa1b2014031be2e2cb8863cad9 [formerly 69f61c5faf]
Former-commit-id: 8e28fd3060
2012-04-16 11:16:50 -05:00
Matt Nash
d402170f18 Issue #429 set editor and view title the same, add separator to menu above collaboration
Former-commit-id: 1607b7cdb6 [formerly dd88bf775c] [formerly 780fd03203] [formerly 1607b7cdb6 [formerly dd88bf775c] [formerly 780fd03203] [formerly d20fe3cfff [formerly 780fd03203 [formerly c045890c6da56c258dfa44610e7225a3f914e0ef]]]]
Former-commit-id: d20fe3cfff
Former-commit-id: 6bea493d6e [formerly d2f183205a] [formerly 0ed3cb12f6d64edaca807a2d18444a39537c371d [formerly ef0e2814ef]]
Former-commit-id: 2e52b78b41388f0b678b3cea13f68e36349d3e41 [formerly 6171652e4c]
Former-commit-id: e2b84386b9
2012-04-16 10:03:31 -05:00
James Korman
436c596c10 Issue #437 - removed Leader presence/modified subscribed handling.
Former-commit-id: f9513ac55e [formerly d87e47a5f3] [formerly dab86c62fc] [formerly f9513ac55e [formerly d87e47a5f3] [formerly dab86c62fc] [formerly defb083771 [formerly dab86c62fc [formerly 57673abac66b21596c71737d0aa1537c13982ac0]]]]
Former-commit-id: defb083771
Former-commit-id: 715d8e9a4c [formerly 0822fc6ae6] [formerly 87675161148de44dbb7992da425501196d792a37 [formerly 8e84ed72f7]]
Former-commit-id: 1efda89bf27223c32d1405b359f7e6c742d53830 [formerly 1af29eff2e]
Former-commit-id: bced718bdb
2012-04-16 09:46:12 -05:00
Bryan Kowal
760b3bcf46 Merge "Issue #450 - add the cave viz collaboration rpm to the yum groups." into 11-Collaboration
Former-commit-id: d4fee27e69 [formerly 66f48c3586] [formerly ffe22bdedc] [formerly d4fee27e69 [formerly 66f48c3586] [formerly ffe22bdedc] [formerly adb56099a5 [formerly ffe22bdedc [formerly 170d1e2a92debece0efd0a1b30a281e70c7a8b77]]]]
Former-commit-id: adb56099a5
Former-commit-id: 95a9247268 [formerly ba54e9da49] [formerly a6e48c5a2f681f86288839b9ded221e1fd7f5a19 [formerly a0225560cc]]
Former-commit-id: fa2541fb507c165f8c64f81bdfbece8932dc7c72 [formerly dfc37816b8]
Former-commit-id: 64ae4d5429
2012-04-16 09:40:36 -05:00
Roger Ferrel
56ce59b81c Issue #437 Fixed typo that cause multiple grops siteings in Collaboration View.
Change-Id: I2fc329b101532f3da99a58c320ceb7fa109c7e5b

Former-commit-id: 1a4d155b5a [formerly 866472438f] [formerly 3f12223532] [formerly 1a4d155b5a [formerly 866472438f] [formerly 3f12223532] [formerly 020f77195a [formerly 3f12223532 [formerly 599563055eb1373601d5623752272130142c3659]]]]
Former-commit-id: 020f77195a
Former-commit-id: 2919410fd5 [formerly 1d5d56dcc7] [formerly 9b4265955f484ba8ebd8029d67e77049aea3ecd8 [formerly 588302da22]]
Former-commit-id: 4174e4da4a96e3078258622024f2d28d4f4b1bca [formerly 57078fdb45]
Former-commit-id: 89a143df14
2012-04-16 07:52:28 -05:00
Roger Ferrel
b16a453a82 Issue #437 But fix in group View enent handler, improved tooltip
Change-Id: Ibb6fc5f312f09d72df988c591408fc41e39ad674

Former-commit-id: 1907f26a0d [formerly 41e4666d55] [formerly 55ab473fd6] [formerly 1907f26a0d [formerly 41e4666d55] [formerly 55ab473fd6] [formerly 8ab764e56c [formerly 55ab473fd6 [formerly 47c81c08d9a90c271873cfa50525fb40c26db508]]]]
Former-commit-id: 8ab764e56c
Former-commit-id: 57f6674cab [formerly 7e30ab3c0f] [formerly 170a988a7b3d93afc45aa969302851bbbcc2f1c2 [formerly 1a96e80459]]
Former-commit-id: 1200df2801859a58c85808f80131fdf7d1f99a4f [formerly 91f7452c8e]
Former-commit-id: 29c1a3ffc7
2012-04-13 15:51:41 -05:00
Nate Jensen
5a00fe746b Issue #427 cleanup
Change-Id: Ifa48910d765a40d5443b237b6805fe3f71fb1c73

Former-commit-id: b79ae6a022 [formerly 6a572eafde] [formerly fd36f7d987] [formerly b79ae6a022 [formerly 6a572eafde] [formerly fd36f7d987] [formerly 982e2dae13 [formerly fd36f7d987 [formerly 330813db6cf4a1163091116cda4d41f074409d57]]]]
Former-commit-id: 982e2dae13
Former-commit-id: 79082074af [formerly 8380c175a3] [formerly a0625f32bfba2c3ee647caa29d2389f69e21d888 [formerly 71292f844e]]
Former-commit-id: 68f8992d9790b16952ad666f77638ac34b423da7 [formerly bc49969ba0]
Former-commit-id: 84de268745
2012-04-13 13:56:38 -05:00
Nate Jensen
90c165d053 Issue #427 comment for future reference
Change-Id: Ie8ffaef6e14b97bf4284efec67db8c0067cfccd3

Former-commit-id: 5f61fc206c [formerly 5cef808609] [formerly 6a387ca1ce] [formerly 5f61fc206c [formerly 5cef808609] [formerly 6a387ca1ce] [formerly 28c95001b9 [formerly 6a387ca1ce [formerly fec3497a585e5b260432307b2bcc9c0317b6f2c7]]]]
Former-commit-id: 28c95001b9
Former-commit-id: dfad8b8615 [formerly 8abede0150] [formerly b3685579e6ff9c34c557a2488ffc436092260cd0 [formerly 38c95b7f21]]
Former-commit-id: b7469cc613e6bcbbb9ccf81a5afff1bb605f5663 [formerly b570d327a1]
Former-commit-id: b79b10703a
2012-04-13 13:45:13 -05:00
Nate Jensen
ba5941c288 Issue #427 legend for shared editor
Change-Id: I98832ade44f7019f108e125d4bfefe6e37e4e9f7

Former-commit-id: a1b258a4b4 [formerly 392818bb51] [formerly 71ff27c001] [formerly a1b258a4b4 [formerly 392818bb51] [formerly 71ff27c001] [formerly a1d56fae3f [formerly 71ff27c001 [formerly c0fc780c73d16055b022af269628dfa0b3e5591e]]]]
Former-commit-id: a1d56fae3f
Former-commit-id: 120789f05f [formerly da3856aba4] [formerly 8f913eed335e49036d31b2ba6325ad72f49218ff [formerly 2ae78729f3]]
Former-commit-id: 7e289cb389da99eb93870b44ea83529fa902234a [formerly 4c3e084cf9]
Former-commit-id: bcc65fc3e2
2012-04-13 13:43:23 -05:00
Max Schenkelberg
4a897a76d3 Issue #239 Got plots working
Former-commit-id: 559bae6041 [formerly 682576fe84] [formerly 859262ea98] [formerly 559bae6041 [formerly 682576fe84] [formerly 859262ea98] [formerly 04ab27895d [formerly 859262ea98 [formerly 9c93f3670bd8c3a7a5e5330b160d5f2206b979b3]]]]
Former-commit-id: 04ab27895d
Former-commit-id: c962a31404 [formerly aedf159c8a] [formerly 195e125fc2adc09e79e5bdc22b02fc35aa7211e0 [formerly adba2b8aeb]]
Former-commit-id: 450a95118a8bafa7d4577fd74a442272c642942e [formerly 9b5481968f]
Former-commit-id: 96a33e2a7a
2012-04-13 12:56:43 -05:00