xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
1587 commits 31 branches 40 tags 3.8 GiB
Commit graph

1066 commits

Author SHA1 Message Date
Nate Jensen
e93c521327 Issue #427 event controllers use ISharedDisplaySession 
Change-Id: Ia0e41dcb7f0b49956a4a3c88a037894b972435c9

Former-commit-id: 1af05f177c [formerly ef03821455] [formerly f6226a89d9] [formerly cbf105015f [formerly f6226a89d9 [formerly bf6cf477825be1d19081965ca9e958ebf423c0af]]]
Former-commit-id: cbf105015f
Former-commit-id: 5385afe9ce1d1a6ded716c4d96c0ce04ff2b6cf7 [formerly e28fc62a56]
Former-commit-id: ff5fec3f09
 2012-03-26 16:37:44 -05:00
Nate Jensen
e10704c2fa Issue #427 fix xml serialization 
Change-Id: I795fe5a47fc2ed678a431795a6242382b3ef6654

Former-commit-id: c43746bbf1 [formerly e24039ae5c] [formerly 7c6e0a41f7] [formerly 2a1e40b2d5 [formerly 7c6e0a41f7 [formerly eb39d19f3940ba57e1322a786d0dd535289b2a1e]]]
Former-commit-id: 2a1e40b2d5
Former-commit-id: 5a795729fff7ba187286a7ae5aaad4eeaa8b98a9 [formerly a1e2c3173d]
Former-commit-id: ecc3dc9a70
 2012-03-26 15:47:34 -05:00
Nate Jensen
0e9194429e Issue #427 initial role based event handling 
Change-Id: I73d4df3f09c7cfa60025142ec5a4dccdad4423bb

Former-commit-id: e76039c56e [formerly bac31f3613] [formerly 4d7a53c583] [formerly 619d19e24c [formerly 4d7a53c583 [formerly b752ced02d726771a6e11a9982967a892d2e55f3]]]
Former-commit-id: 619d19e24c
Former-commit-id: 4440838cbe883a84c237cc8d0f49c75f814df106 [formerly 62b16fef0d]
Former-commit-id: 998c9df260
 2012-03-26 13:05:01 -05:00
James Korman
c442754471 Issue #232 : Large refactor - Add command interfaces 
Former-commit-id: a32e1d4b85 [formerly 5bb4a7952b] [formerly e408ed1a28] [formerly d51a8521f8 [formerly e408ed1a28 [formerly e82a81cb465b07710b8b2cd6c99e87f97311d316]]]
Former-commit-id: d51a8521f8
Former-commit-id: 4daa44c17ead88be2b1a8e6a6f9f3b84f376b884 [formerly e83de7447b]
Former-commit-id: fb0614ad9e
 2012-03-26 10:17:17 -05:00
Roger Ferrel
15245a25d6 Issue #244 Added participant even handler for SessionView and put in code to get groups(rosters). 
Change-Id: I4a7501859f2681b290ad0babf4dab9cbca80e102

Former-commit-id: 8d7cad314e [formerly cd66a9c29c] [formerly 04b5a92838] [formerly ce72b7b583 [formerly 04b5a92838 [formerly a264abfff059a9c5942ef1db91a6390fad12a110]]]
Former-commit-id: ce72b7b583
Former-commit-id: 3e15f252346e997b4631ee9819dc1ded143057fb [formerly 053c4ba597]
Former-commit-id: e649f9da42
 2012-03-22 16:57:30 -05:00
Nate Jensen
2ba6735324 Issue #427 Share maps and editor 
Change-Id: I6bd3148ec199c348ffd85d08322fdb8befa4096c

Former-commit-id: e9b2e70892 [formerly 37d4401747] [formerly 615962f5dd] [formerly 0e214bcd7c [formerly 615962f5dd [formerly 7a58d8a17be53fc504cafe32d19de2f52121eeff]]]
Former-commit-id: 0e214bcd7c
Former-commit-id: 2f70306617907f26efb4f42d9c736b68c3f4f5a2 [formerly 2801c4fdfb]
Former-commit-id: 8d94771854
 2012-03-22 09:39:59 -05:00
