Commit graph

362 commits

Author SHA1 Message Date
Max Schenkelberg
0cf00cb7f4 Issue #358 merged esb.camel project for plot update compatibility
Former-commit-id: ba90282320443c6c41c3188db9f43ffb11399bdd
2012-03-02 13:26:44 -06:00
David Gillingham
f6f0ca24df Issue #346: Convert GFE to use identity-based ListenerLists, increase
synchronization in Parm/VCParm to prevent leaking of VCParms through
ListenerLists.

Former-commit-id: 5fc74409511903afa97949bc3cd1b3acf91c35e0
2012-03-02 13:22:46 -06:00
Max Schenkelberg
f96ff96259 Issue #358 merged dataURI changes from thinclient in for plot
compatibility

Former-commit-id: 14d0dc1cd0e5eb0b48de89f5c73f30152d4789de
2012-03-02 12:24:19 -06:00
Max Schenkelberg
ae47d9683e Issue #358 Committing NPP core rendering improvements merged with Thin
Client core improvements

Former-commit-id: 206bd0450140b6bcdb3ec8f1e1e417c4c37746d6
2012-03-01 16:59:40 -06:00
Steve Harris
951ecfe3dd Merge branch 'ss_sync' into sync_test
Former-commit-id: 7ebcf63686d75d58f8bfea92e825edaf49a30df1
2012-03-01 14:01:16 -06:00
Steve Harris
c21bd2719c Merge branch '4-Thin_Client' into 104-integration
Former-commit-id: c6eacfe2d5898deacf756f059a71b1c9f41500bb
2012-03-01 13:19:04 -06:00
Ben Steffensmeier
49cce84edf 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: 059b4fcb3224b37b4a235f57e2065b9506f29d46
2012-03-01 12:44:43 -06:00
Steve Harris
703cb6e748 Merge branch '4-Thin_Client' into 104-integration
Former-commit-id: 152f05b5ab3dc736f1d3d21dba09de79d98d4c9e
2012-02-29 16:08:39 -06:00
Ben Steffensmeier
5c303ed189 Issue #353 add logic to syncronize times for thin client data updates..
Change-Id: Id1f8e31bc95f0b0262821050be6660bfe66df9d1

Former-commit-id: f94248823eed52b2d9f8c56af3dc7607b323fc1e
2012-02-29 15:49:47 -06:00
Ben Steffensmeier
5dee50e7e9 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: d05beaa84618bc01d8cb711298523dc358bb4938
2012-02-28 15:20:37 -06:00
Steve Harris
aa597242f9 Merge branch '4-Thin_Client' into 104-integration
Former-commit-id: 9864ba5dd0627dd8c68fae64aa7fad1916e40a0f
2012-02-27 11:32:49 -06:00
Ben Steffensmeier
357dc4d88b Issue #345 fix swapping of nsharp since nsharp insists on using a disposed target
Change-Id: I5a814be6590c2704dcd681bad7af34f0f9143ad2

Former-commit-id: acec1c2a23f4e27bfd0844171fdca77ff5473050
2012-02-24 14:57:23 -06:00
Bryan Kowal
1e3e31a657 Issue #202 - remove obsolete edex prefix verifications.
Former-commit-id: 6984db8c852a552867b1b8159637d96dcd83ab5a
2012-02-23 16:46:48 -06:00
David Gillingham
d79f7e9613 Issue #346: Create a dispose method for Parm and use it like AWIPS1's C++ destructor.
Change-Id: I2e8a4e82d5efd210e546abbaf8c0aba960803a9d

Former-commit-id: b6d7661be725d8a37a8294b0eda982208c35ecbe
2012-02-23 14:40:25 -06:00
Bryan Kowal
bae0cb555e Issue #202 - no longer attempt to build awips2-edex-ncep-nsharp.
Former-commit-id: 10339dcba7c9ae535766e5c5dddac57ddb3f99c4
2012-02-23 14:20:50 -06:00
Steve Harris
9ef773822f Merge branch 'ss_sync'
Former-commit-id: 5ed747b42f001de0c6d08b5fb6f77a192f2e9a03
2012-02-23 13:32:19 -06:00
David Gillingham
32b2c06988 Issue #346: Fix disappearing ISC data from VCParms, fix threading issues in Scalar/Vector pickup value dialogs.
Change-Id: If465b8daf5ef04a76084500425ac3114a48ab908

