Commit graph

616 commits

Author SHA1 Message Date
Matt Nash
e0f49bf6e4 Issue #440 fix login dialog not popping up
Former-commit-id: e22cd33221 [formerly ed501edb0c] [formerly fa89b0cf6e] [formerly a8c5c7b3ca [formerly fa89b0cf6e [formerly 8b9c87c5e4fe04405ce1fa3cb86eeaed14e3aadb]]]
Former-commit-id: a8c5c7b3ca
Former-commit-id: 776139442270abe465ed39ef2e314906de185220 [formerly e19b5cb75c]
Former-commit-id: e747734aff
2012-05-11 12:04:56 -05:00
Brad Gonzales
d062622541 Issue #628 Nate's ncep pgen feature.xml.
Former-commit-id: 3a00952cda [formerly dd0192fef2] [formerly 1a763575ed] [formerly 877b13b79b [formerly 1a763575ed [formerly 5151a8934bd6f9558c91b5493273ca02c93b2064]]]
Former-commit-id: 877b13b79b
Former-commit-id: 0fa186627cb7e5eb0869ff488f2b0b375352ec5e [formerly c909b32d0b]
Former-commit-id: d0953dd11a
2012-05-11 10:12:47 -05:00
Ron Anderson
2008d8979b Issue #502 Fix staticTopo notifications
Change-Id: Ib1003426ab9e0c17325da425fbf1602e93983ed1

Former-commit-id: 0cd6bac8a0 [formerly 5461b92346] [formerly 902bde0f2d] [formerly cd0fd140ad [formerly 902bde0f2d [formerly 7c36219cded6a5cbbaebef2dbcfa6f2901a44373]]]
Former-commit-id: cd0fd140ad
Former-commit-id: b6aa71bef0833aacf1d6f6f6df2595f37af04536 [formerly 3018275239]
Former-commit-id: 72ee9f490d
2012-05-11 10:06:29 -05:00
Benjamin Phillippe
585db5f22d Issue #502 Eliminated call to database to alleviate performance bottleneck in GfeIngestNotificationFilter
Change-Id: I8b2b250323c7caafcf357e3101b9ac4802b6b2c9

Former-commit-id: d358d7caf4 [formerly 272323baa6] [formerly bd0e56daaf] [formerly 16f7fbe9cb [formerly bd0e56daaf [formerly b50cd41ca70ab2e69de1d440991e0218f70395c8]]]
Former-commit-id: 16f7fbe9cb
Former-commit-id: 5d26eb84a976d14d7cdbfa54c783d5f28cdab3a9 [formerly acf8c7290f]
Former-commit-id: 953f50718c
2012-05-11 10:06:18 -05:00
Richard Peter
7a54b09c59 Issue #502: Update grib/gfe thread/memory usage for grib notification route
Change-Id: Ifa295f02c6e465bc151268c47fc71bfc67646e36

Former-commit-id: 7a5aea8ee4 [formerly 7b14c9499a] [formerly e431671ff2] [formerly 150d16b24e [formerly e431671ff2 [formerly a4450314db26948d531ecf80ec1455895cdb81ac]]]
Former-commit-id: 150d16b24e
Former-commit-id: 3f705bea746413ee0cdfbbd18f2ab0a94a522dc8 [formerly 33c7d4cb87]
Former-commit-id: fe6dc2652c
2012-05-11 10:06:04 -05:00
Nate Jensen
4138e24a59 Issue #590 Fix rsc so it can be recycled
Change-Id: I3cddf5d67c2e5dfb52380529f703a0d9558d8916