James Korman
ef3fdd7171 Issue #232 - Delete files from original locations 
Former-commit-id: 9c17874f37 [formerly 4dabfd8c2a] [formerly 90b74b258a] [formerly 55f269100c [formerly 90b74b258a [formerly b34ddc7ead0853a152baa8b95c950f9c714a4ff7]]]
Former-commit-id: 55f269100c
Former-commit-id: 4d86c3e4eddb68e0dd4e867b58d0cb40e7d9c96c [formerly 9badd0fb07]
Former-commit-id: d0976e4703
 2012-03-20 14:55:27 -05:00
James Korman
34eeb34b66 Issue #232 - Considerable refactoring/event processing 
Former-commit-id: cbe20ea7ca [formerly 60ff4d139b] [formerly 4ba4ccb404] [formerly cc5cc2d409 [formerly 4ba4ccb404 [formerly 0b229e6992b40060d43ac560e0a3fa532635f5a1]]]
Former-commit-id: cc5cc2d409
Former-commit-id: 341fef17dc14e38a04e3f4f94ca5a333eca1128e [formerly c5e9df26c1]
Former-commit-id: 8be6351348
 2012-03-20 13:59:55 -05:00
Roger Ferrel
e5a1786d4f Issue #244 Creted AbstarctSessonView and PeerToPeerView. Code clean up so CAVE exits properly. 
Change-Id: Ibd5feeb0412e4afbe8e1f0eac79944bb059b4687

Former-commit-id: 3ea86c6609 [formerly ce3b5728c5] [formerly 1f4edd08e4] [formerly a7f1fc18b1 [formerly 1f4edd08e4 [formerly e92969cb1440f3f6477a7003b031faab6ed484fc]]]
Former-commit-id: a7f1fc18b1
Former-commit-id: f37ef7c801a95dba643b2270726b5d75cbb30f5d [formerly 9f6642d572]
Former-commit-id: 002e7eab3f
 2012-03-20 10:42:57 -05:00
Max Schenkelberg
13f08a98a9 Issue #422 Set "numericValue" to null in RadarDefaultInterrogator in 
case of "NO DATA"

Former-commit-id: a0663a2791 [formerly 468c812dde] [formerly cd6ebd80d4] [formerly b9085db25d [formerly cd6ebd80d4 [formerly 89521a4df36d18ecb64b4cce248f150f0a0e4957]]]
Former-commit-id: b9085db25d
Former-commit-id: 46b9ad1c87f0e0eaf7fe167226e5b9dfa00844ed [formerly 954073b38c]
Former-commit-id: 81bc45f071
 2012-03-16 10:13:31 -05:00
Max Schenkelberg
712815ee18 Issue #358 Fixed sampling issue with mosaic resource with best 
res resources

Former-commit-id: 1b8beb3f8d [formerly 97edff9f7c] [formerly cc111ab9ac] [formerly 258d57e825 [formerly cc111ab9ac [formerly 8aaf5e65d7c8ecbced6252d4a98af6223c77d5a0]]]
Former-commit-id: 258d57e825
Former-commit-id: 6ca4a7d453c44b2e3a855ba1e88fd28485927549 [formerly 1e5c074e3b]
Former-commit-id: 4e81d2432c
 2012-03-16 09:03:50 -05:00
Max Schenkelberg
f51a9e5571 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: 732c2ddb5c [formerly 10b720381b] [formerly 719f87c261] [formerly 556a270a09 [formerly 719f87c261 [formerly f739d79bfd547adc295c716a1804f55f09b1bde1]]]
Former-commit-id: 556a270a09
Former-commit-id: c943e46db5cb54b3fb026d1fe63057721df3c99d [formerly ba8af4dcc1]
Former-commit-id: a4b859ae54
 2012-03-14 18:03:44 -05:00
Nate Jensen
e142a16d66 Merge "Issue #232 - Added guava lib project - Adding error checking/reporting - Added VenueInitationListener" into 11-Collaboration 
Former-commit-id: d73d150241 [formerly feeb8cba7e] [formerly 8f8e690470] [formerly dc62171533 [formerly 8f8e690470 [formerly 62d92c57d9d004427a74fc0353e2ca94411bf488]]]
Former-commit-id: dc62171533
Former-commit-id: edbe99a40abf943e962f6ce713562626cac22991 [formerly 8d78571942]
Former-commit-id: 77a50a5e25
 2012-03-14 11:23:55 -05:00
