Matt Nash
d5871d8580
Issue #448 aliasing fixes to remove dups
...
Former-commit-id: bd51ed2a52
[formerly 207ee2592e
[formerly 7135fd439b20ed6e20bf3102e2e10505a6628026]]
Former-commit-id: 207ee2592e
Former-commit-id: d0090d22eb
2012-05-09 15:23:32 -05:00
Matt Nash
bd5dd0f638
Issue #448 clean up aliasing
...
Former-commit-id: 25eefc3709
[formerly 2d5fb5c15e
[formerly 526a596475e803251c6405142a5cd0c59c3d5809]]
Former-commit-id: 2d5fb5c15e
Former-commit-id: 8c8c8e7567
2012-05-09 15:06:21 -05:00
Max Schenkelberg
82298cb03b
Issue #588 Added serialization adapter registration to better support serializing DrawableString objects
...
Change-Id: I2833b345fbef4674083dcad3561444ec4e6a0056
Former-commit-id: 1f5abc6e20
[formerly 78e1bd2c62
[formerly 6c456c0bad00aaa1fea67f90a4633b3e14a78495]]
Former-commit-id: 78e1bd2c62
Former-commit-id: 06ee0bbf6f
2012-05-09 15:02:30 -05:00
Steve Harris
fc70139990
Merge branch 'ss_sync' (OB12.4.1-10) into 9-Wes2Bridge
...
Conflicts:
ncep/gov.noaa.nws.ncep.common.dataplugin.mcidas/src/gov/noaa/nws/ncep/common/dataplugin/mcidas/McidasRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.ncpafm/src/gov/noaa/nws/ncep/common/dataplugin/ncpafm/NcPafmRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.ncuair/src/gov/noaa/nws/ncep/common/dataplugin/ncuair/NcUairRecord.java
ncep/gov.noaa.nws.ncep.edex.plugin.mosaic/src/gov/noaa/nws/ncep/edex/plugin/mosaic/common/MosaicRecord.java
All of these were 'self-resolved' when kdiff3 invoked
Former-commit-id: 31b3e87ffa
[formerly 092efd6072
[formerly f98354aae305ad227eaf3b36e4393b8aefc80f02]]
Former-commit-id: 092efd6072
Former-commit-id: d7f7c26582
2012-05-09 13:19:47 -05:00
Steve Harris
bcc12e03ed
Merge branch 'ss_sync' (OB12.4.1-10) into 11-Collaboration
...
Conflicts:
cave/com.raytheon.uf.viz.ui.menus/src/com/raytheon/uf/viz/ui/menus/xml/IncludeMenuItem.java
Former-commit-id: 58037cb5d1
[formerly 27bc369818
[formerly 8f71c807be1d604cea51ab522f04f8bbf8c11f83]]
Former-commit-id: 27bc369818
Former-commit-id: 572e1bb476
2012-05-09 13:14:00 -05:00
Nate Jensen
617a1185a3
Issue #440 add listeners before connecting and fix populateGroups()
...
Change-Id: Ief028f153954484666d01f52b91da9c97490ef94
Former-commit-id: cb3527bca8
[formerly f59d388be1
[formerly ea146f69c6fca818589587d37aace2afc75e7147]]
Former-commit-id: f59d388be1
Former-commit-id: 4152290029
2012-05-08 17:55:22 -05:00
Matt Nash
6878586deb
Issue #440 fix spooky mistake of plugin customization file
...
Former-commit-id: a32f40ce0a
[formerly 32552c7aca
[formerly 24f52653518c0f0430ba13aea98b6b6d6ef1f494]]
Former-commit-id: 32552c7aca
Former-commit-id: e2388a1cdb
2012-05-08 16:11:43 -05:00
Nate Jensen
38576af210
Issue #440 fix duplicate groups
...
Change-Id: I3bed636fa06de47d3dbdceb210284e624b626dae
Former-commit-id: 51971ac305
[formerly 5b0f431131
[formerly cbc0b8ba9936c6cad874e22e24fe38acb7855a3f]]
Former-commit-id: 5b0f431131
Former-commit-id: f4be87da62
2012-05-08 15:55:06 -05:00
Nate Jensen
a354c92edd
Issue #440 fix errors
...
Change-Id: Ic4d3235727136d38a410f6e0452674aaaf9fab3b
Former-commit-id: 6c057c9d7a
[formerly ccccaf2d28
[formerly dcbaf62a1edc168f0414078dc61323b7db32c9ee]]
Former-commit-id: ccccaf2d28
Former-commit-id: 880604feed
2012-05-08 14:37:24 -05:00
Matt Nash
9de9df2336
Issue #440 remove duplicate roster/presence classes
...
Former-commit-id: f91d457e5d
[formerly 01dc5ddbb3
[formerly cc3031e4d2142f79d935e441ed0bed9824b54251]]
Former-commit-id: 01dc5ddbb3
Former-commit-id: 8ab1597db7
2012-05-08 12:57:12 -05:00
Matt Nash
afe837e8eb
Issue #440 Login dialog off the UI thread
...
Former-commit-id: 3f53ab4a89
[formerly 1b12a27631
[formerly d37f9b0ee38028c3995ed76ef69385ee3b4a152f]]
Former-commit-id: 1b12a27631
Former-commit-id: ca4c0788f1
2012-05-08 10:58:16 -05:00
Steve Harris
c1bc408f84
12.5.1-2 baseline
...
Former-commit-id: b36c69cc67
[formerly 84d191e7b6
[formerly ff847bf86803a485212f08a098be13bc3d83b0b8]]
Former-commit-id: 84d191e7b6
Former-commit-id: ac708c050d
2012-05-03 19:17:13 -05:00
Max Schenkelberg
a1436f6b0a
Issue #587 Fixed colorbar border flicker, made area have aspect ratio of data provider
...
Change-Id: If3a768ee5b61af7459ff8d22beab3270111f5286
Former-commit-id: 3d15400eb7
[formerly af162bedf5
[formerly 14107837a06d36b75d2b4878a0c72a650c4b2579]]
Former-commit-id: af162bedf5
Former-commit-id: 7814fca6e9
2012-05-03 15:54:22 -05:00
Max Schenkelberg
120415f663
Issue #587 Got colorbars rendering properly
...
Change-Id: I9fe1b846e68dbdc947202cfcfe88aa7c8e1c1103
Former-commit-id: c81c225a6e
[formerly d4c10e5548
[formerly 218d9138f8c096d3f99305e2f3ac80b3b30c9cfe]]
Former-commit-id: d4c10e5548
Former-commit-id: 0f6240eaea
2012-05-03 13:07:43 -05:00
Max Schenkelberg
a0d7197b99
Issue #584 Got draw point calls working
...
Change-Id: I80f9061647a96e66acf70fb5c22aefb8916979b0
Former-commit-id: 5d9da5e1ef
[formerly 65f8b18194
[formerly 39a9ae5047e2f873d9b09ba65eded740f6568cec]]
Former-commit-id: 65f8b18194
Former-commit-id: eb948b3dc1
2012-05-02 16:40:55 -05:00
Matt Nash
6a8c6594ea
Issue #429 add capability for session leader to change other's colors
...
Former-commit-id: c746441432
[formerly 817bd297c8
[formerly 6cdc4cfa9e740988c01a73ec862fcaed72403b45]]
Former-commit-id: 817bd297c8
Former-commit-id: dee26f4fd5
2012-05-02 14:36:58 -05:00
Matt Nash
378772408e
Issue #437 fix change status, remove double posting
...
Former-commit-id: 3c8143e8bc
[formerly e9f75e7f50
[formerly 038bae22b932a1bdddeca4dd813920bf62b8db71]]
Former-commit-id: e9f75e7f50
Former-commit-id: 8bb1342bfb
2012-05-02 14:36:58 -05:00
Max Schenkelberg
918a417e51
Issue #239 Fixed bug with mosaic being up and starting a session
...
Change-Id: Ibe0b238806e3cb55b65a38da5a93caeddadc2c01
Former-commit-id: b82eb49055
[formerly a045f6f3b9
[formerly 3155b7b27c0c9ddc8557ac8a0240548b0d50292c]]
Former-commit-id: a045f6f3b9
Former-commit-id: 3ffb18b767
2012-05-02 10:20:20 -05:00
Matt Nash
ff25949b49
Issue #448 use aliased name in peer to peer if available, fixes the extra view that once was created
...
Former-commit-id: d1f23b8dee
[formerly 167767dcbc
[formerly 37181c07d14af1ab3cacd363d9ce150771139d3b]]
Former-commit-id: 167767dcbc
Former-commit-id: e1213ccea9
2012-05-02 09:42:50 -05:00
Max Schenkelberg
9d9e5bb8b7
Issue #239 Fixed url path issue for joining late
...
Change-Id: Ibf11c6d12b93954aad6e3969fa9869e977d48de6
Former-commit-id: 0326936e85
[formerly adabe413f6
[formerly 9879fcd8733798a96026b3459d66f5f9e757e182]]
Former-commit-id: adabe413f6
Former-commit-id: 69cb2ff5ee
2012-05-02 09:25:44 -05:00
Max Schenkelberg
e0a22310dc
Issue #358 Fixed merge errors when merging core_exp into ss_sync
...
Former-commit-id: e3d6962fe6
[formerly 3fe183277b
[formerly e8846fa2b5aa1ef2972f134a683246bc275a8067]]
Former-commit-id: 3fe183277b
Former-commit-id: 2ef208b263
2012-05-01 18:36:09 -05:00
Steve Harris
fe946166ed
Merge branch 'core_exp' into ss_sync (Graphics Improvements for NPP/Collaboration)
...
used git cherry-pick -m 1 879a2e0
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
Conflicts:
ncep/gov.noaa.nws.ncep.viz.rsc.mosaic/src/gov/noaa/nws/ncep/viz/rsc/mosaic/rsc/RadarRadialResource.java
ncep/gov.noaa.nws.ncep.viz.rsc.ncradar/src/gov/noaa/nws/ncep/viz/rsc/ncradar/rsc/RadarImageResource.java
Former-commit-id: 7b75b781ad
[formerly 2ed7249613
[formerly 05d9729acfe9e0f4af4a6ec030052ab26b0a5eb9]]
Former-commit-id: 2ed7249613
Former-commit-id: 4ec294b525
2012-05-01 18:31:09 -05:00
Steve Harris
7fa9dbd5fb
12.4.1-10 baseline
...
Former-commit-id: 8485b90ff8
[formerly 9f8cb727a5
[formerly bf53d06834caa780226121334ac1bcf0534c3f16]]
Former-commit-id: 9f8cb727a5
Former-commit-id: 4bfbdad17d
2012-05-01 18:06:13 -05:00
Nate Jensen
dd1cb83f03
Issue #427 cleanup
...
Change-Id: Ide2e5c8f5c2e8ced3bdf47d090619789c265f691
Former-commit-id: 0b6b92c9ff
[formerly 9a992aab78
[formerly 2165fb7d4b1e2743110f647797b8f6017fc0a86c]]
Former-commit-id: 9a992aab78
Former-commit-id: 8bed608bc5
2012-05-01 17:33:55 -05:00
Matt Nash
543c9ae9cb
Issue #448 clean up group code
...
Former-commit-id: 8791b7329a
[formerly ae7b40634e
[formerly aad6d7178694bfe9b42171729b4185e65429a515]]
Former-commit-id: ae7b40634e
Former-commit-id: 9ca693dd1e
2012-05-01 16:14:33 -05:00
Max Schenkelberg
caa38ef109
Issue #239 Got joining late working to load data participants don't have
...
Change-Id: I7c27e584b3b7f7331708689acee7f1b62fefe0eb
Former-commit-id: 4b8f81dbcb
[formerly edacf7a4b3
[formerly ceabfd385103380f99bed2eaa4470cfbcb70cef9]]
Former-commit-id: edacf7a4b3
Former-commit-id: c72650baef
2012-05-01 15:51:15 -05:00
Matt Nash
c3b72c3873
Issue #448 fix icons
...
Former-commit-id: 9764210b93
[formerly fd515ad766
[formerly 6b6ef0c250f895f20e43a5b596be7189d8bc9d5f]]
Former-commit-id: fd515ad766
Former-commit-id: 7b96d1e9bc
2012-05-01 15:07:46 -05:00
Matt Nash
356ab7b820
Issue #448 problem where the file is not there and null is returned
...
Former-commit-id: 1872503cd8
[formerly cef6bd81a8
[formerly 41eb0413a8c68104532d4f302c4bed07a572b430]]
Former-commit-id: cef6bd81a8
Former-commit-id: 27ea55dad3
2012-05-01 11:55:12 -05:00
Matt Nash
2966485e68
Issue #448 aliasing works on tabs and such now too
...
Former-commit-id: 4a0b1e36ca
[formerly 88b20d568e
[formerly 9dca1c46abc1d6eb4f81066c14a4b888f3c37b46]]
Former-commit-id: 88b20d568e
Former-commit-id: 8a0f32b639
2012-05-01 10:28:20 -05:00
Matt Nash
cb79489dcd
Issue #448 further aliasing
...
Former-commit-id: efd6485647
[formerly 603b114ae7
[formerly 066671debfaf52427cc0584513edd11f6cf10689]]
Former-commit-id: 603b114ae7
Former-commit-id: 9c6768f254
2012-04-30 17:28:01 -05:00
Matt Nash
c270c99caa
Issue #448 aliasing for group view
...
Former-commit-id: 49bda84329
[formerly cb6aa40f42
[formerly aa42c1600b675412a5ee73a7e2da48602f05e10f]]
Former-commit-id: cb6aa40f42
Former-commit-id: 8ae54b2e0c
2012-04-30 16:45:35 -05:00
Nate Jensen
4fc32a8178
Issue #427 cleanup
...
Change-Id: I878ec6ab2f3635ba861e4cc2db7716c0a51ba9b1
Former-commit-id: eac55b7587
[formerly 6a034283b5
[formerly 4c8192e99f1ecb57bc6a4efeaa6d7ee3a8127ec1]]
Former-commit-id: 6a034283b5
Former-commit-id: c958d3a471
2012-04-30 15:49:44 -05:00
Nate Jensen
2df5c95e6c
Issue #427 remove extraneous event buses
...
Change-Id: I958de58ba963609ada80529195d024077a901a0e
Former-commit-id: bfd45d703f
[formerly 7aa1e562d8
[formerly 1c0d5457c079880996fc75872870545ededb4316]]
Former-commit-id: 7aa1e562d8
Former-commit-id: 56ae7eab86
2012-04-30 15:33:59 -05:00
Max Schenkelberg
b2ee1fc849
Issue #239 Made custom PointImageExtension that handles differencing for faster plot rendering
...
Change-Id: I2e22ee3eb6fe67ff754dd4689b8c8876eb3b893d
Former-commit-id: 60aac07962
[formerly 9e2cf73f7a
[formerly 2caf3e8ebb70ffd455cb9f354b1226e858898822]]
Former-commit-id: 9e2cf73f7a
Former-commit-id: 5e5e362f39
2012-04-30 15:01:37 -05:00
Dave Hladky
37da8763eb
Issue #15 Re-wrote SimDate integration for menus, alert observers after
...
merge headache.
Former-commit-id: 5b7ecea866
[formerly 1b7473572f
[formerly 647b7ac154dbdaf945231b231f491bbca86d2a24]]
Former-commit-id: 1b7473572f
Former-commit-id: 42a12fa7a5
2012-04-30 13:43:34 -05:00
Bryan Kowal
e1b95c6c29
Issue #517 - ensure that plugin.xml is packaged in the com.raytheon.uf.viz.collaboration.radar jar file.
...
Former-commit-id: 84e3c4704e
[formerly ed878bc13d
[formerly 22fb97b29a3e7fd310de9915b83ffcbd2c7771a0]]
Former-commit-id: ed878bc13d
Former-commit-id: ed83cb8a52
2012-04-30 12:45:30 -05:00
Nate Jensen
e6d8ea11ba
Issue #427 remove dead code
...
Change-Id: I36e3f77f8c0176b72762abc311d8e4e3eab22e0e
Former-commit-id: bba6d5e400
[formerly d5a3acc97b
[formerly 90a1888baffbb21ac3b2f555764c37a519d5efb1]]
Former-commit-id: d5a3acc97b
Former-commit-id: 6de861e9b5
2012-04-27 16:22:27 -05:00
Nate Jensen
084967f0fd
Issue #427 separated collaboration.ui into two plugins
...
Change-Id: I3085f2aae4c1c44b65749e587a9eb753d1d7a34b
Former-commit-id: 9454cbd1b9
[formerly e8f1c0159c
[formerly f96302b439b39030e54a2b87a6e2387ebb63502f]]
Former-commit-id: e8f1c0159c
Former-commit-id: d952fe084a
2012-04-27 16:12:48 -05:00
Nate Jensen
281f9b3232
Issue #427 better part listeners
...
Change-Id: I0787fdc7a086c87228e9f38ce85e23dd9edc4bd2
Former-commit-id: 866acb24b2
[formerly 855ec5dd4d
[formerly 008164a55b5720eaf8dbfd2d023fefc9ab705936]]
Former-commit-id: 855ec5dd4d
Former-commit-id: cafa23c9d2
2012-04-27 14:47:27 -05:00
Matt Nash
1749033fdd
Issue #448 add preference page for collaboration, currently only enabling and disabling notifications
...
Former-commit-id: 00d11cdeaa
[formerly cc313ebcac
[formerly 1a0bc57f249f3b757c6226526ba05b2f8d1ab2e6]]
Former-commit-id: cc313ebcac
Former-commit-id: 0a3a7bfba2
2012-04-27 14:34:55 -05:00
David Gillingham
ddd78ed32f
Merge "Issue #562 : Rename QPFRecord getters and setters to match Java-naming conventions, correct bugs in other classes found during test." into 9-Wes2Bridge
...
Former-commit-id: 9878793618
[formerly 4aadd41fde
[formerly ecf5dd0d62b834c4eba370857441cbda4ce21683]]
Former-commit-id: 4aadd41fde
Former-commit-id: 0ff2041959
2012-04-27 13:26:37 -05:00
David Gillingham
034cab5000
Issue #562 : Rename QPFRecord getters and setters to match Java-naming
...
conventions, correct bugs in other classes found during test.
Change-Id: I7f490793678741ffa41769a63371e06d27840bdb
Former-commit-id: 292374ce21
[formerly c28bfaddee
[formerly fe6ec52b4cf64d410f3de609b06cf9666a5936bc]]
Former-commit-id: c28bfaddee
Former-commit-id: 6497272c1d
2012-04-27 12:43:04 -05:00
Richard Peter
231d98b79e
Issue #538 : Fix Serialization Annotations and Serialization Issues
...
Change-Id: I436997106438ab283e987cb7e3055fcee009b608
Former-commit-id: b11df888d3
[formerly 349adaeedd
[formerly 3aadbc778d9bb22dc9c0b4b93bbbaa70c3fa07d0]]
Former-commit-id: 349adaeedd
Former-commit-id: c33a392a8c
2012-04-27 12:08:29 -05:00
Max Schenkelberg
f4cd5ebfef
Issue #239 Added render frame merging capability
...
Change-Id: Ie16e650693de6e07453357740b3c2bae21bd999d
Former-commit-id: df07bff0bc
[formerly ff0827b51d
[formerly ad6d31300e0ac41375a3eb65ce337a6105be72ee]]
Former-commit-id: ff0827b51d
Former-commit-id: 4175affdc7
2012-04-27 11:57:53 -05:00
Matt Nash
18e07972ca
Issue #429 add better notification to chat
...
Former-commit-id: 3b2fdaa579
[formerly e0d11ae8b1
[formerly 40db7caa4b6bd45537f4cb37a3f034a907cd8f79]]
Former-commit-id: e0d11ae8b1
Former-commit-id: 590862b77d
2012-04-27 10:10:05 -05:00
Matt Nash
548e0c4b59
Issue #429 make chatting append to message before sending out to prevent delay, add notification method so if CAVE is minimized the user will still get the notification that a new chat has happened
...
Former-commit-id: 16de1dbafe
[formerly 25201fcbad
[formerly 9c0f7ee82b7a844620f1f2e00947a256582b86ef]]
Former-commit-id: 25201fcbad
Former-commit-id: c1983d295d
2012-04-27 10:08:27 -05:00
Matt Nash
1e27e69e3d
Issue #448 remove listener to help prevent exceptions
...
Former-commit-id: b69e13d795
[formerly 29b39a1df4
[formerly 66ac99ff89a3347d528d09081d41c248f4ff4783]]
Former-commit-id: 29b39a1df4
Former-commit-id: 331adad3a3
2012-04-26 09:17:27 -05:00
Max Schenkelberg
a31ad22113
Added network logging for http traffic
...
Change-Id: I69f571fba23fc03e0d850180650f61b4581e8a25
Former-commit-id: f74b6b4a93
[formerly a912786429
[formerly 7696dd610b5d6f0fc3620db461de68ba06c61699]]
Former-commit-id: a912786429
Former-commit-id: 2cc5794428
2012-04-25 17:28:52 -05:00
David Gillingham
be0570d2fe
Issue #473 : Properly archive text plugin records,
...
fix bugs in DatabaseArchiver.determineStartTime().
Change-Id: I2a7a71bcf7bdbc5ea786d949631b45342675ce1f
Former-commit-id: 04ab5d619b
[formerly 526abfd36e
[formerly 6e45fc4f0eb15409a20be99c02b2ac43c8ed842e]]
Former-commit-id: 526abfd36e
Former-commit-id: 8592a9a50d
2012-04-25 17:08:21 -05:00
Nate Jensen
74a4671d33
Issue #427 remove sysouts
...
Change-Id: I82dd5bcd8e7eb20afcf516c0b8d33e37d72d45db
Former-commit-id: e17dad1b54
[formerly ed4303158c
[formerly 5b87a033a88899b1ca033b18efc9532002b047c0]]
Former-commit-id: ed4303158c
Former-commit-id: 1ff944fc2d
2012-04-25 16:56:19 -05:00