Matt Nash
4558d1bd41
Issue #440 fix multiple login dialogs when trying to click 'Cancel'
...
Former-commit-id: e2c0426f38c59954e1e57d9dddce2bd93f54f36f
2012-05-10 11:37:52 -05:00
Nate Jensen
ef756e4e0e
Merge "Issue #561 - created a new httpd-collaboration rpm and standardized the build of httpd-pypies and httpd-collaboration. Updated the Build 1.0 to build the new httpd rpm. For now collaboration will default to port 80 until the openfire plugin ticket is finished." into 11-Collaboration
...
Former-commit-id: 317384cdff533ddcbe15c33351b2b1e42ee210a9
2012-05-10 11:26:02 -05:00
Matt Nash
c05e57d3d2
Issue #444 fix rename
...
Former-commit-id: fc9ed4eb5ee470d309fea6af74d254728877c531
2012-05-10 10:09:48 -05:00
Matt Nash
ba377eae5c
Isssue #444 rename project to better match structure
...
Former-commit-id: e644591a18b0a145c7db2151ebf06a17326d8572
2012-05-10 10:06:06 -05:00
Bryan Kowal
fbb694b48e
Issue #561 - created a new httpd-collaboration rpm and standardized the build of httpd-pypies and httpd-collaboration. Updated the Build 1.0 to build the new httpd rpm. For now collaboration will default to port 80 until the openfire plugin ticket is finished.
...
Former-commit-id: b831809423f9aa6e1da5678f2653fa52d928c132
2012-05-10 09:24:56 -05:00
Matt Nash
3cd13e285c
Issue #429 clean up telestrator
...
Former-commit-id: 55a10673d6585098caf45aa4f19f0add42aaf4a5
2012-05-10 09:18:41 -05:00
Max Schenkelberg
ea2151970a
Issue #588 Fix VizPainter.py bug from previous commit
...
Change-Id: I58c217f5abcefd637097bd5c9c6824015ea082b7
Former-commit-id: 0e70b319d47cd198b71426789671efeaa4ddb9f7
2012-05-09 15:38:03 -05:00
Matt Nash
bd51ed2a52
Issue #448 aliasing fixes to remove dups
...
Former-commit-id: 7135fd439b20ed6e20bf3102e2e10505a6628026
2012-05-09 15:23:32 -05:00
Matt Nash
25eefc3709
Issue #448 clean up aliasing
...
Former-commit-id: 526a596475e803251c6405142a5cd0c59c3d5809
2012-05-09 15:06:21 -05:00
Max Schenkelberg
1f5abc6e20
Issue #588 Added serialization adapter registration to better support serializing DrawableString objects
...
Change-Id: I2833b345fbef4674083dcad3561444ec4e6a0056
Former-commit-id: 6c456c0bad00aaa1fea67f90a4633b3e14a78495
2012-05-09 15:02:30 -05:00
Steve Harris
31b3e87ffa
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: f98354aae305ad227eaf3b36e4393b8aefc80f02
2012-05-09 13:19:47 -05:00
Steve Harris
58037cb5d1
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: 8f71c807be1d604cea51ab522f04f8bbf8c11f83
2012-05-09 13:14:00 -05:00
Nate Jensen
cb3527bca8
Issue #440 add listeners before connecting and fix populateGroups()
...
Change-Id: Ief028f153954484666d01f52b91da9c97490ef94
Former-commit-id: ea146f69c6fca818589587d37aace2afc75e7147
2012-05-08 17:55:22 -05:00
Matt Nash
a32f40ce0a
Issue #440 fix spooky mistake of plugin customization file
...
Former-commit-id: 24f52653518c0f0430ba13aea98b6b6d6ef1f494
2012-05-08 16:11:43 -05:00
Nate Jensen
51971ac305
Issue #440 fix duplicate groups
...
Change-Id: I3bed636fa06de47d3dbdceb210284e624b626dae
Former-commit-id: cbc0b8ba9936c6cad874e22e24fe38acb7855a3f
2012-05-08 15:55:06 -05:00
Nate Jensen
6c057c9d7a
Issue #440 fix errors
...
Change-Id: Ic4d3235727136d38a410f6e0452674aaaf9fab3b
Former-commit-id: dcbaf62a1edc168f0414078dc61323b7db32c9ee
2012-05-08 14:37:24 -05:00
Matt Nash
f91d457e5d
Issue #440 remove duplicate roster/presence classes
...
Former-commit-id: cc3031e4d2142f79d935e441ed0bed9824b54251
2012-05-08 12:57:12 -05:00
Matt Nash
3f53ab4a89
Issue #440 Login dialog off the UI thread
...
Former-commit-id: d37f9b0ee38028c3995ed76ef69385ee3b4a152f
2012-05-08 10:58:16 -05:00
Steve Harris
b36c69cc67
12.5.1-2 baseline
...
Former-commit-id: ff847bf86803a485212f08a098be13bc3d83b0b8
2012-05-03 19:17:13 -05:00
Max Schenkelberg
3d15400eb7
Issue #587 Fixed colorbar border flicker, made area have aspect ratio of data provider
...
Change-Id: If3a768ee5b61af7459ff8d22beab3270111f5286
Former-commit-id: 14107837a06d36b75d2b4878a0c72a650c4b2579
2012-05-03 15:54:22 -05:00
Max Schenkelberg
c81c225a6e
Issue #587 Got colorbars rendering properly
...
Change-Id: I9fe1b846e68dbdc947202cfcfe88aa7c8e1c1103
Former-commit-id: 218d9138f8c096d3f99305e2f3ac80b3b30c9cfe
2012-05-03 13:07:43 -05:00
Max Schenkelberg
5d9da5e1ef
Issue #584 Got draw point calls working
...
Change-Id: I80f9061647a96e66acf70fb5c22aefb8916979b0
Former-commit-id: 39a9ae5047e2f873d9b09ba65eded740f6568cec
2012-05-02 16:40:55 -05:00
Matt Nash
c746441432
Issue #429 add capability for session leader to change other's colors
...
Former-commit-id: 6cdc4cfa9e740988c01a73ec862fcaed72403b45
2012-05-02 14:36:58 -05:00
Matt Nash
3c8143e8bc
Issue #437 fix change status, remove double posting
...
Former-commit-id: 038bae22b932a1bdddeca4dd813920bf62b8db71
2012-05-02 14:36:58 -05:00
Max Schenkelberg
b82eb49055
Issue #239 Fixed bug with mosaic being up and starting a session
...
Change-Id: Ibe0b238806e3cb55b65a38da5a93caeddadc2c01
Former-commit-id: 3155b7b27c0c9ddc8557ac8a0240548b0d50292c
2012-05-02 10:20:20 -05:00
Matt Nash
d1f23b8dee
Issue #448 use aliased name in peer to peer if available, fixes the extra view that once was created
...
Former-commit-id: 37181c07d14af1ab3cacd363d9ce150771139d3b
2012-05-02 09:42:50 -05:00
Max Schenkelberg
0326936e85
Issue #239 Fixed url path issue for joining late
...
Change-Id: Ibf11c6d12b93954aad6e3969fa9869e977d48de6
Former-commit-id: 9879fcd8733798a96026b3459d66f5f9e757e182
2012-05-02 09:25:44 -05:00
Max Schenkelberg
e3d6962fe6
Issue #358 Fixed merge errors when merging core_exp into ss_sync
...
Former-commit-id: e8846fa2b5aa1ef2972f134a683246bc275a8067
2012-05-01 18:36:09 -05:00
Steve Harris
7b75b781ad
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: 05d9729acfe9e0f4af4a6ec030052ab26b0a5eb9
2012-05-01 18:31:09 -05:00
Steve Harris
8485b90ff8
12.4.1-10 baseline
...
Former-commit-id: bf53d06834caa780226121334ac1bcf0534c3f16
2012-05-01 18:06:13 -05:00
Nate Jensen
0b6b92c9ff
Issue #427 cleanup
...
Change-Id: Ide2e5c8f5c2e8ced3bdf47d090619789c265f691
Former-commit-id: 2165fb7d4b1e2743110f647797b8f6017fc0a86c
2012-05-01 17:33:55 -05:00
Matt Nash
8791b7329a
Issue #448 clean up group code
...
Former-commit-id: aad6d7178694bfe9b42171729b4185e65429a515
2012-05-01 16:14:33 -05:00
Max Schenkelberg
4b8f81dbcb
Issue #239 Got joining late working to load data participants don't have
...
Change-Id: I7c27e584b3b7f7331708689acee7f1b62fefe0eb
Former-commit-id: ceabfd385103380f99bed2eaa4470cfbcb70cef9
2012-05-01 15:51:15 -05:00
Matt Nash
9764210b93
Issue #448 fix icons
...
Former-commit-id: 6b6ef0c250f895f20e43a5b596be7189d8bc9d5f
2012-05-01 15:07:46 -05:00
Matt Nash
1872503cd8
Issue #448 problem where the file is not there and null is returned
...
Former-commit-id: 41eb0413a8c68104532d4f302c4bed07a572b430
2012-05-01 11:55:12 -05:00
Matt Nash
4a0b1e36ca
Issue #448 aliasing works on tabs and such now too
...
Former-commit-id: 9dca1c46abc1d6eb4f81066c14a4b888f3c37b46
2012-05-01 10:28:20 -05:00
Matt Nash
efd6485647
Issue #448 further aliasing
...
Former-commit-id: 066671debfaf52427cc0584513edd11f6cf10689
2012-04-30 17:28:01 -05:00
Matt Nash
49bda84329
Issue #448 aliasing for group view
...
Former-commit-id: aa42c1600b675412a5ee73a7e2da48602f05e10f
2012-04-30 16:45:35 -05:00
Nate Jensen
eac55b7587
Issue #427 cleanup
...
Change-Id: I878ec6ab2f3635ba861e4cc2db7716c0a51ba9b1
Former-commit-id: 4c8192e99f1ecb57bc6a4efeaa6d7ee3a8127ec1
2012-04-30 15:49:44 -05:00
Nate Jensen
bfd45d703f
Issue #427 remove extraneous event buses
...
Change-Id: I958de58ba963609ada80529195d024077a901a0e
Former-commit-id: 1c0d5457c079880996fc75872870545ededb4316
2012-04-30 15:33:59 -05:00
Max Schenkelberg
60aac07962
Issue #239 Made custom PointImageExtension that handles differencing for faster plot rendering
...
Change-Id: I2e22ee3eb6fe67ff754dd4689b8c8876eb3b893d
Former-commit-id: 2caf3e8ebb70ffd455cb9f354b1226e858898822
2012-04-30 15:01:37 -05:00
Dave Hladky
5b7ecea866
Issue #15 Re-wrote SimDate integration for menus, alert observers after
...
merge headache.
Former-commit-id: 647b7ac154dbdaf945231b231f491bbca86d2a24
2012-04-30 13:43:34 -05:00
Bryan Kowal
84e3c4704e
Issue #517 - ensure that plugin.xml is packaged in the com.raytheon.uf.viz.collaboration.radar jar file.
...
Former-commit-id: 22fb97b29a3e7fd310de9915b83ffcbd2c7771a0
2012-04-30 12:45:30 -05:00
Nate Jensen
bba6d5e400
Issue #427 remove dead code
...
Change-Id: I36e3f77f8c0176b72762abc311d8e4e3eab22e0e
Former-commit-id: 90a1888baffbb21ac3b2f555764c37a519d5efb1
2012-04-27 16:22:27 -05:00
Nate Jensen
9454cbd1b9
Issue #427 separated collaboration.ui into two plugins
...
Change-Id: I3085f2aae4c1c44b65749e587a9eb753d1d7a34b
Former-commit-id: f96302b439b39030e54a2b87a6e2387ebb63502f
2012-04-27 16:12:48 -05:00
Nate Jensen
866acb24b2
Issue #427 better part listeners
...
Change-Id: I0787fdc7a086c87228e9f38ce85e23dd9edc4bd2
Former-commit-id: 008164a55b5720eaf8dbfd2d023fefc9ab705936
2012-04-27 14:47:27 -05:00
Matt Nash
00d11cdeaa
Issue #448 add preference page for collaboration, currently only enabling and disabling notifications
...
Former-commit-id: 1a0bc57f249f3b757c6226526ba05b2f8d1ab2e6
2012-04-27 14:34:55 -05:00
David Gillingham
9878793618
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: ecf5dd0d62b834c4eba370857441cbda4ce21683
2012-04-27 13:26:37 -05:00
David Gillingham
292374ce21
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: fe6ec52b4cf64d410f3de609b06cf9666a5936bc
2012-04-27 12:43:04 -05:00
Richard Peter
b11df888d3
Issue #538 : Fix Serialization Annotations and Serialization Issues
...
Change-Id: I436997106438ab283e987cb7e3055fcee009b608
Former-commit-id: 3aadbc778d9bb22dc9c0b4b93bbbaa70c3fa07d0
2012-04-27 12:08:29 -05:00