Matt Nash
503b172a11 Issue #244 icons and login changes 
Former-commit-id: 0e68f12509 [formerly f5c9cfd285] [formerly e06101f9c3] [formerly 2fd6e28569 [formerly e06101f9c3 [formerly ef2993a8545265adbc325080765baef0ee939923]]]
Former-commit-id: 2fd6e28569
Former-commit-id: 9ec069a70a96b24f2d5167df34cd67f927eb2dda [formerly 5b949aeacf]
Former-commit-id: d6ef74a95b
 2012-03-14 10:54:13 -05:00
James Korman
860d24bf25 Issue #232 - Added guava lib project - Adding error checking/reporting - Added VenueInitationListener 
Former-commit-id: 4756721ef6 [formerly ee20250305] [formerly 095ab0eeab] [formerly d6003d1e71 [formerly 095ab0eeab [formerly 92a842f56632399d3b43d7d560dbc5d6bbbd5662]]]
Former-commit-id: d6003d1e71
Former-commit-id: 5d7c36a75d50d27fdad5a4fa6b944c79100578f6 [formerly b29c262362]
Former-commit-id: 578594cdfd
 2012-03-14 10:24:17 -05:00
Max Schenkelberg
458f5970aa 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: 5a61f3ae23 [formerly 8fb7eccb73] [formerly 6e5964df9d] [formerly 50765e8a34 [formerly 6e5964df9d [formerly 7e4abe637edacca71e1e1c98d99521cd33415fb0]]]
Former-commit-id: 50765e8a34
Former-commit-id: 87c83af55da8aec24c975aa2f80b06b4449fa969 [formerly cf440b3884]
Former-commit-id: 8f08fab0a7
 2012-03-14 09:49:32 -05:00
Roger Ferrel
56421e0e85 Issue #244 Close Session connction when view closed. Tighen up dialogs. 
Change-Id: I874058fde36f521cfd4bbbf602798896b6887be5

Former-commit-id: bdc8744ea6 [formerly 186aac5b77] [formerly 97a3884017] [formerly c321d2aacf [formerly 97a3884017 [formerly 486b2186014a14a845e48dac222c293a7891e39e]]]
Former-commit-id: c321d2aacf
Former-commit-id: 0d5bd2eff5ad104e085cbcb075e99e36774a84b0 [formerly b21f1555e2]
Former-commit-id: a64f2e6070
 2012-03-14 09:26:23 -05:00
Steve Harris
4d58cdca1b Issue #16 - Recovering mpduff 9-Wes2Bridge code that fell out of a rebase while fixing a review set 
Former-commit-id: 229fa2944d [formerly 6d2af585b1] [formerly 5bbf80a384] [formerly 10dc140747 [formerly 5bbf80a384 [formerly a8ca6db2b2df5f7bd8a6a2fec3496dc1f37aa20c]]]
Former-commit-id: 10dc140747
Former-commit-id: 80cb0b251d26c0d96f2c7ee6601e3e0f30708bf4 [formerly 7bdde9f690]
Former-commit-id: 7fc8cf3d94
 2012-03-12 13:10:34 -05:00
Matt Nash
00e3ac6c24 Issue #244 new icons for collaboration 
Former-commit-id: 8271eb002a [formerly 6398c01aec] [formerly 79f1cbec74] [formerly 39bce3d793 [formerly 79f1cbec74 [formerly da2177babfe9fa8b7efbad9bf9d938e4ecb4313b]]]
Former-commit-id: 39bce3d793
Former-commit-id: 464bc504c69009a8a5c6135d429a9919623a9dd1 [formerly 22eb44eb26]
Former-commit-id: c743c0c44b
 2012-03-12 08:03:54 -05:00
Max Schenkelberg
8b6aa63464 Issue #358 Merging core drawing API improvements from Collaboration 
Former-commit-id: 3beecc1cdf [formerly 18805c68f7] [formerly d43b0456d8] [formerly 89f603f448 [formerly d43b0456d8 [formerly a266a93ec2dca3ffbd7d2fd1f9dc47d7e18e6904]]]
Former-commit-id: 89f603f448
Former-commit-id: 69a2b029e678fdd8a18305144330e4c95774ec78 [formerly 4662ece060]
Former-commit-id: f78b932abb
 2012-03-09 12:31:50 -06:00
