Commit graph

6285 commits

Author SHA1 Message Date
Ben Steffensmeier
5395e71757 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: 7c2409eab0 [formerly 49cce84edf [formerly 059b4fcb3224b37b4a235f57e2065b9506f29d46]]
Former-commit-id: 49cce84edf
Former-commit-id: aa90109f45
2012-03-01 12:44:43 -06:00
David Gillingham
33b41f1b0e Issue #20: Fix breakage to alertViz caused by changes to
FileUtil.join().

Former-commit-id: 8a45f1f4c3 [formerly c6803ba434 [formerly 8832c64ba47f87027d5215caf7d84b9fc6a187cd]]
Former-commit-id: c6803ba434
Former-commit-id: 6a2b7e12d6
2012-03-01 11:19:22 -06:00
Steve Harris
27fb50d455 Merge branch '4-Thin_Client' into 104-integration
Former-commit-id: dd52eb4d40 [formerly 703cb6e748 [formerly 152f05b5ab3dc736f1d3d21dba09de79d98d4c9e]]
Former-commit-id: 703cb6e748
Former-commit-id: 98d1fbeb0e
2012-02-29 16:08:39 -06:00
Ben Steffensmeier
07d98eb7dc Issue #353 add logic to syncronize times for thin client data updates..
Change-Id: Id1f8e31bc95f0b0262821050be6660bfe66df9d1

Former-commit-id: c61e40c426 [formerly 5c303ed189 [formerly f94248823eed52b2d9f8c56af3dc7607b323fc1e]]
Former-commit-id: 5c303ed189
Former-commit-id: 56d97c95d5
2012-02-29 15:49:47 -06:00
Bryan Kowal
4ba738041e Issue #202 - no longer attempt to build awips2-edex-ncep-nsharp.
Former-commit-id: 94d6af30f0 [formerly 47230422ce [formerly 8b2a29b3f76fc10ccb6ee2ee5401aa4dc2cab74c]]
Former-commit-id: 47230422ce
Former-commit-id: 861ca25a4e
2012-02-29 12:43:46 -06:00
Ben Steffensmeier
7c3545170d 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: d7a63995f1 [formerly 5dee50e7e9 [formerly d05beaa84618bc01d8cb711298523dc358bb4938]]
Former-commit-id: 5dee50e7e9
Former-commit-id: 3713d7a181
2012-02-28 15:20:37 -06:00
Steve Harris
640855a3ca Merge branch 'ss_sync' (OB12.2.1) into 11-Collaboration
Former-commit-id: fb9896b8c9 [formerly 7817380140 [formerly a606419ccbf3cc1503cbe058af2264d0448b31af]]
Former-commit-id: 7817380140
Former-commit-id: 45e43fa592
2012-02-28 09:55:05 -06:00
Nate Jensen
43538daf06 Integrating Richard's changes with 12.2.1
Change-Id: I774e69f166dbc48c7cb31d066cb8bf5dd626520c

Former-commit-id: c5ba181cd8 [formerly 2515d56c9f [formerly 50680111c00b8d2bec9f2479a0cc22380ef6ecfe]]
Former-commit-id: 2515d56c9f
Former-commit-id: a22448c3d5
2012-02-28 09:42:47 -06:00
Nate Jensen
8106ba956f Integrating Richard's changes with 12.2.1
Change-Id: I1831502d72bed7b804287bb7c3e4ea501514ada4

Former-commit-id: afe3c5db9c [formerly d18a15535a [formerly 729a478cf151a4d61bb31adba4193c3fc33717a1]]
Former-commit-id: d18a15535a
Former-commit-id: 94ae63b740
2012-02-28 09:37:45 -06:00
Steve Harris
6d01784115 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: e5b56c99ab [formerly 9b67525e95 [formerly fb9d0adece5806382d0aa5c7c3e7c41f89594143]]
Former-commit-id: 9b67525e95
Former-commit-id: 24059a5b4e
2012-02-27 15:58:49 -06:00
Steve Harris
e08a6e4b1c Merge branch '4-Thin_Client' into 104-integration
Former-commit-id: a4538f0a48 [formerly aa597242f9 [formerly 9864ba5dd0627dd8c68fae64aa7fad1916e40a0f]]
Former-commit-id: aa597242f9
Former-commit-id: c45e7b888c
2012-02-27 11:32:49 -06:00
Ben Steffensmeier
8fd9d92f0a Issue #345 fix swapping of nsharp since nsharp insists on using a disposed target
Change-Id: I5a814be6590c2704dcd681bad7af34f0f9143ad2

