112 commits

Author	SHA1	Message	Date
Steve Harris	7ee04eb560	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: 092efd6072 [formerly 092efd6072 [formerly f98354aae305ad227eaf3b36e4393b8aefc80f02]] Former-commit-id: 31b3e87ffa Former-commit-id: 98447412f8	2012-05-09 13:19:47 -05:00
Max Schenkelberg	9f72069996	Issue #358 Fixed merge errors when merging core_exp into ss_sync ... Former-commit-id: 3fe183277b [formerly 3fe183277b [formerly e8846fa2b5aa1ef2972f134a683246bc275a8067]] Former-commit-id: e3d6962fe6 Former-commit-id: 878de45ee6	2012-05-01 18:36:09 -05:00
Steve Harris	fd9e226b35	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: 2ed7249613 [formerly 2ed7249613 [formerly 05d9729acfe9e0f4af4a6ec030052ab26b0a5eb9]] Former-commit-id: 7b75b781ad Former-commit-id: 6dd3ee8809	2012-05-01 18:31:09 -05:00
Steve Harris	e5543a0e86	12.4.1-10 baseline ... Former-commit-id: 9f8cb727a5 [formerly 9f8cb727a5 [formerly bf53d06834caa780226121334ac1bcf0534c3f16]] Former-commit-id: 8485b90ff8 Former-commit-id: a28d70b5c5	2012-05-01 18:06:13 -05:00
Dave Hladky	d2e16d486b	Issue #15 Re-wrote SimDate integration for menus, alert observers after ... merge headache. Former-commit-id: 1b7473572f [formerly 1b7473572f [formerly 647b7ac154dbdaf945231b231f491bbca86d2a24]] Former-commit-id: 5b7ecea866 Former-commit-id: 61e31c62ff	2012-04-30 13:43:34 -05:00
David Gillingham	01f74fa2b5	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: c28bfaddee [formerly c28bfaddee [formerly fe6ec52b4cf64d410f3de609b06cf9666a5936bc]] Former-commit-id: 292374ce21 Former-commit-id: 6f40ba77f1	2012-04-27 12:43:04 -05:00
David Gillingham	aeba62a5d9	Issue #473: Properly archive text plugin records, ... fix bugs in DatabaseArchiver.determineStartTime(). Change-Id: I2a7a71bcf7bdbc5ea786d949631b45342675ce1f Former-commit-id: 526abfd36e [formerly 526abfd36e [formerly 6e45fc4f0eb15409a20be99c02b2ac43c8ed842e]] Former-commit-id: 04ab5d619b Former-commit-id: 36717c7a3e	2012-04-25 17:08:21 -05:00
Max Schenkelberg	72a27b7ae0	Issue #358 Fixed merge errors when merging core_exp into ss_sync ... Former-commit-id: 1294fa0ca1 [formerly 1294fa0ca1 [formerly bd93246cccd1b123598006d7343eac265392695d]] Former-commit-id: 90a5c20b5a Former-commit-id: 65c864aff2	2012-04-19 11:11:34 -05:00
Steve Harris	19657ae52d	Merge branch 'core_exp' into ss_sync (Graphics Improvements for NPP/Collaboration) ... 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 Former-commit-id: 4d7572a632 [formerly 4d7572a632 [formerly 5e1b9319941eed516a08a135a2049c14bad77863]] Former-commit-id: 625cd4262c Former-commit-id: def458753d	2012-04-19 11:11:02 -05:00
Steve Harris	8cd5974f4c	12.4.1-4 baseline ... Former-commit-id: 67a5a68300 [formerly 67a5a68300 [formerly ad648deaf4d3edaabdda15184289b3a927308bd7]] Former-commit-id: 2a216f333c Former-commit-id: a4e519f3cd	2012-04-18 15:18:16 -05:00
Richard Peter	797ee329df	Merge "Issue #449. Fixed problem with simulated time for trend plots in FSS monitors." into 9-Wes2Bridge ... Former-commit-id: 709be7733b [formerly 709be7733b [formerly 2a3492987c4cd9751aad2c6e20230f983e68f4b5]] Former-commit-id: be060f1b1c Former-commit-id: 4a93a365bd	2012-04-17 13:16:22 -05:00
Steve Harris	58cb18d860	Merge branch 'ss_sync' (OB12.3.1) into 9-Wes2Bridge ... Conflicts: edexOsgi/build.edex/esb/data/utility/edex_static/base/python/ObsRequest.py edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/persist/DefaultPathProvider.java edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/persist/PersistablePluginDataObject.java Former-commit-id: ed26e06df2 [formerly ed26e06df2 [formerly 3bd9b3a16b0105822983302efa5dd2834aaf5a5f]] Former-commit-id: fee53dea94 Former-commit-id: dcdd7f0648	2012-04-10 12:50:03 -05:00
Slav Korolev	d82def7b22	Issue #449. Fixed problem with simulated time for trend plots in FSS ... monitors. Former-commit-id: 8d29726365 [formerly 8d29726365 [formerly 79b81f2a734142d212d7bc0ad3686c7b64f433c5]] Former-commit-id: f02da69ff5 Former-commit-id: 47ba302180	2012-04-09 14:50:19 -04:00
Max Schenkelberg	f20e674318	Issue #358 Fixed merge errors when merging core_exp into ss_sync ... Former-commit-id: 9b0d01f8b5 [formerly 9b0d01f8b5 [formerly beb6a1d49fac8e3e7b2ba8cbc52a8980d06e9885]] Former-commit-id: 07cf5069ba Former-commit-id: 993cac891e	2012-03-30 10:51:31 -05:00
Steve Harris	9fee09c9e4	Merge branch 'core_exp' into ss_sync (Graphics Improvements for NPP/Collaboration) ... 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 Former-commit-id: d3ad6095b7 [formerly d3ad6095b7 [formerly 879a2e0a4a31999bf4d624ff59e77bbd68195458]] Former-commit-id: 5cdda77afb Former-commit-id: 6aa18f74f6	2012-03-30 09:50:48 -05:00
Steve Harris	2e0f4b241b	12.3.1-10 baseline ... Former-commit-id: 4068f5295f [formerly 4068f5295f [formerly 7d62bca046401a670ef7bd917cbcbb073e061b60]] Former-commit-id: 22bd792cd9 Former-commit-id: ce3b74c605	2012-03-30 08:38:33 -05:00
Steve Harris	5a310acb18	Merge branch 'sync_test' (VCModules) into ss_sync ... Former-commit-id: 70357d90bc [formerly 70357d90bc [formerly e68338cecbe85a62835633e9aba0925344fb80f1]] Former-commit-id: a0abcf8120 Former-commit-id: 6884520750	2012-03-29 10:03:05 -05:00
Max Schenkelberg	2f3b9f0067	Issue #358 Made wireframe shapes rely more on the grid geoemtry of the ... descriptor than the actual descriptor as the descriptor is used purely for convenience Former-commit-id: 15a9245592 [formerly 15a9245592 [formerly 265ccb3e22aa0122dbd74e83d0af202596c1941c]] Former-commit-id: f10f1a5319 Former-commit-id: ac11dd0c18	2012-03-28 13:32:04 -05:00
Max Schenkelberg	645900727c	Issue #422 Set "numericValue" to null in RadarDefaultInterrogator in ... case of "NO DATA" Former-commit-id: cd6ebd80d4 [formerly cd6ebd80d4 [formerly 89521a4df36d18ecb64b4cce248f150f0a0e4957]] Former-commit-id: b9085db25d Former-commit-id: 954073b38c	2012-03-16 10:13:31 -05:00
Max Schenkelberg	a3bda1957c	Issue #358 Fixed sampling issue with mosaic resource with best ... res resources Former-commit-id: cc111ab9ac [formerly cc111ab9ac [formerly 8aaf5e65d7c8ecbced6252d4a98af6223c77d5a0]] Former-commit-id: 258d57e825 Former-commit-id: 1e5c074e3b	2012-03-16 09:03:50 -05:00
Max Schenkelberg	682aca1dda	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: 719f87c261 [formerly 719f87c261 [formerly f739d79bfd547adc295c716a1804f55f09b1bde1]] Former-commit-id: 556a270a09 Former-commit-id: ba8af4dcc1	2012-03-14 18:03:44 -05:00
Max Schenkelberg	6378e8c4ee	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: 6e5964df9d [formerly 6e5964df9d [formerly 7e4abe637edacca71e1e1c98d99521cd33415fb0]] Former-commit-id: 50765e8a34 Former-commit-id: cf440b3884	2012-03-14 09:49:32 -05:00
Steve Harris	a97a9f80c9	Issue #16 - Recovering mpduff 9-Wes2Bridge code that fell out of a rebase while fixing a review set ... Former-commit-id: 5bbf80a384 [formerly 5bbf80a384 [formerly a8ca6db2b2df5f7bd8a6a2fec3496dc1f37aa20c]] Former-commit-id: 10dc140747 Former-commit-id: 7bdde9f690	2012-03-12 13:10:34 -05:00
Max Schenkelberg	1303289d12	Issue #358 Merging core drawing API improvements from Collaboration ... Former-commit-id: d43b0456d8 [formerly d43b0456d8 [formerly a266a93ec2dca3ffbd7d2fd1f9dc47d7e18e6904]] Former-commit-id: 89f603f448 Former-commit-id: 4662ece060	2012-03-09 12:31:50 -06:00
David Gillingham	ad8efe180e	Issue #354: Refactor AbstractParmManager to better handle ISC parm ... pre-loading. Former-commit-id: d68e3a7eea [formerly d68e3a7eea [formerly e2c66b33fd8c71b0da6518c419296ab8141a07e3]] Former-commit-id: 494fbe93db Former-commit-id: bc61eb1e43	2012-03-05 11:23:11 -06:00
David Gillingham	788007ff63	Issue #346: Convert GFE to use identity-based ListenerLists, increase ... synchronization in Parm/VCParm to prevent leaking of VCParms through ListenerLists. Former-commit-id: f6f0ca24df [formerly f6f0ca24df [formerly 5fc74409511903afa97949bc3cd1b3acf91c35e0]] Former-commit-id: 0c0f659896 Former-commit-id: b3df043f97	2012-03-02 13:22:46 -06:00
Max Schenkelberg	585e979c76	Issue #358 Committing NPP core rendering improvements merged with Thin ... Client core improvements Former-commit-id: ae47d9683e [formerly ae47d9683e [formerly 206bd0450140b6bcdb3ec8f1e1e417c4c37746d6]] Former-commit-id: 48b6d45f00 Former-commit-id: 3212cc6ebb	2012-03-01 16:59:40 -06:00
Steve Harris	376edad3c9	Merge branch 'ss_sync' into sync_test ... Former-commit-id: 951ecfe3dd [formerly 951ecfe3dd [formerly 7ebcf63686d75d58f8bfea92e825edaf49a30df1]] Former-commit-id: 787aed90f8 Former-commit-id: db45babec8	2012-03-01 14:01:16 -06:00
Steve Harris	6cdedca0a3	Merge branch '4-Thin_Client' into 104-integration ... Former-commit-id: c21bd2719c [formerly c21bd2719c [formerly c6eacfe2d5898deacf756f059a71b1c9f41500bb]] Former-commit-id: 9bdea0399f Former-commit-id: 6f5c182af0	2012-03-01 13:19:04 -06:00
Ben Steffensmeier	e0ad3aee33	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: 49cce84edf [formerly 49cce84edf [formerly 059b4fcb3224b37b4a235f57e2065b9506f29d46]] Former-commit-id: 7c2409eab0 Former-commit-id: 3220ee4745	2012-03-01 12:44:43 -06:00
Steve Harris	a4d8f58c90	Merge branch '4-Thin_Client' into 104-integration ... Former-commit-id: 703cb6e748 [formerly 703cb6e748 [formerly 152f05b5ab3dc736f1d3d21dba09de79d98d4c9e]] Former-commit-id: dd52eb4d40 Former-commit-id: 06baad5169	2012-02-29 16:08:39 -06:00
Ben Steffensmeier	588432f980	Issue #353 add logic to syncronize times for thin client data updates.. ... Change-Id: Id1f8e31bc95f0b0262821050be6660bfe66df9d1 Former-commit-id: 5c303ed189 [formerly 5c303ed189 [formerly f94248823eed52b2d9f8c56af3dc7607b323fc1e]] Former-commit-id: c61e40c426 Former-commit-id: 84e6c9beb8	2012-02-29 15:49:47 -06:00
Ben Steffensmeier	7d4367ee7a	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: 5dee50e7e9 [formerly 5dee50e7e9 [formerly d05beaa84618bc01d8cb711298523dc358bb4938]] Former-commit-id: d7a63995f1 Former-commit-id: e52c2ffb20	2012-02-28 15:20:37 -06:00
Steve Harris	21f12bae82	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: 9b67525e95 [formerly 9b67525e95 [formerly fb9d0adece5806382d0aa5c7c3e7c41f89594143]] Former-commit-id: e5b56c99ab Former-commit-id: 40d7357165	2012-02-27 15:58:49 -06:00
Steve Harris	ba4a6aa434	Merge branch '4-Thin_Client' into 104-integration ... Former-commit-id: aa597242f9 [formerly aa597242f9 [formerly 9864ba5dd0627dd8c68fae64aa7fad1916e40a0f]] Former-commit-id: a4538f0a48 Former-commit-id: fdd6018d1a	2012-02-27 11:32:49 -06:00
Ben Steffensmeier	0b4134f364	Issue #345 fix swapping of nsharp since nsharp insists on using a disposed target ... Change-Id: I5a814be6590c2704dcd681bad7af34f0f9143ad2 Former-commit-id: 357dc4d88b [formerly 357dc4d88b [formerly acec1c2a23f4e27bfd0844171fdca77ff5473050]] Former-commit-id: 637c051a23 Former-commit-id: 62f1ea0aac	2012-02-24 14:57:23 -06:00
David Gillingham	85c082f1e9	Issue #346: Create a dispose method for Parm and use it like AWIPS1's C++ destructor. ... Change-Id: I2e8a4e82d5efd210e546abbaf8c0aba960803a9d Former-commit-id: d79f7e9613 [formerly d79f7e9613 [formerly b6d7661be725d8a37a8294b0eda982208c35ecbe]] Former-commit-id: 5aa5b51a55 Former-commit-id: f9ed20bada	2012-02-23 14:40:25 -06:00
David Gillingham	8e123e3ae0	Issue #346: Fix disappearing ISC data from VCParms, fix threading issues in Scalar/Vector pickup value dialogs. ... Change-Id: If465b8daf5ef04a76084500425ac3114a48ab908 Former-commit-id: 32b2c06988 [formerly 32b2c06988 [formerly 67aaf1c21e8372b4a84cb82cae62549502992651]] Former-commit-id: 85998bc654 Former-commit-id: 88dcd4d09d	2012-02-23 13:23:59 -06:00
Steve Harris	2c958713b6	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: dcadf7baa4 [formerly dcadf7baa4 [formerly 9d9d92373b8e61c94c6d0f2b46baed3dc5cd7637]] Former-commit-id: 86e586befe Former-commit-id: 938dc5b21c	2012-02-23 12:38:55 -06:00
Steve Harris	7f8343833e	Merge (pull) branch '4-Thin_Client' of ssh://lightning.omaha.us.ray.com:29418/thunder into 4-Thin_Client ... Former-commit-id: 957d232286 [formerly 957d232286 [formerly de97ce5f9b687f7404a34cac0b1fc34df5f854cb]] Former-commit-id: a82f2c5750 Former-commit-id: e6c3afa7a2	2012-02-23 10:19:54 -06:00
Steve Harris	ae9c52b012	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: d0bbbfefcc [formerly d0bbbfefcc [formerly 5528a1374781f3a4d55702ae1f0c34efcf1e3865]] Former-commit-id: 7a10ca9766 Former-commit-id: 3d511fe719	2012-02-23 10:06:18 -06:00
Ben Steffensmeier	8f34946969	Issue #345 allow double dispose of GLTarget ... Change-Id: Ib433557f82bc0bc63fb537814bad47eab00be2be Former-commit-id: 06c9d4cdcf [formerly 06c9d4cdcf [formerly 8b906b245fd927ed79825b00dfba456a1c327fbb]] Former-commit-id: 55aa66a510 Former-commit-id: 5d6b036ed7	2012-02-22 17:40:48 -06:00
Steve Harris	15c56d11bc	Merging SS OB12.2.1 into ss_sync ... Former-commit-id: c8aae98741 [formerly c8aae98741 [formerly 60f30af0c9e3203e2ff623d420165201dff41601]] Former-commit-id: 54be9660f1 Former-commit-id: 4450cf8963	2012-02-22 11:14:43 -06:00
Steve Harris	156ad8471d	Merge branch 14-NCEP into 'ss_sync' ... Former-commit-id: 94c2ea985b [formerly 94c2ea985b [formerly a04c1c31c89566279953d2a270df8d652a3a82ff]] Former-commit-id: 9995d22e25 Former-commit-id: aaead73ec5	2012-02-22 10:12:49 -06:00
Steve Harris	a14d90ed4d	Merge branch '4-Thin_Client' into 104-integration ... Former-commit-id: 84926c80be [formerly 84926c80be [formerly fe86fe3696731660f6b37a147194c670906cdf4f]] Former-commit-id: f3fe839c1c Former-commit-id: 6d1b04e62c	2012-02-21 10:37:36 -06:00
Nate Jensen	f92be47f79	Merge "Issue #345 fix issues with gl contexts and creation and deletion of gl objects!" into 4-Thin_Client ... Former-commit-id: b90611d995 [formerly b90611d995 [formerly ac8ad6fa074f715a4b53a66fc41267a70ccb90f8]] Former-commit-id: ec0cd8d086 Former-commit-id: 13ea11ddfc	2012-02-21 08:57:12 -06:00
Steve Harris	37e57b6588	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: b89ebc5e01 [formerly b89ebc5e01 [formerly 85082f273a85a3967d54d4a489b6ea973d0688be]] Former-commit-id: 496cc6a06b Former-commit-id: 4a93298877	2012-02-20 16:38:06 -06:00
Ben Steffensmeier	f949f622dd	Issue #345 fix issues with gl contexts and creation and deletion of gl objects! ... Change-Id: Ied6c7a814478e21f3cd0eccabfecb00a92e698db Former-commit-id: 69e8cde115 [formerly 69e8cde115 [formerly e0f697c492eecff4bb8d83d05efbcaf2876125c9]] Former-commit-id: 73d24fad2f Former-commit-id: dcbe4fc7da	2012-02-20 15:28:20 -06:00
Steve Harris	acd7845ebd	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: cabf9fd956 [formerly cabf9fd956 [formerly f7ae49d33e6b672f35b55287c9b8ab780bd0f2ce]] Former-commit-id: 5e9d2dd367 Former-commit-id: 33483f3960	2012-02-20 13:03:39 -06:00
Steve Harris	d9c8a99210	Merge branch 'ss_sync' (OB12.1.2-4) into 10-Tech_Blocked ... Former-commit-id: 6a064cb78b [formerly 6a064cb78b [formerly ad74b15c5cab1f5275521f18ee67d30f199a8f95]] Former-commit-id: d02529fef4 Former-commit-id: d133454b27	2012-02-20 12:54:25 -06:00