Former-commit-id: 853a83c753 [formerly fbd4b64be8] [formerly 798463a4cf] [formerly 78c1298085 [formerly 798463a4cf [formerly cd52bfbeb593a4b1891f4df7f7ae73c7193504d0]]]
Former-commit-id: 78c1298085
Former-commit-id: cfaa15df4d58a67c84a557ac50103581eb95cead [formerly 7be5ef8528]
Former-commit-id: 536d47dcf0
2012-05-11 10:04:36 -05:00
Max Schenkelberg
d37d5bafb5 Issue #588 Got crude string rendering working. Doesn't quite look good if canvas bounds are not same size and legends are not handled specially
Change-Id: I8f3d0560869178598f160fb2e7914c45f656a860

Former-commit-id: 3682b81e6b [formerly 5fca70461f] [formerly 31243a9dfe] [formerly 074b9aba8c [formerly 31243a9dfe [formerly 24b673fcc45a4da27ac349bdebf8b48f6405607b]]]
Former-commit-id: 074b9aba8c
Former-commit-id: 43b689e5c63e3b6456373be48d379fad297a3633 [formerly d22b403f48]
Former-commit-id: d2d6a4d1eb
2012-05-10 18:03:00 -05:00
Brad Gonzales
634def5162 Issue #628 committing more PGEN code received from Plummer on 4-19-2012.
Former-commit-id: dcfb950cfb [formerly 22a29b98b2] [formerly a90d64e1fc] [formerly 0df0aa8663 [formerly a90d64e1fc [formerly bd658184b246452b5d3e2154d79f2179bdc12594]]]
Former-commit-id: 0df0aa8663
Former-commit-id: a5aab1ab3583a86ff017397d59291cb56b659f40 [formerly e1f03d9369]
Former-commit-id: af92e8d329
2012-05-10 17:02:18 -05:00
Brad Gonzales
6df38c98de Issue #628 committing PGEN code received from Plummer on 4-19-2012.
Former-commit-id: 1d576ac27d [formerly fda897d2d0] [formerly 253e8bc948] [formerly 295cbf95e5 [formerly 253e8bc948 [formerly 0816cd253c86acc699cb90866131619c4679f631]]]
Former-commit-id: 295cbf95e5
Former-commit-id: 85f06f12e49d774ff6df946ee3b7ae0ffed95a4c [formerly ae3d17c698]
Former-commit-id: 2a3bf4ec32
2012-05-10 16:50:45 -05:00
Matt Nash
c5e62bc5db Issue #440 fix multiple login dialogs when trying to click 'Cancel'
Former-commit-id: c50fc8b423 [formerly cfcfb84668] [formerly 62ddaa6fa8] [formerly 4558d1bd41 [formerly 62ddaa6fa8 [formerly e2c0426f38c59954e1e57d9dddce2bd93f54f36f]]]
Former-commit-id: 4558d1bd41
Former-commit-id: c838967dca55840a49c7aff0c256a0eab70f03c2 [formerly 4f4b4a0e23]
Former-commit-id: 88bfafe9f2
2012-05-10 11:37:52 -05:00
Nate Jensen
98e1d220c7 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: e05dbddc99 [formerly c12a2c59e4] [formerly 859a91cfcd] [formerly ef756e4e0e [formerly 859a91cfcd [formerly 317384cdff533ddcbe15c33351b2b1e42ee210a9]]]
Former-commit-id: ef756e4e0e
Former-commit-id: e11b0a2b978df8b77bee3534368025bf7010dcfb [formerly 8f991ac1bd]
Former-commit-id: 3a5b30e846
2012-05-10 11:26:02 -05:00
Matt Nash
b1957cdd66 Issue #444 fix rename
Former-commit-id: 3d99f78745 [formerly 44d23c36e7] [formerly 267c83294d] [formerly c05e57d3d2 [formerly 267c83294d [formerly fc9ed4eb5ee470d309fea6af74d254728877c531]]]
Former-commit-id: c05e57d3d2
Former-commit-id: 844e8d8c5aeedfa2bbbb79ce8e611ce8f0bd6682 [formerly 0f0f49249b]
Former-commit-id: 87250a5585
2012-05-10 10:09:48 -05:00
Matt Nash
4b7115440c Isssue #444 rename project to better match structure
Former-commit-id: 4a752e44b1 [formerly 4733741c0c] [formerly 8caf649518] [formerly ba377eae5c [formerly 8caf649518 [formerly e644591a18b0a145c7db2151ebf06a17326d8572]]]
Former-commit-id: ba377eae5c
Former-commit-id: 500cc73c98436cc0e93295639d2c35f68881564c [formerly ef6345493d]
Former-commit-id: 9e7f6df610
2012-05-10 10:06:06 -05:00
Bryan Kowal
c557f812ae 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: 35c8df1b0a [formerly 38f61f4a73] [formerly ea8bf623cf] [formerly fbb694b48e [formerly ea8bf623cf [formerly b831809423f9aa6e1da5678f2653fa52d928c132]]]
Former-commit-id: fbb694b48e
Former-commit-id: 220b395157e5157821d8ab81715fe4b80ec576e2 [formerly f7cba22ee2]
Former-commit-id: cbe0691efd
2012-05-10 09:24:56 -05:00
Matt Nash
7e273f834d Issue #429 clean up telestrator
Former-commit-id: 66055c4d7a [formerly ccb859576c] [formerly d88d5ab229] [formerly 3cd13e285c [formerly d88d5ab229 [formerly 55a10673d6585098caf45aa4f19f0add42aaf4a5]]]
Former-commit-id: 3cd13e285c
Former-commit-id: 31d654a1c7477c74d429f93884414426f541af1b [formerly 9612df2217]
Former-commit-id: 4eda4ab762
2012-05-10 09:18:41 -05:00
Max Schenkelberg
29c1030f74 Issue #588 Fix VizPainter.py bug from previous commit
Change-Id: I58c217f5abcefd637097bd5c9c6824015ea082b7