Roger Ferrel
3fa7fe49be Issue #244 Bug Fix. 
Change-Id: Ic144fc7354f12aec2c5dd76997b38977c8b2986c

Former-commit-id: 118c5abe09 [formerly 1871be89e7] [formerly be9fe19d9a] [formerly d17ef23899 [formerly be9fe19d9a [formerly 3ecb104c403decb5889cf9d97d3a1dd2b9114b85]]]
Former-commit-id: d17ef23899
Former-commit-id: 2b16c0e3112c6a98ed1c1384c2103bb389942c83 [formerly 6c8db0d6a4]
Former-commit-id: e8887a6189
 2012-03-08 17:16:48 -06:00
Roger Ferrel
21e9061d08 Issue #244 Added join and refresh actions. 
Change-Id: I85b9c07f73319fc9c7ff3c61cda452e6990e7f20

Former-commit-id: c8b8a30875 [formerly 71a5524380] [formerly f492b082dc] [formerly f04f775a66 [formerly f492b082dc [formerly 4854c999ed0128c8b639f8b070ec4738591d9ff4]]]
Former-commit-id: f04f775a66
Former-commit-id: 6a269d0f74acd65b94c33c6edfce2cdfd2153abb [formerly 674cc116b2]
Former-commit-id: d6a4919b9a
 2012-03-08 12:37:56 -06:00
Matt Nash
bf1a187e49 Issue #244 added work on the chat for presence notifications 
Former-commit-id: b8cb02de4c [formerly c96c33169b] [formerly d264743199] [formerly 6f354374d6 [formerly d264743199 [formerly ead836fb1bc7f5843a29dc26cf3d634c80e22a81]]]
Former-commit-id: 6f354374d6
Former-commit-id: 855d12bbe7f26f52a1fcdfe7ec7faffbaff0c8fb [formerly 4f35191a6b]
Former-commit-id: b4a5aaea11
 2012-03-08 09:08:41 -06:00
Matt Nash
0ef60a57f3 Merge "Issue #244 update" into 11-Collaboration 
Former-commit-id: b73877e9a5 [formerly 1e4472cd78] [formerly 04ae9b48ea] [formerly bbacd337b4 [formerly 04ae9b48ea [formerly f1c93e1e97f5f6cc2cf8b4d9a0d14ea93863d173]]]
Former-commit-id: bbacd337b4
Former-commit-id: b87a5a6e0ba1906d19de0e9c7ce07edc116f66e4 [formerly 7efd993e18]
Former-commit-id: dd57ff6b7f
 2012-03-08 08:33:32 -06:00
Roger Ferrel
ab81628692 Issue #244 update 
Change-Id: I6f92dbd64d95cc853f6dcf43d39c209607a70105

Former-commit-id: b1a69aafff [formerly c22d5ef573] [formerly 4f4025ea23a0b60e1f1736431d8cdc6028c67caf [formerly c9459e2e8c]] [formerly 2114b95a0b [formerly c9459e2e8c [formerly 28969960d80066def0ef02930875e40d7693c234]]]
Former-commit-id: 2114b95a0b
Former-commit-id: 9c709d5af9cfb0e1e37a724c243c0fbbb12057a5 [formerly 1a2608a2fa]
Former-commit-id: 40b910c05e
 2012-03-08 08:30:02 -06:00
James Korman
7a91f24e27 Issue #232 Initial collaboration framework plugin checkin 
Former-commit-id: 373f5b4060 [formerly 4368616970] [formerly 526a2633ce] [formerly 5a91d71c12 [formerly 526a2633ce [formerly 2351a53e68bbc8cfe11917d202cbc5424768b5a6]]]
Former-commit-id: 5a91d71c12
Former-commit-id: 30ad0a0f992968ee55254e2e103edff30614f710 [formerly 2fea86a591]
Former-commit-id: f242c1a430
 2012-03-07 15:38:20 -06:00