Former-commit-id: 637c051a23 [formerly 357dc4d88b [formerly acec1c2a23f4e27bfd0844171fdca77ff5473050]]
Former-commit-id: 357dc4d88b
Former-commit-id: 20481daa1b
2012-02-24 14:57:23 -06:00
Bryan Kowal
48d5fd8ee6 Issue #202 - remove obsolete edex prefix verifications.
Former-commit-id: c2cd292c32 [formerly 1e3e31a657 [formerly 6984db8c852a552867b1b8159637d96dcd83ab5a]]
Former-commit-id: 1e3e31a657
Former-commit-id: 475849bd91
2012-02-23 16:46:48 -06:00
David Gillingham
586f77e788 Issue #346: Create a dispose method for Parm and use it like AWIPS1's C++ destructor.
Change-Id: I2e8a4e82d5efd210e546abbaf8c0aba960803a9d

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

Former-commit-id: 85998bc654 [formerly 32b2c06988 [formerly 67aaf1c21e8372b4a84cb82cae62549502992651]]
Former-commit-id: 32b2c06988
Former-commit-id: 5a8ba0f0fb
2012-02-23 13:23:59 -06:00
Steve Harris
7174904570 Merge branch '10-Tech_Blocked' into 104-integration
Former-commit-id: e829aa1a8b [formerly eeddaa55f5 [formerly 72fce6fda1b07320cc79fbf8f09cc47ffbe32e89]]
Former-commit-id: eeddaa55f5
Former-commit-id: 6cab5a6709
2012-02-23 13:18:50 -06:00
Steve Harris
c4616866d0 Merge branch '4-Thin_Client' into 104-integration
Former-commit-id: 3b16f37675 [formerly d6b489e69e [formerly fee006734577fd51f05ca5e9ce211d36d2b9fe57]]
Former-commit-id: d6b489e69e
Former-commit-id: db8491ee59
2012-02-23 13:18:15 -06:00
Steve Harris
7c3760b319 Merge branch 'ss_sync' into 10-Tech_Blocked
Former-commit-id: a0063d6cb1 [formerly f081d1a6d4 [formerly 5aa15dec35cf72a46288613e42e6cb02b94320a6]]
Former-commit-id: f081d1a6d4
Former-commit-id: d61c6bda96
2012-02-23 13:17:26 -06:00
Steve Harris
55b44a00db Merge branch 'ss_sync' into 4-Thin_Client
Former-commit-id: 46e1499e43 [formerly f9baa1c98c [formerly 2059372e90437312cf12f06de6c84d0824fb586c]]
Former-commit-id: f9baa1c98c
Former-commit-id: 608a0c17a0
2012-02-23 13:16:35 -06:00
Steve Harris
2f8260ccbc removed .gitignore.orig & cots/uframe-eclipse. Added *.orig files to .gitignore
Former-commit-id: ecb38ba165 [formerly c502603907 [formerly cccea1aa13ad987a8c1f2b06c2dfcaa77967544d]]
Former-commit-id: c502603907
Former-commit-id: 07ac42866c
2012-02-23 12:45:50 -06:00
Steve Harris
0be3703c7e 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: 86e586befe [formerly dcadf7baa4 [formerly 9d9d92373b8e61c94c6d0f2b46baed3dc5cd7637]]
Former-commit-id: dcadf7baa4
Former-commit-id: 4981170462
2012-02-23 12:38:55 -06:00
Nate Jensen
b07575c5b3 Merge "Issue #185 handle CommunicationExceptions from the LevelFactory in remerged ncep grib decoder." into 4-Thin_Client
Former-commit-id: fef3fcb60c [formerly e3e44707a4 [formerly fd448c2a996aef215802dc501b68d28747f66414]]
Former-commit-id: e3e44707a4
Former-commit-id: a914aa38c8
2012-02-23 11:50:39 -06:00
Ben Steffensmeier
41ca3213a4 Issue #176 update merged ncep plot classes to use new plot interface.
Change-Id: I345a970aa0d292fcd05ba4c19e77536e03057f72

Former-commit-id: 03d9230879 [formerly 703d59a968 [formerly 2e22a794183e4be8758997b9e76f896917a761db]]
Former-commit-id: 703d59a968
Former-commit-id: 0b0047e29d
2012-02-23 11:23:01 -06:00
Ben Steffensmeier
127dde9454 Issue #185 handle CommunicationExceptions from the LevelFactory in remerged ncep grib decoder.
Change-Id: I343e4e61d5f96938e84709392c32f6d94b244b17