Former-commit-id: 8f74ccc2b8 [formerly c3ec79ef6c] [formerly c2e1e83033] [formerly ea2151970a [formerly c2e1e83033 [formerly 0e70b319d47cd198b71426789671efeaa4ddb9f7]]]
Former-commit-id: ea2151970a
Former-commit-id: d49721bccbaf90673aa998f0da0bdca12a7f79d9 [formerly aa5f1d12db]
Former-commit-id: 0f3aae5fd7
2012-05-09 15:38:03 -05:00
Matt Nash
dff0c8a5ec Issue #448 aliasing fixes to remove dups
Former-commit-id: d5871d8580 [formerly d0090d22eb] [formerly 207ee2592e] [formerly bd51ed2a52 [formerly 207ee2592e [formerly 7135fd439b20ed6e20bf3102e2e10505a6628026]]]
Former-commit-id: bd51ed2a52
Former-commit-id: 10515064d1db261ded8909afaa10f7e2c4049f74 [formerly 618cf9b1ad]
Former-commit-id: 18228ffa0b
2012-05-09 15:23:32 -05:00
Matt Nash
a788dd26b0 Issue #448 clean up aliasing
Former-commit-id: bd5dd0f638 [formerly 8c8c8e7567] [formerly 2d5fb5c15e] [formerly 25eefc3709 [formerly 2d5fb5c15e [formerly 526a596475e803251c6405142a5cd0c59c3d5809]]]
Former-commit-id: 25eefc3709
Former-commit-id: df88d6bbae1043933fbaef0fda73c9e62993920f [formerly a5c11b2737]
Former-commit-id: 909d080746
2012-05-09 15:06:21 -05:00
Max Schenkelberg
985ee5a034 Issue #588 Added serialization adapter registration to better support serializing DrawableString objects
Change-Id: I2833b345fbef4674083dcad3561444ec4e6a0056