Nate Jensen
1747d01347 Merge "Issue #244 Inital creation" into 11-Collaboration 
Former-commit-id: a448a80004 [formerly 13228ab7cc] [formerly f950b30463] [formerly 412ceb9561 [formerly f950b30463 [formerly 3a87a9a75f96d72a3f4bb378f9d2c913b441a5e3]]]
Former-commit-id: 412ceb9561
Former-commit-id: 9ce5eb6c5b02138237e3f9860e90c4d32e19f1ee [formerly d0672cf2b6]
Former-commit-id: 39f89588a1
 2012-03-06 14:27:15 -06:00
Roger Ferrel
f406bca886 Issue #244 Inital creation 
Change-Id: Ib73fdcccc4e5b521deae2249024bdd1464996ab4

Former-commit-id: 5e63f5b576 [formerly c62418dcf3] [formerly c26e98376e] [formerly 3161380f4d [formerly c26e98376e [formerly 25cee2c90c2403e31f27b67fd49d312d31baa575]]]
Former-commit-id: 3161380f4d
Former-commit-id: c93492e46d7634f4442b5821cc164ccf698b4647 [formerly ccfadae952]
Former-commit-id: 0cf600a16c
 2012-03-06 14:08:39 -06:00
David Gillingham
e0987cc993 Issue #354: Refactor AbstractParmManager to better handle ISC parm 
pre-loading.

Former-commit-id: 364b9e19b3 [formerly 1908212c27] [formerly d68e3a7eea] [formerly 494fbe93db [formerly d68e3a7eea [formerly e2c66b33fd8c71b0da6518c419296ab8141a07e3]]]
Former-commit-id: 494fbe93db
Former-commit-id: 22e522451d0eb5f0c7b3b2a357bfc73d015795c9 [formerly bc61eb1e43]
Former-commit-id: 29f03b0d2a
 2012-03-05 11:23:11 -06:00
David Gillingham
f670f3c950 Issue #346: Convert GFE to use identity-based ListenerLists, increase 
synchronization in Parm/VCParm to prevent leaking of VCParms through
ListenerLists.

Former-commit-id: 87de9d067b [formerly bd01975367] [formerly f6f0ca24df] [formerly 0c0f659896 [formerly f6f0ca24df [formerly 5fc74409511903afa97949bc3cd1b3acf91c35e0]]]
Former-commit-id: 0c0f659896
Former-commit-id: de321dd91cb8346ac092574ed9b7c81299c63edf [formerly b3df043f97]
Former-commit-id: bce9ad39ae
 2012-03-02 13:22:46 -06:00
Max Schenkelberg
52c7dec2e8 Issue #358 Committing NPP core rendering improvements merged with Thin 
Client core improvements

Former-commit-id: fe1811c167 [formerly e2cd95d3f4] [formerly ae47d9683e] [formerly 48b6d45f00 [formerly ae47d9683e [formerly 206bd0450140b6bcdb3ec8f1e1e417c4c37746d6]]]
Former-commit-id: 48b6d45f00
Former-commit-id: 22d12e35f7b0f5789a9dd62c8684fad371d63859 [formerly 3212cc6ebb]
Former-commit-id: 0554abdde0
 2012-03-01 16:59:40 -06:00
Steve Harris
6fdae68267 Merge branch 'ss_sync' into sync_test 
Former-commit-id: 994e79cfb3 [formerly 3b9c3e3474] [formerly 951ecfe3dd] [formerly 787aed90f8 [formerly 951ecfe3dd [formerly 7ebcf63686d75d58f8bfea92e825edaf49a30df1]]]
Former-commit-id: 787aed90f8
Former-commit-id: 64c60f8d4b42c0f811914474c3baf46e1940786e [formerly db45babec8]
Former-commit-id: b3f831a7b4
 2012-03-01 14:01:16 -06:00
Steve Harris
13597e2d3d Merge branch '4-Thin_Client' into 104-integration 
Former-commit-id: 5bf956755a [formerly 8794c4bcf6] [formerly c21bd2719c] [formerly 9bdea0399f [formerly c21bd2719c [formerly c6eacfe2d5898deacf756f059a71b1c9f41500bb]]]
Former-commit-id: 9bdea0399f
Former-commit-id: 79ca895e04be795aebb8555aa0b0ba51850c543e [formerly 6f5c182af0]
Former-commit-id: fe0b1eed94
 2012-03-01 13:19:04 -06:00