Former-commit-id: 73a08e9d4e [formerly 4dedc8b30d [formerly 951c8c2a77c8f58a04a576148ac583ccdcc21e02]]
Former-commit-id: 4dedc8b30d
Former-commit-id: a2db6975c9
2012-02-23 10:49:56 -06:00
Steve Harris
40fee93b99 Merge branch 'ss_sync' into 10-Tech_Blocked
Former-commit-id: 19cf09274c [formerly 2d25ee9414 [formerly a1b82aa2367ca506175ab0fec425c9e633ce949f]]
Former-commit-id: 2d25ee9414
Former-commit-id: 9588895c2d
2012-02-23 10:28:19 -06:00
Steve Harris
ed66d12d24 Merge (pull) branch '4-Thin_Client' of ssh://lightning.omaha.us.ray.com:29418/thunder into 4-Thin_Client
Former-commit-id: a82f2c5750 [formerly 957d232286 [formerly de97ce5f9b687f7404a34cac0b1fc34df5f854cb]]
Former-commit-id: 957d232286
Former-commit-id: c0c0acfbe8
2012-02-23 10:19:54 -06:00
Steve Harris
909a19606c Revert PlotResource2.java to ss_sync version for merge into 4-Thin_Client
Former-commit-id: e94b322dc3 [formerly db065fcd50 [formerly 8a1ef8c6f0e3cdd8b4eb581218d499bc8fc19aeb]]
Former-commit-id: db065fcd50
Former-commit-id: a5f8708b6a
2012-02-23 10:16:02 -06:00
Steve Harris
5a96582f16 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: 7a10ca9766 [formerly d0bbbfefcc [formerly 5528a1374781f3a4d55702ae1f0c34efcf1e3865]]
Former-commit-id: d0bbbfefcc
Former-commit-id: 92084b3f20
2012-02-23 10:06:18 -06:00
Steve Harris
5fcd6629dc Merge branch 'OB12.2.1_test' into ss_sync
Former-commit-id: 830038b0c6 [formerly 6f7f678590 [formerly 76967f2151dcfb275be389c04060ff34be4a5018]]
Former-commit-id: 6f7f678590
Former-commit-id: 7966ab9369
2012-02-23 07:53:15 -06:00
Ben Steffensmeier
13ecc7e4ea Issue #345 allow double dispose of GLTarget
Change-Id: Ib433557f82bc0bc63fb537814bad47eab00be2be

Former-commit-id: 55aa66a510 [formerly 06c9d4cdcf [formerly 8b906b245fd927ed79825b00dfba456a1c327fbb]]
Former-commit-id: 06c9d4cdcf
Former-commit-id: b776d953d7
2012-02-22 17:40:48 -06:00
Bryan Kowal
22bea830e7 Issue #202 - no longer attempt to build awips2-edex-ncep-nsharp.
Former-commit-id: cd35220cf7 [formerly 9a63901c0e [formerly 979af119b4da4e99e0ee2f090b9c28c02db7f7a3]]
Former-commit-id: 9a63901c0e
Former-commit-id: 0f02d05283
2012-02-22 17:07:15 -06:00
Steve Harris
aefccec0f4 creating OB12.2.1 from ss_sync for testing
Former-commit-id: 1fc25c6cb2 [formerly a7b68a50be [formerly 5ea9539870491d7ea3d1a050b700a17d18ecee1d]]
Former-commit-id: a7b68a50be
Former-commit-id: 4ff546d3fd
2012-02-22 13:06:47 -06:00
Steve Harris
829d2791e9 Merging SS OB12.2.1 into ss_sync
Former-commit-id: 54be9660f1 [formerly c8aae98741 [formerly 60f30af0c9e3203e2ff623d420165201dff41601]]
Former-commit-id: c8aae98741
Former-commit-id: 8da36046de
2012-02-22 11:14:43 -06:00
Steve Harris
a811ac888f Merge branch 14-NCEP into 'ss_sync'
Former-commit-id: 9995d22e25 [formerly 94c2ea985b [formerly a04c1c31c89566279953d2a270df8d652a3a82ff]]
Former-commit-id: 94c2ea985b
Former-commit-id: 85075e6107
2012-02-22 10:12:49 -06:00
Steve Harris
aee8ef48fe Merge branch '4-Thin_Client' into 104-integration
Former-commit-id: f3fe839c1c [formerly 84926c80be [formerly fe86fe3696731660f6b37a147194c670906cdf4f]]
Former-commit-id: 84926c80be
Former-commit-id: 2c12c02910
2012-02-21 10:37:36 -06:00
Nate Jensen
f17df86ba3 Merge "Issue #345 fix issues with gl contexts and creation and deletion of gl objects!" into 4-Thin_Client
Former-commit-id: ec0cd8d086 [formerly b90611d995 [formerly ac8ad6fa074f715a4b53a66fc41267a70ccb90f8]]
Former-commit-id: b90611d995
Former-commit-id: ba5b1ee03f
2012-02-21 08:57:12 -06:00
Steve Harris
567a30dc74 Merge branch 'ss_sync'
Former-commit-id: 4e1def89e7 [formerly 7be1fb41ea [formerly b1c075b5f5af7df5058a409622a59b7d13b36416]]
Former-commit-id: 7be1fb41ea
Former-commit-id: de7a3491fa
2012-02-20 16:51:00 -06:00
Steve Harris
121ec88a98 Merge branch 'ss_sync' (OB12.1.2) into 9-Wes2Bridge
Conflicts:
	.gitignore
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/parm/vcparm/IVcModuleArgument.java
	deltaScripts/.pydevproject
	edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/persist/ServerSpecificPersistablePluginDataObject.java
	edexOsgi/com.raytheon.uf.edex.maintenance/src/com/raytheon/uf/edex/maintenance/archive/IDataArchiver.java
	edexOsgi/com.raytheon.uf.edex.maintenance/src/com/raytheon/uf/edex/maintenance/archive/IPluginArchiver.java