Former-commit-id: 82298cb03b [formerly 06ee0bbf6f] [formerly 78e1bd2c62] [formerly 1f5abc6e20 [formerly 78e1bd2c62 [formerly 6c456c0bad00aaa1fea67f90a4633b3e14a78495]]]
Former-commit-id: 1f5abc6e20
Former-commit-id: 0465afe50a2e0abf332ee9d7e74c28a75a577f5d [formerly 3ca8ca6f01]
Former-commit-id: 2db836b296
2012-05-09 15:02:30 -05:00
Steve Harris
fe7ac96625 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: fc70139990 [formerly d7f7c26582] [formerly 092efd6072] [formerly 31b3e87ffa [formerly 092efd6072 [formerly f98354aae305ad227eaf3b36e4393b8aefc80f02]]]
Former-commit-id: 31b3e87ffa
Former-commit-id: 606a1f5f70c4344a8a6b5b7da1c351cf7707cda2 [formerly 98447412f8]
Former-commit-id: 53d2822329
2012-05-09 13:19:47 -05:00
Steve Harris
43f936900c 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: bcc12e03ed [formerly 572e1bb476] [formerly 27bc369818] [formerly 58037cb5d1 [formerly 27bc369818 [formerly 8f71c807be1d604cea51ab522f04f8bbf8c11f83]]]
Former-commit-id: 58037cb5d1
Former-commit-id: ec875d4e25b0d41a71abbea662364ddefd6fe144 [formerly 63ea8599d7]
Former-commit-id: 9c9e01dbda
2012-05-09 13:14:00 -05:00
Nate Jensen
bc232148ec Issue #440 add listeners before connecting and fix populateGroups()
Change-Id: Ief028f153954484666d01f52b91da9c97490ef94

Former-commit-id: 617a1185a3 [formerly 4152290029] [formerly f59d388be1] [formerly cb3527bca8 [formerly f59d388be1 [formerly ea146f69c6fca818589587d37aace2afc75e7147]]]
Former-commit-id: cb3527bca8
Former-commit-id: fb05ec405f13f5fa593966daeeff87398f68990a [formerly 41ec3f0606]
Former-commit-id: a5806f837b
2012-05-08 17:55:22 -05:00
Matt Nash
7b62b89d1e Issue #440 fix spooky mistake of plugin customization file
Former-commit-id: 6878586deb [formerly e2388a1cdb] [formerly 32552c7aca] [formerly a32f40ce0a [formerly 32552c7aca [formerly 24f52653518c0f0430ba13aea98b6b6d6ef1f494]]]
Former-commit-id: a32f40ce0a
Former-commit-id: 23444601f4e3869b306daa1e156008766b1c792a [formerly 24d60a6d2e]
Former-commit-id: 198ab99bb2
2012-05-08 16:11:43 -05:00
Nate Jensen
66845b067d Issue #440 fix duplicate groups
Change-Id: I3bed636fa06de47d3dbdceb210284e624b626dae

Former-commit-id: 38576af210 [formerly f4be87da62] [formerly 5b0f431131] [formerly 51971ac305 [formerly 5b0f431131 [formerly cbc0b8ba9936c6cad874e22e24fe38acb7855a3f]]]
Former-commit-id: 51971ac305
Former-commit-id: 9cb3ec68606a5110907ad0fe4ee1d2fcdd53423e [formerly 4a1d2d906e]
Former-commit-id: cda9247d09
2012-05-08 15:55:06 -05:00
Nate Jensen
fddb2b1a47 Issue #440 fix errors
Change-Id: Ic4d3235727136d38a410f6e0452674aaaf9fab3b