Ben Steffensmeier
6ec01d1d19 Issue #353 apply the server time offset before requesting updates instead of after so that way there is no time gap for the first request 
Change-Id: I3ceb8cefbedc3b64ca207c559e8cd381f6f184fd

Former-commit-id: 5395e71757 [formerly aa90109f45] [formerly 49cce84edf] [formerly 7c2409eab0 [formerly 49cce84edf [formerly 059b4fcb3224b37b4a235f57e2065b9506f29d46]]]
Former-commit-id: 7c2409eab0
Former-commit-id: 691ebf923ce51c7c2978a0c30511852ac7042b3c [formerly 3220ee4745]
Former-commit-id: f8c2ad7136
 2012-03-01 12:44:43 -06:00
Steve Harris
f5db44b7aa Merge branch '4-Thin_Client' into 104-integration 
Former-commit-id: 27fb50d455 [formerly 98d1fbeb0e] [formerly 703cb6e748] [formerly dd52eb4d40 [formerly 703cb6e748 [formerly 152f05b5ab3dc736f1d3d21dba09de79d98d4c9e]]]
Former-commit-id: dd52eb4d40
Former-commit-id: fe7d53e8a206e849dc25fe40d0bef8cfe7ab3606 [formerly 06baad5169]
Former-commit-id: 3e4d618486
 2012-02-29 16:08:39 -06:00
Ben Steffensmeier
cc8e7897cf Issue #353 add logic to syncronize times for thin client data updates.. 
Change-Id: Id1f8e31bc95f0b0262821050be6660bfe66df9d1

Former-commit-id: 07d98eb7dc [formerly 56d97c95d5] [formerly 5c303ed189] [formerly c61e40c426 [formerly 5c303ed189 [formerly f94248823eed52b2d9f8c56af3dc7607b323fc1e]]]
Former-commit-id: c61e40c426
Former-commit-id: bc3ac83b421a21ffdbc670c12096f7c96ca7c87f [formerly 84e6c9beb8]
Former-commit-id: 390700efb0
 2012-02-29 15:49:47 -06:00
Ben Steffensmeier
1ac84dc230 Issue #352 initialize ThinClientDataUpdateTree as soon as component starts to ensure that it correctly sets the last query time. 
Change-Id: I13d4af0a1529e31f78e998db6bbdee228e749e1f

Former-commit-id: 7c3545170d [formerly 3713d7a181] [formerly 5dee50e7e9] [formerly d7a63995f1 [formerly 5dee50e7e9 [formerly d05beaa84618bc01d8cb711298523dc358bb4938]]]
Former-commit-id: d7a63995f1
Former-commit-id: 17cbace4358ff60cc55095422d0870a3cb6e704b [formerly e52c2ffb20]
Former-commit-id: dba810ddc4
 2012-02-28 15:20:37 -06:00
Steve Harris
2dbdc945bf Merge branch 'ss_sync' into 9-Wes2Bridge 
Conflicts:
	.gitignore
	ncep/gov.noaa.nws.ncep.common.dataplugin.h5scd/src/gov/noaa/nws/ncep/common/dataplugin/h5scd/H5ScdRecord.java
	ncep/gov.noaa.nws.ncep.common.dataplugin.h5uair/src/gov/noaa/nws/ncep/common/dataplugin/h5uair/H5UairRecord.java
	ncep/gov.noaa.nws.ncep.common.dataplugin.mcidas/src/gov/noaa/nws/ncep/common/dataplugin/mcidas/McidasRecord.java
	ncep/gov.noaa.nws.ncep.edex.plugin.mosaic/src/gov/noaa/nws/ncep/edex/plugin/mosaic/common/MosaicRecord.java

deleted h5 files
using ss_sync version of java files


Former-commit-id: 6d01784115 [formerly 24059a5b4e] [formerly 9b67525e95] [formerly e5b56c99ab [formerly 9b67525e95 [formerly fb9d0adece5806382d0aa5c7c3e7c41f89594143]]]
Former-commit-id: e5b56c99ab
Former-commit-id: 6a444fc4fae979713c005a8d9737369a6bcbce84 [formerly 40d7357165]
Former-commit-id: 73a337bc31
 2012-02-27 15:58:49 -06:00