Former-commit-id: 67aaf1c21e8372b4a84cb82cae62549502992651
2012-02-23 13:23:59 -06:00
Steve Harris
eeddaa55f5 Merge branch '10-Tech_Blocked' into 104-integration
Former-commit-id: 72fce6fda1b07320cc79fbf8f09cc47ffbe32e89
2012-02-23 13:18:50 -06:00
Steve Harris
d6b489e69e Merge branch '4-Thin_Client' into 104-integration
Former-commit-id: fee006734577fd51f05ca5e9ce211d36d2b9fe57
2012-02-23 13:18:15 -06:00
Steve Harris
f081d1a6d4 Merge branch 'ss_sync' into 10-Tech_Blocked
Former-commit-id: 5aa15dec35cf72a46288613e42e6cb02b94320a6
2012-02-23 13:17:26 -06:00
Steve Harris
f9baa1c98c Merge branch 'ss_sync' into 4-Thin_Client
Former-commit-id: 2059372e90437312cf12f06de6c84d0824fb586c
2012-02-23 13:16:35 -06:00
Steve Harris
c502603907 removed .gitignore.orig & cots/uframe-eclipse. Added *.orig files to .gitignore
Former-commit-id: cccea1aa13ad987a8c1f2b06c2dfcaa77967544d
2012-02-23 12:45:50 -06:00
Steve Harris
dcadf7baa4 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: 9d9d92373b8e61c94c6d0f2b46baed3dc5cd7637
2012-02-23 12:38:55 -06:00
Nate Jensen
e3e44707a4 Merge "Issue #185 handle CommunicationExceptions from the LevelFactory in remerged ncep grib decoder." into 4-Thin_Client
Former-commit-id: fd448c2a996aef215802dc501b68d28747f66414
2012-02-23 11:50:39 -06:00
Ben Steffensmeier
703d59a968 Issue #176 update merged ncep plot classes to use new plot interface.
Change-Id: I345a970aa0d292fcd05ba4c19e77536e03057f72

Former-commit-id: 2e22a794183e4be8758997b9e76f896917a761db
2012-02-23 11:23:01 -06:00
Ben Steffensmeier
4dedc8b30d Issue #185 handle CommunicationExceptions from the LevelFactory in remerged ncep grib decoder.
Change-Id: I343e4e61d5f96938e84709392c32f6d94b244b17

Former-commit-id: 951c8c2a77c8f58a04a576148ac583ccdcc21e02
2012-02-23 10:49:56 -06:00
Steve Harris
2d25ee9414 Merge branch 'ss_sync' into 10-Tech_Blocked
Former-commit-id: a1b82aa2367ca506175ab0fec425c9e633ce949f
2012-02-23 10:28:19 -06:00
Steve Harris
957d232286 Merge (pull) branch '4-Thin_Client' of ssh://lightning.omaha.us.ray.com:29418/thunder into 4-Thin_Client
Former-commit-id: de97ce5f9b687f7404a34cac0b1fc34df5f854cb
2012-02-23 10:19:54 -06:00
Steve Harris
db065fcd50 Revert PlotResource2.java to ss_sync version for merge into 4-Thin_Client
Former-commit-id: 8a1ef8c6f0e3cdd8b4eb581218d499bc8fc19aeb
2012-02-23 10:16:02 -06:00
Steve Harris
d0bbbfefcc 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: 5528a1374781f3a4d55702ae1f0c34efcf1e3865
2012-02-23 10:06:18 -06:00
Steve Harris
6f7f678590 Merge branch 'OB12.2.1_test' into ss_sync
Former-commit-id: 76967f2151dcfb275be389c04060ff34be4a5018
2012-02-23 07:53:15 -06:00
Ben Steffensmeier
06c9d4cdcf Issue #345 allow double dispose of GLTarget
Change-Id: Ib433557f82bc0bc63fb537814bad47eab00be2be