Former-commit-id: a354c92edd [formerly 880604feed] [formerly ccccaf2d28] [formerly 6c057c9d7a [formerly ccccaf2d28 [formerly dcbaf62a1edc168f0414078dc61323b7db32c9ee]]]
Former-commit-id: 6c057c9d7a
Former-commit-id: bae21a022d30e8d755163549841930bd7ba18c2d [formerly 13d56f04f0]
Former-commit-id: a7fb88f5bf
2012-05-08 14:37:24 -05:00
Matt Nash
3989c8702f Issue #440 remove duplicate roster/presence classes
Former-commit-id: 9de9df2336 [formerly 8ab1597db7] [formerly 01dc5ddbb3] [formerly f91d457e5d [formerly 01dc5ddbb3 [formerly cc3031e4d2142f79d935e441ed0bed9824b54251]]]
Former-commit-id: f91d457e5d
Former-commit-id: a6365585b90c465fb7ff92344a15d101f17ca6e3 [formerly 76e037485f]
Former-commit-id: b06f5e43dd
2012-05-08 12:57:12 -05:00
Matt Nash
8449535d28 Issue #440 Login dialog off the UI thread
Former-commit-id: afe837e8eb [formerly ca4c0788f1] [formerly 1b12a27631] [formerly 3f53ab4a89 [formerly 1b12a27631 [formerly d37f9b0ee38028c3995ed76ef69385ee3b4a152f]]]
Former-commit-id: 3f53ab4a89
Former-commit-id: 8d60eab75cde7aa90162befc251b4fa7fa7185b9 [formerly 408263e5a7]
Former-commit-id: 61b1fe7314
2012-05-08 10:58:16 -05:00
Steve Harris
8025cc609e 12.5.1-2 baseline
Former-commit-id: c1bc408f84 [formerly ac708c050d] [formerly 84d191e7b6] [formerly b36c69cc67 [formerly 84d191e7b6 [formerly ff847bf86803a485212f08a098be13bc3d83b0b8]]]
Former-commit-id: b36c69cc67
Former-commit-id: 22cf2530d98a6c3d2d24e8ef75454ae00fe19292 [formerly a821111fbf]
Former-commit-id: f6300cd995
2012-05-03 19:17:13 -05:00
Max Schenkelberg
7768702058 Issue #587 Fixed colorbar border flicker, made area have aspect ratio of data provider
Change-Id: If3a768ee5b61af7459ff8d22beab3270111f5286

Former-commit-id: a1436f6b0a [formerly 7814fca6e9] [formerly af162bedf5] [formerly 3d15400eb7 [formerly af162bedf5 [formerly 14107837a06d36b75d2b4878a0c72a650c4b2579]]]
Former-commit-id: 3d15400eb7
Former-commit-id: 63d9bc13201c8722c88b4447310a4c626184a6f5 [formerly 846ae30be9]
Former-commit-id: abb74d20fe
2012-05-03 15:54:22 -05:00
Max Schenkelberg
5056e1689b Issue #587 Got colorbars rendering properly
Change-Id: I9fe1b846e68dbdc947202cfcfe88aa7c8e1c1103

Former-commit-id: 120415f663 [formerly 0f6240eaea] [formerly d4c10e5548] [formerly c81c225a6e [formerly d4c10e5548 [formerly 218d9138f8c096d3f99305e2f3ac80b3b30c9cfe]]]
Former-commit-id: c81c225a6e
Former-commit-id: 26da60b90fed75fefa7c7b072d9e37d5dceb286f [formerly c6edfad263]
Former-commit-id: 726c543266
2012-05-03 13:07:43 -05:00
Max Schenkelberg
b26422d08c Issue #584 Got draw point calls working
Change-Id: I80f9061647a96e66acf70fb5c22aefb8916979b0