Steve Harris
b65a901af6 Merge branch '4-Thin_Client' into 104-integration 
Former-commit-id: e08a6e4b1c [formerly c45e7b888c] [formerly aa597242f9] [formerly a4538f0a48 [formerly aa597242f9 [formerly 9864ba5dd0627dd8c68fae64aa7fad1916e40a0f]]]
Former-commit-id: a4538f0a48
Former-commit-id: 0f7bb182634a23c54efdab2309f3cd0d4a2a8f14 [formerly fdd6018d1a]
Former-commit-id: 7c18ec7c7c
 2012-02-27 11:32:49 -06:00
Ben Steffensmeier
d5118790dd Issue #345 fix swapping of nsharp since nsharp insists on using a disposed target 
Change-Id: I5a814be6590c2704dcd681bad7af34f0f9143ad2

Former-commit-id: 8fd9d92f0a [formerly 20481daa1b] [formerly 357dc4d88b] [formerly 637c051a23 [formerly 357dc4d88b [formerly acec1c2a23f4e27bfd0844171fdca77ff5473050]]]
Former-commit-id: 637c051a23
Former-commit-id: bc7a93cc6ff900a77e00a7eb9d6864845eda90c8 [formerly 62f1ea0aac]
Former-commit-id: 88d2d2e4b6
 2012-02-24 14:57:23 -06:00
David Gillingham
d10c91b814 Issue #346: Create a dispose method for Parm and use it like AWIPS1's C++ destructor. 
Change-Id: I2e8a4e82d5efd210e546abbaf8c0aba960803a9d

Former-commit-id: 586f77e788 [formerly ef903bc728] [formerly d79f7e9613] [formerly 5aa5b51a55 [formerly d79f7e9613 [formerly b6d7661be725d8a37a8294b0eda982208c35ecbe]]]
Former-commit-id: 5aa5b51a55
Former-commit-id: 9d586efeed036f273d51786977174c550e093ace [formerly f9ed20bada]
Former-commit-id: 6bca8d6353
 2012-02-23 14:40:25 -06:00
David Gillingham
d9def42052 Issue #346: Fix disappearing ISC data from VCParms, fix threading issues in Scalar/Vector pickup value dialogs. 
Change-Id: If465b8daf5ef04a76084500425ac3114a48ab908

Former-commit-id: adfd42b5ce [formerly 5a8ba0f0fb] [formerly 32b2c06988] [formerly 85998bc654 [formerly 32b2c06988 [formerly 67aaf1c21e8372b4a84cb82cae62549502992651]]]
Former-commit-id: 85998bc654
Former-commit-id: fb4654a71df93b18d676c70825d89036de6bfcfe [formerly 88dcd4d09d]
Former-commit-id: 9ff631305a
 2012-02-23 13:23:59 -06:00
Steve Harris
fbb5de922a Merge branch '4-Thin_Client' (with OB12.2.1) into 104-integration 
Conflicts:
	edexOsgi/build.edex/deploy-install.xml

Seems to have solved itself or was not actually a conflict


Former-commit-id: 0be3703c7e [formerly 4981170462] [formerly dcadf7baa4] [formerly 86e586befe [formerly dcadf7baa4 [formerly 9d9d92373b8e61c94c6d0f2b46baed3dc5cd7637]]]
Former-commit-id: 86e586befe
Former-commit-id: 5a0e0d2312e9dc1ae83176f1127db903c68bc140 [formerly 938dc5b21c]
Former-commit-id: 4eb1ef5b0f
 2012-02-23 12:38:55 -06:00
Steve Harris
d1589bf5e5 Merge (pull) branch '4-Thin_Client' of ssh://lightning.omaha.us.ray.com:29418/thunder into 4-Thin_Client 
Former-commit-id: ed66d12d24 [formerly c0c0acfbe8] [formerly 957d232286] [formerly a82f2c5750 [formerly 957d232286 [formerly de97ce5f9b687f7404a34cac0b1fc34df5f854cb]]]
Former-commit-id: a82f2c5750
Former-commit-id: 252271566acafedef77dcd075974af95164c1987 [formerly e6c3afa7a2]
Former-commit-id: 43b83ed8aa
 2012-02-23 10:19:54 -06:00