Former-commit-id: 496cc6a06b [formerly b89ebc5e01 [formerly 85082f273a85a3967d54d4a489b6ea973d0688be]]
Former-commit-id: b89ebc5e01
Former-commit-id: ec0f1aebfc
2012-02-20 16:38:06 -06:00
Ben Steffensmeier
1c1500408b Issue #345 fix issues with gl contexts and creation and deletion of gl objects!
Change-Id: Ied6c7a814478e21f3cd0eccabfecb00a92e698db

Former-commit-id: 73d24fad2f [formerly 69e8cde115 [formerly e0f697c492eecff4bb8d83d05efbcaf2876125c9]]
Former-commit-id: 69e8cde115
Former-commit-id: 27973ec694
2012-02-20 15:28:20 -06:00
Steve Harris
cbade8ffea Merge branch 'ss_sync' (OB12.1.2) into 11-Collaboration
Conflicts:
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/parm/vcparm/IVcModuleArgument.java
Added

Former-commit-id: e5a5b3eefa [formerly eca4aef9a8 [formerly d74a1285a30ce98a656668c93c71462e7dc51c2a]]
Former-commit-id: eca4aef9a8
Former-commit-id: 0d2bd27a08
2012-02-20 14:02:14 -06:00
Steve Harris
c69eb6d93d Merge branch '4-Thin_Client' into 104-integration
Former-commit-id: ebf5e8360e [formerly 07bf1f770d [formerly 80817ea48545c3315d8445c9acae60b6c92088f7]]
Former-commit-id: 07bf1f770d
Former-commit-id: ef21df5086
2012-02-20 13:04:10 -06:00
Steve Harris
eda787edea 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: 5e9d2dd367 [formerly cabf9fd956 [formerly f7ae49d33e6b672f35b55287c9b8ab780bd0f2ce]]
Former-commit-id: cabf9fd956
Former-commit-id: d971880b98
2012-02-20 13:03:39 -06:00
Steve Harris
cc45f5a268 Merge branch 'ss_sync' (OB12.1.2-4) into 10-Tech_Blocked
Former-commit-id: d02529fef4 [formerly 6a064cb78b [formerly ad74b15c5cab1f5275521f18ee67d30f199a8f95]]
Former-commit-id: 6a064cb78b
Former-commit-id: a2fd2cf6fa
2012-02-20 12:54:25 -06:00
Steve Harris
d129eab241 Merge branch 'ss_sync' (OB12.1.2-4) into 4-Thin_Client
Former-commit-id: cc66c8be24 [formerly 4b76d22f77 [formerly a998a29e2f756ffc583eac04a884dcf9aae585e8]]
Former-commit-id: 4b76d22f77
Former-commit-id: c268da57bc
2012-02-20 12:43:38 -06:00
Steve Harris
f3cee62470 Merge branch '4-Thin_Client' into 104-integration
Former-commit-id: c825bd03a2 [formerly 62c587b841 [formerly aaf3d445f517bba03e9f6b768850f2a8c77d26ed]]
Former-commit-id: 62c587b841
Former-commit-id: e3535054ff
2012-02-20 07:49:13 -06:00
Bryan Kowal
eda0f92b17 Issue #202 - fix deploy-install and the edex-cots rpm specification in test_sync.
Former-commit-id: 682c10767d [formerly 10a0ca252d [formerly be16819b50761daa75717bc901f73c66a7ad1af5]]
Former-commit-id: 10a0ca252d
Former-commit-id: 5754f9dfd8
2012-02-17 12:17:14 -06:00
Bryan Kowal
75c8f18793 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: 9f1b7a613a [formerly 4276fc2fe8 [formerly 1ec51accade835c1133eac9222131f9186985053]]
Former-commit-id: 4276fc2fe8
Former-commit-id: d4b76c1057
2012-02-17 11:09:13 -06:00
Steve Harris
7b4b066a2b Manual merge of SS OB12.1.2-4 changes into ss_sync
Former-commit-id: b137302802 [formerly 93f6535bd8 [formerly 0ccca40d35e50072218a1da1db474075f8ad0393]]
Former-commit-id: 93f6535bd8
Former-commit-id: c209d6de36
2012-02-17 10:55:02 -06:00