Former-commit-id: a0d7197b99 [formerly eb948b3dc1] [formerly 65f8b18194] [formerly 5d9da5e1ef [formerly 65f8b18194 [formerly 39a9ae5047e2f873d9b09ba65eded740f6568cec]]]
Former-commit-id: 5d9da5e1ef
Former-commit-id: 76a293686c0c992159fda79ea854e7016c01cacf [formerly 01ae8134b2]
Former-commit-id: 06871710c3
2012-05-02 16:40:55 -05:00
Matt Nash
208d22623b Issue #429 add capability for session leader to change other's colors
Former-commit-id: 6a8c6594ea [formerly dee26f4fd5] [formerly 817bd297c8] [formerly c746441432 [formerly 817bd297c8 [formerly 6cdc4cfa9e740988c01a73ec862fcaed72403b45]]]
Former-commit-id: c746441432
Former-commit-id: 8eccfce550c24254f53426cefffc6a489b93c2ce [formerly df25bbf079]
Former-commit-id: f62991f7b2
2012-05-02 14:36:58 -05:00
Matt Nash
4c6451f056 Issue #437 fix change status, remove double posting
Former-commit-id: 378772408e [formerly 8bb1342bfb] [formerly e9f75e7f50] [formerly 3c8143e8bc [formerly e9f75e7f50 [formerly 038bae22b932a1bdddeca4dd813920bf62b8db71]]]
Former-commit-id: 3c8143e8bc
Former-commit-id: 9f37b3ecfdd9ed5688155a30e80979ee332e5a38 [formerly 1e4d656cf9]
Former-commit-id: bdd71c5347
2012-05-02 14:36:58 -05:00
Max Schenkelberg
a77524a3c5 Issue #239 Fixed bug with mosaic being up and starting a session
Change-Id: Ibe0b238806e3cb55b65a38da5a93caeddadc2c01

Former-commit-id: 918a417e51 [formerly 3ffb18b767] [formerly 55a6bc645e8d5d103bb03592344ed2c36a3e9468 [formerly a045f6f3b9]] [formerly b82eb49055 [formerly a045f6f3b9 [formerly 3155b7b27c0c9ddc8557ac8a0240548b0d50292c]]]
Former-commit-id: b82eb49055
Former-commit-id: 57f260c947b3fc3c2e2883f06031b6787b085456 [formerly 6a1b035c2d]
Former-commit-id: 887177aa84
2012-05-02 10:20:20 -05:00
Matt Nash
7a5ef764f7 Issue #448 use aliased name in peer to peer if available, fixes the extra view that once was created
Former-commit-id: ff25949b49 [formerly e1213ccea9] [formerly 167767dcbc] [formerly d1f23b8dee [formerly 167767dcbc [formerly 37181c07d14af1ab3cacd363d9ce150771139d3b]]]
Former-commit-id: d1f23b8dee
Former-commit-id: 24d74e2fdbc4cf9b4faedcf06aaa5b35ecd3d8d0 [formerly b0beab3044]
Former-commit-id: 3dbdc7246f
2012-05-02 09:42:50 -05:00
Max Schenkelberg
66a1338a59 Issue #239 Fixed url path issue for joining late
Change-Id: Ibf11c6d12b93954aad6e3969fa9869e977d48de6

Former-commit-id: 9d9e5bb8b7 [formerly 69cb2ff5ee] [formerly adabe413f6] [formerly 0326936e85 [formerly adabe413f6 [formerly 9879fcd8733798a96026b3459d66f5f9e757e182]]]
Former-commit-id: 0326936e85
Former-commit-id: ccae8d70f6e4cbd9c0d75dc71e716ed0c4104489 [formerly a608dcb59b]
Former-commit-id: edf13162a6
2012-05-02 09:25:44 -05:00
Max Schenkelberg
c5b45b0265 Issue #358 Fixed merge errors when merging core_exp into ss_sync
Former-commit-id: e0a22310dc [formerly 2ef208b263] [formerly 3fe183277b] [formerly e3d6962fe6 [formerly 3fe183277b [formerly e8846fa2b5aa1ef2972f134a683246bc275a8067]]]
Former-commit-id: e3d6962fe6
Former-commit-id: b0a578678016a097651cd359f6c7d0ad3223db18 [formerly 878de45ee6]
Former-commit-id: 338f80fa87
2012-05-01 18:36:09 -05:00
Steve Harris
3992b18e28 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: fe946166ed [formerly 4ec294b525] [formerly 2ed7249613] [formerly 7b75b781ad [formerly 2ed7249613 [formerly 05d9729acfe9e0f4af4a6ec030052ab26b0a5eb9]]]
Former-commit-id: 7b75b781ad
Former-commit-id: 228c26d32b0b13d4cccf51b188ca617ec417aba4 [formerly 6dd3ee8809]
Former-commit-id: 7c7fc97131
2012-05-01 18:31:09 -05:00
Steve Harris
40aa780b3d 12.4.1-10 baseline
Former-commit-id: 7fa9dbd5fb [formerly 4bfbdad17d] [formerly 9f8cb727a5] [formerly 8485b90ff8 [formerly 9f8cb727a5 [formerly bf53d06834caa780226121334ac1bcf0534c3f16]]]
Former-commit-id: 8485b90ff8
Former-commit-id: 73930fb29d0c1e91204e76e6ebfdbe757414f319 [formerly a28d70b5c5]
Former-commit-id: 33a67cdd82
2012-05-01 18:06:13 -05:00
Nate Jensen
eb89648334 Issue #427 cleanup
Change-Id: Ide2e5c8f5c2e8ced3bdf47d090619789c265f691