Steve Harris
2d02f819be Merge branch 'ss_sync' (OB12.2.1) into 4-Thin_Client 
Conflicts:
	ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/src/gov/noaa/nws/ncep/edex/plugin/ncgrib/Ncgrib1Decoder.java
	ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/plotModels/PlotModelGenerator2.java
	ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/rsc/H5UairPlotInfoRetriever.java
	ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/rsc/PlotResource2.java

deleted 'H5U; PlotResource2.java was not edited


Former-commit-id: 5a96582f16 [formerly 92084b3f20] [formerly d0bbbfefcc] [formerly 7a10ca9766 [formerly d0bbbfefcc [formerly 5528a1374781f3a4d55702ae1f0c34efcf1e3865]]]
Former-commit-id: 7a10ca9766
Former-commit-id: 6fb9d83319d58ea511061243437d2805a4c4ae7b [formerly 3d511fe719]
Former-commit-id: 92b7072b82
 2012-02-23 10:06:18 -06:00
Ben Steffensmeier
e99e823ca8 Issue #345 allow double dispose of GLTarget 
Change-Id: Ib433557f82bc0bc63fb537814bad47eab00be2be

Former-commit-id: 13ecc7e4ea [formerly b776d953d7] [formerly 06c9d4cdcf] [formerly 55aa66a510 [formerly 06c9d4cdcf [formerly 8b906b245fd927ed79825b00dfba456a1c327fbb]]]
Former-commit-id: 55aa66a510
Former-commit-id: caf20037931a8dff74e314931dddc204682bcdf7 [formerly 5d6b036ed7]
Former-commit-id: c3d3142bab
 2012-02-22 17:40:48 -06:00
Steve Harris
13a3edd4f6 Merging SS OB12.2.1 into ss_sync 
Former-commit-id: 829d2791e9 [formerly 8da36046de] [formerly c8aae98741] [formerly 54be9660f1 [formerly c8aae98741 [formerly 60f30af0c9e3203e2ff623d420165201dff41601]]]
Former-commit-id: 54be9660f1
Former-commit-id: 411ab8c69637be6b90bd3e06c4b1ab00caea0eec [formerly 4450cf8963]
Former-commit-id: b55a488ed8
 2012-02-22 11:14:43 -06:00
Steve Harris
139d42c594 Merge branch 14-NCEP into 'ss_sync' 
Former-commit-id: a811ac888f [formerly 85075e6107] [formerly 94c2ea985b] [formerly 9995d22e25 [formerly 94c2ea985b [formerly a04c1c31c89566279953d2a270df8d652a3a82ff]]]
Former-commit-id: 9995d22e25
Former-commit-id: dccb91e6d6462a59f41fcbab353272041948d51b [formerly aaead73ec5]
Former-commit-id: 610fdf3f4e
 2012-02-22 10:12:49 -06:00
Steve Harris
0295f24df1 Merge branch '4-Thin_Client' into 104-integration 
Former-commit-id: aee8ef48fe [formerly 2c12c02910] [formerly 39d576f84fe54a129e1631ac7c208e0d49e5fd36 [formerly 84926c80be]] [formerly f3fe839c1c [formerly 84926c80be [formerly fe86fe3696731660f6b37a147194c670906cdf4f]]]
Former-commit-id: f3fe839c1c
Former-commit-id: f0db7f39e4b09a4a991fc462354c2e91299cc7e0 [formerly 6d1b04e62c]
Former-commit-id: 968239217e
 2012-02-21 10:37:36 -06:00
Nate Jensen
8dc1ff026f Merge "Issue #345 fix issues with gl contexts and creation and deletion of gl objects!" into 4-Thin_Client 
Former-commit-id: f17df86ba3 [formerly ba5b1ee03f] [formerly b90611d995] [formerly ec0cd8d086 [formerly b90611d995 [formerly ac8ad6fa074f715a4b53a66fc41267a70ccb90f8]]]
Former-commit-id: ec0cd8d086
Former-commit-id: 7bcacb16073573ba01393828f50c6e24f05ad1a2 [formerly 13ea11ddfc]
Former-commit-id: 2ee4305d77
 2012-02-21 08:57:12 -06:00