Former-commit-id: 8b906b245fd927ed79825b00dfba456a1c327fbb
2012-02-22 17:40:48 -06:00
Bryan Kowal
9a63901c0e Issue #202 - no longer attempt to build awips2-edex-ncep-nsharp.
Former-commit-id: 979af119b4da4e99e0ee2f090b9c28c02db7f7a3
2012-02-22 17:07:15 -06:00
Steve Harris
a7b68a50be creating OB12.2.1 from ss_sync for testing
Former-commit-id: 5ea9539870491d7ea3d1a050b700a17d18ecee1d
2012-02-22 13:06:47 -06:00
Steve Harris
c8aae98741 Merging SS OB12.2.1 into ss_sync
Former-commit-id: 60f30af0c9e3203e2ff623d420165201dff41601
2012-02-22 11:14:43 -06:00
Steve Harris
94c2ea985b Merge branch 14-NCEP into 'ss_sync'
Former-commit-id: a04c1c31c89566279953d2a270df8d652a3a82ff
2012-02-22 10:12:49 -06:00
Steve Harris
84926c80be Merge branch '4-Thin_Client' into 104-integration
Former-commit-id: fe86fe3696731660f6b37a147194c670906cdf4f
2012-02-21 10:37:36 -06:00
Nate Jensen
b90611d995 Merge "Issue #345 fix issues with gl contexts and creation and deletion of gl objects!" into 4-Thin_Client
Former-commit-id: ac8ad6fa074f715a4b53a66fc41267a70ccb90f8
2012-02-21 08:57:12 -06:00
Steve Harris
7be1fb41ea Merge branch 'ss_sync'
Former-commit-id: b1c075b5f5af7df5058a409622a59b7d13b36416
2012-02-20 16:51:00 -06:00
Ben Steffensmeier
69e8cde115 Issue #345 fix issues with gl contexts and creation and deletion of gl objects!
Change-Id: Ied6c7a814478e21f3cd0eccabfecb00a92e698db

Former-commit-id: e0f697c492eecff4bb8d83d05efbcaf2876125c9
2012-02-20 15:28:20 -06:00
Steve Harris
07bf1f770d Merge branch '4-Thin_Client' into 104-integration
Former-commit-id: 80817ea48545c3315d8445c9acae60b6c92088f7
2012-02-20 13:04:10 -06:00
Steve Harris
cabf9fd956 Merge branch '10-Tech_Blocked' into 104-integration
Conflicts:
	edexOsgi/build.edex/deploy-install.xml
	rpms/awips2.edex/Installer.edex-cots/component.spec

Former-commit-id: f7ae49d33e6b672f35b55287c9b8ab780bd0f2ce
2012-02-20 13:03:39 -06:00
Steve Harris
6a064cb78b Merge branch 'ss_sync' (OB12.1.2-4) into 10-Tech_Blocked
Former-commit-id: ad74b15c5cab1f5275521f18ee67d30f199a8f95
2012-02-20 12:54:25 -06:00
Steve Harris
4b76d22f77 Merge branch 'ss_sync' (OB12.1.2-4) into 4-Thin_Client
Former-commit-id: a998a29e2f756ffc583eac04a884dcf9aae585e8
2012-02-20 12:43:38 -06:00
Steve Harris
62c587b841 Merge branch '4-Thin_Client' into 104-integration
Former-commit-id: aaf3d445f517bba03e9f6b768850f2a8c77d26ed
2012-02-20 07:49:13 -06:00
Bryan Kowal
10a0ca252d Issue #202 - fix deploy-install and the edex-cots rpm specification in test_sync.
Former-commit-id: be16819b50761daa75717bc901f73c66a7ad1af5
2012-02-17 12:17:14 -06:00
Bryan Kowal
4276fc2fe8 Issue #182 - the meteolib Activator will now return a properly formatted path to the meteolib dll when on a Windows workstation. The meteolib "cape function" will now acurrately report if it is out of memory.
Former-commit-id: 1ec51accade835c1133eac9222131f9186985053
2012-02-17 11:09:13 -06:00
Steve Harris
93f6535bd8 Manual merge of SS OB12.1.2-4 changes into ss_sync
Former-commit-id: 0ccca40d35e50072218a1da1db474075f8ad0393
2012-02-17 10:55:02 -06:00
Ben Steffensmeier
26d82729c9 Issue #343 unpack thinclient cave plugin so that removed pluigns file can be easily mofified.
Change-Id: I50c56ca84cdd2f911dc03eb06bf68dfdc785dcf0

Former-commit-id: 04a68e6815001450fece9bb5fbf6ce99143e2d05
2012-02-16 16:36:56 -06:00
Steve Harris
e2989d1a9f Merge branch '4-Thin_Client' into 104-integration
Former-commit-id: d3ca90194ff9d361ba9ff7679c2f4da43a439de4
2012-02-16 14:23:01 -06:00