Former-commit-id: dd1cb83f03 [formerly 8bed608bc5] [formerly 9a992aab78] [formerly 0b6b92c9ff [formerly 9a992aab78 [formerly 2165fb7d4b1e2743110f647797b8f6017fc0a86c]]]
Former-commit-id: 0b6b92c9ff
Former-commit-id: 57dc35d7b3200d377fbe132557e432bf08e6a4f8 [formerly e89143161c]
Former-commit-id: 8c88416642
2012-05-01 17:33:55 -05:00
Matt Nash
af638d02e0 Issue #448 clean up group code
Former-commit-id: 543c9ae9cb [formerly 9ca693dd1e] [formerly ae7b40634e] [formerly 8791b7329a [formerly ae7b40634e [formerly aad6d7178694bfe9b42171729b4185e65429a515]]]
Former-commit-id: 8791b7329a
Former-commit-id: 535d306b6d2225a943f13598dc3863c24ec1486f [formerly 5d3c2686cd]
Former-commit-id: e2260c94a7
2012-05-01 16:14:33 -05:00
Max Schenkelberg
bed4dc9522 Issue #239 Got joining late working to load data participants don't have
Change-Id: I7c27e584b3b7f7331708689acee7f1b62fefe0eb

Former-commit-id: caa38ef109 [formerly c72650baef] [formerly edacf7a4b3] [formerly 4b8f81dbcb [formerly edacf7a4b3 [formerly ceabfd385103380f99bed2eaa4470cfbcb70cef9]]]
Former-commit-id: 4b8f81dbcb
Former-commit-id: 685cf1c6847c76bee5059129d41c7b3beecf8b24 [formerly 0b5623654a]
Former-commit-id: 55ecffce8b
2012-05-01 15:51:15 -05:00
Matt Nash
2a38c6222d Issue #448 fix icons
Former-commit-id: c3b72c3873 [formerly 7b96d1e9bc] [formerly fd515ad766] [formerly 9764210b93 [formerly fd515ad766 [formerly 6b6ef0c250f895f20e43a5b596be7189d8bc9d5f]]]
Former-commit-id: 9764210b93
Former-commit-id: 410584a46ea01b45ddc16b1807f81978115b9068 [formerly 529444c746]
Former-commit-id: cd36f4cd8a
2012-05-01 15:07:46 -05:00
Matt Nash
0786b47f2d Issue #448 problem where the file is not there and null is returned
Former-commit-id: 356ab7b820 [formerly 27ea55dad3] [formerly cef6bd81a8] [formerly 1872503cd8 [formerly cef6bd81a8 [formerly 41eb0413a8c68104532d4f302c4bed07a572b430]]]
Former-commit-id: 1872503cd8
Former-commit-id: f7ee48cfe756484bc1c1554d823c0ace7f6b8905 [formerly 7a89fa8342]
Former-commit-id: 72a6207eb7
2012-05-01 11:55:12 -05:00
Matt Nash
6944cd202d Issue #448 aliasing works on tabs and such now too
Former-commit-id: 2966485e68 [formerly 8a0f32b639] [formerly 88b20d568e] [formerly 4a0b1e36ca [formerly 88b20d568e [formerly 9dca1c46abc1d6eb4f81066c14a4b888f3c37b46]]]
Former-commit-id: 4a0b1e36ca
Former-commit-id: 1696cd103d9cda276a8531c4f38d12adfb70ec83 [formerly f121499f7a]
Former-commit-id: b7a2b627f6
2012-05-01 10:28:20 -05:00
Matt Nash
7c935c51ab Issue #448 further aliasing
Former-commit-id: cb79489dcd [formerly 9c6768f254] [formerly 603b114ae7] [formerly efd6485647 [formerly 603b114ae7 [formerly 066671debfaf52427cc0584513edd11f6cf10689]]]
Former-commit-id: efd6485647
Former-commit-id: 93d8c9b52ab8f8845146412f77caa7c4737791a8 [formerly b797bf94b9]
Former-commit-id: 77e0495f50
2012-04-30 17:28:01 -05:00
Matt Nash
2f37ddf632 Issue #448 aliasing for group view
Former-commit-id: c270c99caa [formerly 8ae54b2e0c] [formerly cb6aa40f42] [formerly 49bda84329 [formerly cb6aa40f42 [formerly aa42c1600b675412a5ee73a7e2da48602f05e10f]]]
Former-commit-id: 49bda84329
Former-commit-id: 3ad31f8dfb2b731bf4b7c221eb9efa19f639cc4e [formerly 77e3b905b0]
Former-commit-id: f7f9e9fee7
2012-04-30 16:45:35 -05:00
Nate Jensen
326f7b8197 Issue #427 cleanup
Change-Id: I878ec6ab2f3635ba861e4cc2db7716c0a51ba9b1

