Max Schenkelberg
e8bc0cfa66
Issue #358 Fixed merge errors when merging core_exp into ss_sync
...
Former-commit-id: 74458bfb739b0d01f8b574458bfb739b0d01f8b507cf5069ba07cf5069ba4234b91d5b993cac891ef20e674318
2012-03-30 10:51:31 -05:00
Roger Ferrel
ef55405397
Issue #244 Send and accept invites now works.
...
Change-Id: I8d2c5e04f0d7dab6eb81a7321130533e5cfd6148
Former-commit-id: dc50eb06d722fff3a4b8dc50eb06d722fff3a4b8108ac66214108ac66214d3a8343de01fd4aa5cf3e3f637d951
2012-03-30 10:45:26 -05:00
Steve Harris
1556e72eeb
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: a4e4792bb5d3ad6095b7a4e4792bb5d3ad6095b75cdda77afb5cdda77afb9845ef53f96aa18f74f69fee09c9e4
2012-03-30 09:50:48 -05:00
Steve Harris
293563cfe7
12.3.1-10 baseline
...
Former-commit-id: 0e4128712b4068f5295f0e4128712b4068f5295f22bd792cd922bd792cd98bc60b1e32ce3b74c6052e0f4b241b
2012-03-30 08:38:33 -05:00
Roger Ferrel
5ce1b1bdd6
Issue #244 Gett color coding on messages
...
Change-Id: Ibe54e07c26336899198093b0a104f8796ebc0d47
Former-commit-id: 24affbfe739bd5aa57b624affbfe739bd5aa57b6d9ca310d94d9ca310d947ebba67ec330fe4140bac2c3215e2d
2012-03-29 16:52:11 -05:00
Nate Jensen
e3b025bcfc
Merge "Issue #232 - Added support for session creation from invitation" into 11-Collaboration
...
Former-commit-id: 97898c1a3c7facfe9b7c97898c1a3c7facfe9b7c0338159662033815966243f59bf79140839a5c6e1d9caad6ba
2012-03-29 16:32:15 -05:00
James Korman
d0faf1bfc4
Issue #232 - Added support for session creation from invitation
...
Former-commit-id: 08db3b2920d048f0f32408db3b2920d048f0f3246381932f6e6381932f6eea7a6ea10b2eedb16808ec96f988c5
2012-03-29 16:30:29 -05:00
Nate Jensen
48bf706df1
Issue #427 clean up
...
Change-Id: Id4bc3b27bfcbc324138a11998255a6f662f31255
Former-commit-id: ddfab0e4e3d60fcaa4f3ddfab0e4e3d60fcaa4f3a85aa4595fa85aa4595fd775bee7ae14883dfa58ced9e83aec
2012-03-29 15:45:16 -05:00
Nate Jensen
5169c34b03
Merge "Issue #429 added wrong cursor code" into 11-Collaboration
...
Former-commit-id: 5f09f55f6bb7fda1f8525f09f55f6bb7fda1f8529ce74d94309ce74d94302c4a62672325cf424a4284caa31cb7
2012-03-29 14:36:24 -05:00
Steve Harris
807547cb8d
Issue #244 Roster groups now display and improved presents.
...
Change-Id: I7965201692cab4472ce85d2525e39cf3823ab16f
Former-commit-id: b4aa83517dbf55bc0d86b4aa83517dbf55bc0d86c27ee0903cc27ee0903c8bda505069fbdf4d5c375a22143834
2012-03-29 14:36:53 -05:00
Matt Nash
1c54506eed
Issue #429 added wrong cursor code
...
Former-commit-id: c1ee2d17184e003f8723c1ee2d17184e003f87233d818405323d818405323a890f0c68acf376e126219e197290
2012-03-29 13:46:21 -05:00
Matt Nash
9f25ebc259
Issue #429 fix proxied handler error, added toolbar for drawing tool
...
Former-commit-id: 057ffedb2389d401550a057ffedb2389d401550a9beef619179beef61917fdde73906318291c4101b07f565ab9
2012-03-29 12:24:27 -05:00
Nate Jensen
a0c6c92587
Issue #427 Right click on editor tab support
...
Change-Id: Ia9240a01c145c81bbf98268d4df5fd2242ca7987
Former-commit-id: 202bd0adf8d2d3a245b3202bd0adf8d2d3a245b3aa000b4b06aa000b4b069792be406a6aae45687aac8087a21a
2012-03-29 10:44:08 -05:00
James Korman
4527f71129
Issue #232 - Added message routing/corrected roster creation
...
Former-commit-id: 8dde3a0798b45ea1e0a78dde3a0798b45ea1e0a76149d30b136149d30b13842b2c6f7d7f12149d98acc37a06c5
2012-03-29 10:16:15 -05:00
Steve Harris
0a7cb5fd7a
Merge branch 'sync_test' (VCModules) into ss_sync
...
Former-commit-id: 0665862abe70357d90bc0665862abe70357d90bca0abcf8120a0abcf812065aa72fee768845207505a310acb18
2012-03-29 10:03:05 -05:00
Steve Harris
0a5780c005
Merge branch '104-integration' into ss_sync; 4-Thin_Client and 10-Tech_Blocked (tear-off menus) -> ss_sync
...
Former-commit-id: 94e6323c0a132d68acc694e6323c0a132d68acc654a1d9cdbc54a1d9cdbc2c3f9271bf4b853c56c62f6a9ef2ac
2012-03-29 10:01:55 -05:00
Nate Jensen
80ea8cc05d
Merge "Issue #429 telestrator merging" into 11-Collaboration
...
Former-commit-id: aaba32c4c1cf880ddd0daaba32c4c1cf880ddd0d676746126c676746126c7d5d70bf55ec0896c28df809bbcb0d
2012-03-28 15:10:34 -05:00
Matt Nash
f58c0816fe
Issue #429 telestrator merging
...
Change-Id: I18f8f283db617d0865b274dcf6003a24e2cf2028
Former-commit-id: b86ee8584fd55dab5c34b86ee8584fd55dab5c3439670f675539670f67554871565ff0aeb022880c6ec5f3b2ea
2012-03-28 15:09:18 -05:00
Nate Jensen
6018238348
Issue #427 initial input event code
...
Change-Id: I37dc96ed8dbef37d8e3f7a8ae39fc6fcad59f4aa
Former-commit-id: 40dd73ba4d5fdc253d7740dd73ba4d5fdc253d77bbf96992eebbf96992ee8fbe658c89a5d38a0968454e8a72f8
2012-03-28 14:34:25 -05:00
Max Schenkelberg
e73e40dc78
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: 66eaffb9ee15a924559266eaffb9ee15a9245592f10f1a5319f10f1a5319bbab188fb9ac11dd0c182f3b9f0067
2012-03-28 13:32:04 -05:00
Roger Ferrel
dbb7bdf9a8
Issue #244 Clean up and Link editor to chat now works.
...
Change-Id: I23b12fa44b8908b6a0c5ce79ca79ad73ff26df9d
Former-commit-id: fae15273315d95a69f39fae15273315d95a69f39dc2f3316e6dc2f3316e6d29d2a1c929712ba2751a5b05aeebd
2012-03-28 11:23:51 -05:00
James Korman
979397b7be
Issue #232 - Added addition peer-to-peer events
...
Former-commit-id: fc99959e3ce8b23e3687fc99959e3ce8b23e3687ae6eddcd68ae6eddcd68356892acd60ff25a525864be5deba5
2012-03-27 16:31:26 -05:00
Nate Jensen
30740b4e48
Issue #427 minor fixes
...
Change-Id: I9788992b2de751f75ab2cc5112f2cf0492c214ad
Former-commit-id: ab63accc61fa8b5b3400ab63accc61fa8b5b34000f25c8ffa60f25c8ffa6f1c0104885a692caba1cefe77c3542
2012-03-27 09:56:46 -05:00
Nate Jensen
e2e9fb87dc
Issue #427 small improvements
...
Change-Id: I9a28888dceb268ab62f60bc9686b0130da01ca0e
Former-commit-id: 4180979cf489d7f5ec7e4180979cf489d7f5ec7e80500eec9c80500eec9c7d6bfd3a0b9602216cda92a9726d83
2012-03-27 09:42:39 -05:00
Nate Jensen
272563edbf
Merge "Issue #244 Tied CollaboratonEditor to the view." into 11-Collaboration
...
Former-commit-id: fc5e53b1c2c6e046f11efc5e53b1c2c6e046f11eb2655debe8b2655debe854469fd8b543b58266c5cc6b5250b3
2012-03-27 08:36:25 -05:00
Nate Jensen
e839afd355
Merge "Issue #244 Localization of login data and removal of messanger and participant listeners." into 11-Collaboration
...
Former-commit-id: 4d32c5e078d40b15acc24d32c5e078d40b15acc2d09c8a9383d09c8a93834a2d3cd071f95cba545b4653f3dd4f
2012-03-27 08:36:15 -05:00
Nate Jensen
009ae65184
Merge "Issue #232 - Added JAXB serialization support" into 11-Collaboration
...
Former-commit-id: 4073ba7e7d978b76066c4073ba7e7d978b76066ced44b0d93fed44b0d93fd62fc782918b06b022810805c13d39
2012-03-27 08:32:19 -05:00
Roger Ferrel
027e4f4254
Issue #244 Tied CollaboratonEditor to the view.
...
Change-Id: I67b9b2f9f1a71f1f131584cdb138c54788cac165
Former-commit-id: 76f9c71d41a27025955376f9c71d41a270259553d001287c94d001287c948dae35657226122319dbebbf625538
2012-03-26 17:30:51 -05:00
Roger Ferrel
cca7866880
Issue #244 Localization of login data and removal of messanger and participant listeners.
...
Change-Id: I247199030152575c82b8320fa0cbdeddb62fa662
Former-commit-id: df5a2662bab180f9b45edf5a2662bab180f9b45e95d8d85fd095d8d85fd0c132fbf6418f75dd68dec06762598e
2012-03-26 17:30:50 -05:00
James Korman
0d10f43adb
Issue #232 - Added JAXB serialization support
...
Former-commit-id: fc2bd8c66672e9c2eb52fc2bd8c66672e9c2eb52221a5a65b0221a5a65b0eff90a5c4b02bbe80c7c745f256590
2012-03-26 16:48:04 -05:00
Nate Jensen
e9f2d75d95
Issue #427 event controllers use ISharedDisplaySession
...
Change-Id: Ia0e41dcb7f0b49956a4a3c88a037894b972435c9
Former-commit-id: ef03821455f6226a89d9ef03821455f6226a89d9cbf105015fcbf105015fff5fec3f09e28fc62a56b6be43d0e5
2012-03-26 16:37:44 -05:00
Nate Jensen
4605f1b00a
Issue #427 fix xml serialization
...
Change-Id: I795fe5a47fc2ed678a431795a6242382b3ef6654
Former-commit-id: e24039ae5c7c6e0a41f7e24039ae5c7c6e0a41f72a1e40b2d52a1e40b2d5ecc3dc9a70a1e2c3173dc8b94860a0
2012-03-26 15:47:34 -05:00
Nate Jensen
6580f92e65
Issue #427 initial role based event handling
...
Change-Id: I73d4df3f09c7cfa60025142ec5a4dccdad4423bb
Former-commit-id: bac31f36134d7a53c583bac31f36134d7a53c583619d19e24c619d19e24c998c9df26062b16fef0d2e4e000720
2012-03-26 13:05:01 -05:00
James Korman
551d38bee3
Issue #232 : Large refactor - Add command interfaces
...
Former-commit-id: 5bb4a7952be408ed1a285bb4a7952be408ed1a28d51a8521f8d51a8521f8fb0614ad9ee83de7447b61f8b804cb
2012-03-26 10:17:17 -05:00
Roger Ferrel
ff4822d3ef
Issue #244 Added participant even handler for SessionView and put in code to get groups(rosters).
...
Change-Id: I4a7501859f2681b290ad0babf4dab9cbca80e102
Former-commit-id: cd66a9c29c04b5a92838cd66a9c29c04b5a92838ce72b7b583ce72b7b583e649f9da42053c4ba5973f08de49fd
2012-03-22 16:57:30 -05:00
Nate Jensen
28931de3c6
Issue #427 Share maps and editor
...
Change-Id: I6bd3148ec199c348ffd85d08322fdb8befa4096c
Former-commit-id: 37d4401747615962f5dd37d4401747615962f5dd0e214bcd7c0e214bcd7c8d947718542801c4fdfb98fb91164b
2012-03-22 09:39:59 -05:00
Bryan Kowal
c52c131e5c
Issue #19 - fix ldm so that it will handle both date and sequence substitutions correctly.
...
Former-commit-id: 5ba68624c58a4c883e0b5ba68624c58a4c883e0b31f989ecb431f989ecb4e27502effd81a360d139339d963f90
2012-03-21 16:49:38 -05:00
James Korman
5702fc837c
Issue #232 - Delete files from original locations
...
Former-commit-id: 4dabfd8c2a90b74b258a4dabfd8c2a90b74b258a55f269100c55f269100cd0976e47039badd0fb07f3f6778df2
2012-03-20 14:55:27 -05:00
James Korman
9d51b9c893
Issue #232 - Considerable refactoring/event processing
...
Former-commit-id: 60ff4d139b4ba4ccb40460ff4d139b4ba4ccb404cc5cc2d409cc5cc2d4098be6351348c5e9df26c17f895ac63d
2012-03-20 13:59:55 -05:00
Roger Ferrel
3d8af5815a
Issue #244 Creted AbstarctSessonView and PeerToPeerView. Code clean up so CAVE exits properly.
...
Change-Id: Ibd5feeb0412e4afbe8e1f0eac79944bb059b4687
Former-commit-id: ce3b5728c51f4edd08e4ce3b5728c51f4edd08e4a7f1fc18b1a7f1fc18b1002e7eab3f9f6642d572f58fa980f2
2012-03-20 10:42:57 -05:00
Greg Armendariz
249304a035
Merge "Issue #18 - wes2bridge will now correctly handle starting multiple instances of edex; a new wes2bridge.instance jvm parameter was added to edex so the edex service startup script will be able to correctly determine which edex instance is associated with a particular wes2bridge case." into 9-Wes2Bridge
...
Former-commit-id: 9a0f313c2365b8521ccb9a0f313c2365b8521ccbd45249fb2fd45249fb2fbf867f91d3f5c96c4af21929f1df8e
2012-03-17 10:35:17 -05:00
Bryan Kowal
d7f5da6110
Issue #18 - wes2bridge will now correctly handle starting multiple instances of edex; a new wes2bridge.instance jvm parameter was added to edex so the edex service startup script will be able to correctly determine which edex instance is associated with a particular wes2bridge case.
...
Former-commit-id: 97cb8ab51c55a759fb8a97cb8ab51c55a759fb8a64cdd27f6264cdd27f623914878a65117306c734a01d2a17f9
2012-03-16 12:16:48 -05:00
Max Schenkelberg
8878a9732d
Issue #422 Set "numericValue" to null in RadarDefaultInterrogator in
...
case of "NO DATA"
Former-commit-id: 468c812ddecd6ebd80d4468c812ddecd6ebd80d4b9085db25db9085db25d81bc45f071954073b38c645900727c
2012-03-16 10:13:31 -05:00
Max Schenkelberg
e220ddf515
Issue #358 Fixed sampling issue with mosaic resource with best
...
res resources
Former-commit-id: 97edff9f7ccc111ab9ac97edff9f7ccc111ab9ac258d57e825258d57e8254e81d2432c1e5c074e3ba3bda1957c
2012-03-16 09:03:50 -05:00
Max Schenkelberg
d585d19f48
Issue #358 Fixed painting and sampling regression in radar mosaic due to
...
core improvements from NPP in GL mosaic imaging extension and discovered
while testing IMesh improvements
Former-commit-id: 10b720381b719f87c26110b720381b719f87c261556a270a09556a270a09a4b859ae54ba8af4dcc1682aca1dda
2012-03-14 18:03:44 -05:00
David Gillingham
21a13f6340
Issue #20 : Don't throw an exception if overriding a lower-localization
...
level's configuration (like overriding BASE's default plugin
configuration).
Former-commit-id: e33083c11a13af9170b1e33083c11a13af9170b1ed74b90589ed74b90589558c69401d5dac19bde90658b4049c
2012-03-14 15:07:59 -05:00
Nate Jensen
8e796d06de
Merge "Issue #232 - Added guava lib project - Adding error checking/reporting - Added VenueInitationListener" into 11-Collaboration
...
Former-commit-id: feeb8cba7e8f8e690470feeb8cba7e8f8e690470dc62171533dc6217153377a50a5e258d785719427f88a56232
2012-03-14 11:23:55 -05:00
Matt Nash
1236a90d7e
Issue #244 icons and login changes
...
Former-commit-id: f5c9cfd285e06101f9c3f5c9cfd285e06101f9c32fd6e285692fd6e28569d6ef74a95b5b949aeacfab5e4cb2de
2012-03-14 10:54:13 -05:00
James Korman
0d4ccaf2e6
Issue #232 - Added guava lib project - Adding error checking/reporting - Added VenueInitationListener
...
Former-commit-id: ee20250305095ab0eeabee20250305095ab0eeabd6003d1e71d6003d1e71578594cdfdb29c262362072c79a582
2012-03-14 10:24:17 -05:00
Max Schenkelberg
9366a5f308
Issue #358 Cleaned up mesh extension and API to use geotools for
...
defining a mesh. This is better practice than using arbitrary
MathTransform objects as it is well defined and allows for serialization
of the mesh to occur.
Former-commit-id: 8fb7eccb736e5964df9d8fb7eccb736e5964df9d50765e8a3450765e8a348f08fab0a7cf440b38846378e8c4ee
2012-03-14 09:49:32 -05:00