Former-commit-id: 4fc32a8178 [formerly c958d3a471] [formerly 6a034283b5] [formerly eac55b7587 [formerly 6a034283b5 [formerly 4c8192e99f1ecb57bc6a4efeaa6d7ee3a8127ec1]]]
Former-commit-id: eac55b7587
Former-commit-id: c85a6928e18e8149f4d53c868d1e99c25d96cb2d [formerly fafdf1de48]
Former-commit-id: d91295cf0a
2012-04-30 15:49:44 -05:00
Nate Jensen
7c1b7ee98f Issue #427 remove extraneous event buses
Change-Id: I958de58ba963609ada80529195d024077a901a0e

Former-commit-id: 2df5c95e6c [formerly 56ae7eab86] [formerly 7aa1e562d8] [formerly bfd45d703f [formerly 7aa1e562d8 [formerly 1c0d5457c079880996fc75872870545ededb4316]]]
Former-commit-id: bfd45d703f
Former-commit-id: 83fb7f2bcb2a8555dd49a709baa58d57198620f0 [formerly 9f32676a86]
Former-commit-id: 85067c02b7
2012-04-30 15:33:59 -05:00
Max Schenkelberg
ddf8f4cbb9 Issue #239 Made custom PointImageExtension that handles differencing for faster plot rendering
Change-Id: I2e22ee3eb6fe67ff754dd4689b8c8876eb3b893d

Former-commit-id: b2ee1fc849 [formerly 5e5e362f39] [formerly 9e2cf73f7a] [formerly 60aac07962 [formerly 9e2cf73f7a [formerly 2caf3e8ebb70ffd455cb9f354b1226e858898822]]]
Former-commit-id: 60aac07962
Former-commit-id: 6eae10aeb570077e3e808a98a06d092a3a64c545 [formerly 7bfaa9474b]
Former-commit-id: b060788489
2012-04-30 15:01:37 -05:00