1140 commits

Author	SHA1	Message	Date
Steve Harris	c1bc408f84	12.5.1-2 baseline ... Former-commit-id: b36c69cc67 [formerly 84d191e7b6 [formerly ff847bf86803a485212f08a098be13bc3d83b0b8]] Former-commit-id: 84d191e7b6 Former-commit-id: ac708c050d	2012-05-03 19:17:13 -05:00
Steve Harris	fe946166ed	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: 7b75b781ad [formerly 2ed7249613 [formerly 05d9729acfe9e0f4af4a6ec030052ab26b0a5eb9]] Former-commit-id: 2ed7249613 Former-commit-id: 4ec294b525	2012-05-01 18:31:09 -05:00
Steve Harris	7fa9dbd5fb	12.4.1-10 baseline ... Former-commit-id: 8485b90ff8 [formerly 9f8cb727a5 [formerly bf53d06834caa780226121334ac1bcf0534c3f16]] Former-commit-id: 9f8cb727a5 Former-commit-id: 4bfbdad17d	2012-05-01 18:06:13 -05:00
Dave Hladky	37da8763eb	Issue #15 Re-wrote SimDate integration for menus, alert observers after ... merge headache. Former-commit-id: 5b7ecea866 [formerly 1b7473572f [formerly 647b7ac154dbdaf945231b231f491bbca86d2a24]] Former-commit-id: 1b7473572f Former-commit-id: 42a12fa7a5	2012-04-30 13:43:34 -05:00
David Gillingham	ddd78ed32f	Merge "Issue #562: Rename QPFRecord getters and setters to match Java-naming conventions, correct bugs in other classes found during test." into 9-Wes2Bridge ... Former-commit-id: 9878793618 [formerly 4aadd41fde [formerly ecf5dd0d62b834c4eba370857441cbda4ce21683]] Former-commit-id: 4aadd41fde Former-commit-id: 0ff2041959	2012-04-27 13:26:37 -05:00
David Gillingham	034cab5000	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: 292374ce21 [formerly c28bfaddee [formerly fe6ec52b4cf64d410f3de609b06cf9666a5936bc]] Former-commit-id: c28bfaddee Former-commit-id: 6497272c1d	2012-04-27 12:43:04 -05:00
Richard Peter	231d98b79e	Issue #538: Fix Serialization Annotations and Serialization Issues ... Change-Id: I436997106438ab283e987cb7e3055fcee009b608 Former-commit-id: b11df888d3 [formerly 349adaeedd [formerly 3aadbc778d9bb22dc9c0b4b93bbbaa70c3fa07d0]] Former-commit-id: 349adaeedd Former-commit-id: c33a392a8c	2012-04-27 12:08:29 -05:00
Max Schenkelberg	a31ad22113	Added network logging for http traffic ... Change-Id: I69f571fba23fc03e0d850180650f61b4581e8a25 Former-commit-id: f74b6b4a93 [formerly a912786429 [formerly 7696dd610b5d6f0fc3620db461de68ba06c61699]] Former-commit-id: a912786429 Former-commit-id: 2cc5794428	2012-04-25 17:28:52 -05:00
David Gillingham	be0570d2fe	Issue #473: Properly archive text plugin records, ... fix bugs in DatabaseArchiver.determineStartTime(). Change-Id: I2a7a71bcf7bdbc5ea786d949631b45342675ce1f Former-commit-id: 04ab5d619b [formerly 526abfd36e [formerly 6e45fc4f0eb15409a20be99c02b2ac43c8ed842e]] Former-commit-id: 526abfd36e Former-commit-id: 8592a9a50d	2012-04-25 17:08:21 -05:00
Steve Harris	931087306f	12.4.1-10 baseline ... Former-commit-id: 01457fbbde [formerly 704b75e1a1 [formerly 5bd6393d7577e5625c6c85b7fe5e7beb9f8c477a]] Former-commit-id: 704b75e1a1 Former-commit-id: 418489e726	2012-04-24 15:38:29 -05:00
Steve Harris	98c92073b5	12.4.1-7 baseline ... Former-commit-id: cca73b3c62 [formerly 90ae4bbb36 [formerly 3524730cc38b5420e7529b5a75d62313695e64d6]] Former-commit-id: 90ae4bbb36 Former-commit-id: 6d585942fe	2012-04-24 15:24:39 -05:00
Max Schenkelberg	a2d730a537	Issue #239 Added persistence capability to Collaboration data events ... Former-commit-id: 32ade1a1f7 [formerly f4193b0e4e [formerly 39e1cc313eae6df99483cc657c39cdd5e3d24533]] Former-commit-id: f4193b0e4e Former-commit-id: 34f80169fe	2012-04-24 13:44:16 -05:00
Nate Jensen	36c4c4e66e	Issue #443 better logging of traffic ... Change-Id: Ia968b79a9d6ee1e5224678ac63684fb9c7aa5b81 Former-commit-id: 39ebbc3913 [formerly a4b0addeee [formerly 4a7faa743900edada4ecf8b42aa3315515617e71]] Former-commit-id: a4b0addeee Former-commit-id: 14f70d1122	2012-04-23 11:23:22 -05:00
David Gillingham	715dce7557	Issue #473: Fix CWA and TCS plugin's decoders to use ingest file name for datatime. ... Change-Id: I54bbf7f1562ff48617721f6d88ef536c0afd7b61 Former-commit-id: 58e7a0f310 [formerly bdbc16d31c [formerly d3681dc1ed59d0f85b7de44277c52907d242aa29]] Former-commit-id: bdbc16d31c Former-commit-id: 30d5e0d2dd	2012-04-19 17:10:08 -05:00
Bryan Kowal	dbcc538fa8	Issue #501 - eliminated (duplicate statements) unreachable code to fix the Wes2Bridge build. ... Former-commit-id: b90b6f101e [formerly b1561d67a0 [formerly 28f2145d82ce3030cebfb0a14aa8457fee992e13]] Former-commit-id: b1561d67a0 Former-commit-id: 72068507a9	2012-04-19 13:09:58 -05:00
Steve Harris	634d40a156	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: 625cd4262c [formerly 4d7572a632 [formerly 5e1b9319941eed516a08a135a2049c14bad77863]] Former-commit-id: 4d7572a632 Former-commit-id: 63f11892e8	2012-04-19 11:11:02 -05:00
Steve Harris	4767b0e069	12.4.1-4 baseline ... Former-commit-id: 2a216f333c [formerly 67a5a68300 [formerly ad648deaf4d3edaabdda15184289b3a927308bd7]] Former-commit-id: 67a5a68300 Former-commit-id: 750b7543dd	2012-04-18 15:18:16 -05:00
Max Schenkelberg	9b8f9de1fa	Issue #239 Added wireframe shape capability ... Former-commit-id: 5be2b4e745 [formerly 12dcb4b044 [formerly f56dd661225103b08b1d51a9f0cb174bd73340eb]] Former-commit-id: 12dcb4b044 Former-commit-id: 7900e78944	2012-04-12 14:46:08 -05:00
Steve Harris	6a1f2160bd	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: fee53dea94 [formerly ed26e06df2 [formerly 3bd9b3a16b0105822983302efa5dd2834aaf5a5f]] Former-commit-id: ed26e06df2 Former-commit-id: c90ce9d54e	2012-04-10 12:50:03 -05:00
Bryan Kowal	476ad5de1f	Issue #18 - rename jetty.port to web.port; the default for web.port is now 8080. The wes2bridge utilities are now built from source. ... Former-commit-id: 839d7c886f [formerly 1afa927c33 [formerly f11953c494fac20b2ad53b41069cfcb24281eb4a]] Former-commit-id: 1afa927c33 Former-commit-id: f49aadd9c8	2012-04-09 09:32:45 -05:00
Bryan Kowal	4d73e617c8	Merge branch '9-Wes2Bridge' of ssh://lightning:29418/thunder into 9-Wes2Bridge ... Former-commit-id: dcc3c7bb59 [formerly f1e81b1a95 [formerly f0c0e0692dae0ee53a43b714be9dfb6df0f4c7a6]] Former-commit-id: f1e81b1a95 Former-commit-id: 21ff4bf657	2012-04-09 09:19:02 -05:00
David Gillingham	3b47db9541	Issue #435: Prevent NullPointerExceptions from being thrown when ... serializing AirepRecords and NcAirepRecords. Issue #435: Address peer review comments on previous change. Change-Id: I7af20fd0d0d12c819c8df8aaba12318dcba574ac Former-commit-id: e0e57577ff [formerly 87142f9f4e [formerly d2e45df86fb0dbbe234c55cdb0cfc9cb31b71c43]] Former-commit-id: 87142f9f4e Former-commit-id: 5193184abf	2012-04-05 15:49:23 -05:00
Bryan Kowal	5f9463bc57	Issue #18 - fix port conflicts that prevented multiple instances of edex request from starting; fix a problem that prevented the selected http port in setup.env from propogating throughout the edex instances. ... Former-commit-id: 2ed20e107d [formerly e792b2a16f [formerly 6b206773eff05abf20ecc87b27e96c47b67ba600]] Former-commit-id: e792b2a16f Former-commit-id: 3e039dc79f	2012-04-04 18:29:13 -05:00
Bradley Gonzales	9d44aabf06	Issue #440 more descriptive login failure message ... Former-commit-id: 74ce6f2140 [formerly 6fc14461ee [formerly 909362d88423e3c5a39c73b5e5da2d2168f5ed91]] Former-commit-id: 6fc14461ee Former-commit-id: 391f8e4d58	2012-04-04 16:26:58 -05:00
Max Schenkelberg	6e94ff6098	Issue #239 Start of remote target capabilities ... Former-commit-id: d2d03e2c64 [formerly 6c411ffb07 [formerly 30b76609cff9a737b8e4190bbfebb5a37a259fad]] Former-commit-id: 6c411ffb07 Former-commit-id: ac1fc79f5b	2012-04-03 15:11:20 -05:00
David Gillingham	ae703513d7	Issue #435: Ensure associated HDF5 data is always captured when ... archiving PDOs, alter binlightning so insert time is based on system time like all other plugins. Change-Id: I450a0a9b44ef2334b6f9f37f4d6a4a3f900ddee2 Issue #435: Add comment to previous change as requested by peer review, fix binlightning insert time. Change-Id: I450a0a9b44ef2334b6f9f37f4d6a4a3f900ddee2 Former-commit-id: e0e8e6d00a [formerly a9398fe4cd [formerly cefe2475f239ccd73b72f74f8571c8eee13267f0]] Former-commit-id: a9398fe4cd Former-commit-id: c9d5823d2c	2012-04-03 14:16:33 -05:00
Max Schenkelberg	0b1caa67df	Merge branch 'ss_sync (12.3.1)' into 11-Collaboration ... Former-commit-id: 753de872e0 [formerly 23d65caf2e [formerly e8402b080c7d2a712f4f385293aa9b5d1a18484e]] Former-commit-id: 23d65caf2e Former-commit-id: c56707c6bc	2012-04-02 16:15:21 -05:00
Steve Harris	b4846ce8a8	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: 5cdda77afb [formerly d3ad6095b7 [formerly 879a2e0a4a31999bf4d624ff59e77bbd68195458]] Former-commit-id: d3ad6095b7 Former-commit-id: a4e4792bb5	2012-03-30 09:50:48 -05:00
Steve Harris	760ead2047	12.3.1-10 baseline ... Former-commit-id: 22bd792cd9 [formerly 4068f5295f [formerly 7d62bca046401a670ef7bd917cbcbb073e061b60]] Former-commit-id: 4068f5295f Former-commit-id: 0e4128712b	2012-03-30 08:38:33 -05:00
Steve Harris	b05701d2d7	Merge branch 'sync_test' (VCModules) into ss_sync ... Former-commit-id: a0abcf8120 [formerly 70357d90bc [formerly e68338cecbe85a62835633e9aba0925344fb80f1]] Former-commit-id: 70357d90bc Former-commit-id: 0665862abe	2012-03-29 10:03:05 -05:00
Steve Harris	770ccb1520	Merge branch '104-integration' into ss_sync; 4-Thin_Client and 10-Tech_Blocked (tear-off menus) -> ss_sync ... Former-commit-id: 54a1d9cdbc [formerly 132d68acc6 [formerly 296cc5a5a6bcc45cd92198a045a88620d7d18653]] Former-commit-id: 132d68acc6 Former-commit-id: 94e6323c0a	2012-03-29 10:01:55 -05:00
Nate Jensen	e9b2e70892	Issue #427 Share maps and editor ... Change-Id: I6bd3148ec199c348ffd85d08322fdb8befa4096c Former-commit-id: 0e214bcd7c [formerly 615962f5dd [formerly 7a58d8a17be53fc504cafe32d19de2f52121eeff]] Former-commit-id: 615962f5dd Former-commit-id: 37d4401747	2012-03-22 09:39:59 -05:00
David Gillingham	a1ac93704b	Issue #20: Don't throw an exception if overriding a lower-localization ... level's configuration (like overriding BASE's default plugin configuration). Former-commit-id: ed74b90589 [formerly 13af9170b1 [formerly b585768a8c7e3f42742efe5128ec6cb05c6424bf]] Former-commit-id: 13af9170b1 Former-commit-id: e33083c11a	2012-03-14 15:07:59 -05:00
Max Schenkelberg	5a61f3ae23	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: 50765e8a34 [formerly 6e5964df9d [formerly 7e4abe637edacca71e1e1c98d99521cd33415fb0]] Former-commit-id: 6e5964df9d Former-commit-id: 8fb7eccb73	2012-03-14 09:49:32 -05:00
David Gillingham	edde99f0b8	Issue #417: Refactor HPEDhrSrv to work from a 2-stage queueing process. ... Former-commit-id: d433b7d4d6 [formerly e13850a2b6 [formerly 727e2b19688397ea4608a2b6ca3fda3222b6ad36]] Former-commit-id: e13850a2b6 Former-commit-id: 7e5ec12276	2012-03-13 12:31:38 -05:00
Steve Harris	229fa2944d	Issue #16 - Recovering mpduff 9-Wes2Bridge code that fell out of a rebase while fixing a review set ... Former-commit-id: 10dc140747 [formerly 5bbf80a384 [formerly a8ca6db2b2df5f7bd8a6a2fec3496dc1f37aa20c]] Former-commit-id: 5bbf80a384 Former-commit-id: 6d2af585b1	2012-03-12 13:10:34 -05:00
Bryan Kowal	08451e8a63	Issue #419 - a -Dgit={true|false} switch will be used to determine if deploy-install will deploy from a single directory source tree or a multiple directory source tree. Removed tmp files that should not be baselined. ... Former-commit-id: 66e05f4c96 [formerly 58bfa62981 [formerly eaa45d7123c43590be3d58fdf845708ade2dbb51]] Former-commit-id: 58bfa62981 Former-commit-id: eab9c845bb	2012-03-12 11:43:34 -05:00
David Gillingham	d3d2046df0	Issue #361: Fine tune synchronization in GfeScriptExecutor to prevent ... massive backups in access to GfeScript instance map. Issue #361: Further modifications to GfeScriptExecutor and GfeScript to improve synchronization-caused back-logs. Change-Id: Ic33ef5e62d2bd1e19dd2cfedcfefe050cf7efe9e Former-commit-id: 3cfa029f4b [formerly 9a75c87829 [formerly 679996850315f699d47633da5baf593c72ba7927]] Former-commit-id: 9a75c87829 Former-commit-id: efc9e9000b	2012-03-06 16:24:58 -06:00
David Gillingham	b8acb1912c	Issue #361: Refactor IscDataRecRequest handler to execute iscDataRec ... asynchronously. Former-commit-id: 1d69867594 [formerly ff231f33f4 [formerly 26161f9fd457f02b4df8780750064aeb27fc7ba1]] Former-commit-id: ff231f33f4 Former-commit-id: 8d2ea4cfba	2012-03-05 16:49:23 -06:00
Bryan Kowal	3bd189df23	Issue #20 - additional new svn changes that have not been merged yet: ... http://lightning.omaha.us.ray.com/redmine/projects/interim-svn-repository/repository/diff/trunk/edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/persist/DefaultPathProvider.java?rev=48&rev_to=1 Former-commit-id: 00759729a4 [formerly bea56356fd [formerly 47f1f6baaafd98cca0da5812a0870156766e83c7]] Former-commit-id: bea56356fd Former-commit-id: ed81095573	2012-03-05 14:36:56 -06:00
Max Schenkelberg	8438bc54db	Issue #358 merged esb.camel project for plot update compatibility ... Former-commit-id: 76e7a02f76 [formerly 0cf00cb7f4 [formerly ba90282320443c6c41c3188db9f43ffb11399bdd]] Former-commit-id: 0cf00cb7f4 Former-commit-id: 225dfd15be	2012-03-02 13:26:44 -06:00
Max Schenkelberg	7337ff7ed6	Issue #358 merged dataURI changes from thinclient in for plot ... compatibility Former-commit-id: 1f714b1a5b [formerly f96ff96259 [formerly 14d0dc1cd0e5eb0b48de89f5c73f30152d4789de]] Former-commit-id: f96ff96259 Former-commit-id: 4d91a4fd74	2012-03-02 12:24:19 -06:00
Max Schenkelberg	fe1811c167	Issue #358 Committing NPP core rendering improvements merged with Thin ... Client core improvements Former-commit-id: 48b6d45f00 [formerly ae47d9683e [formerly 206bd0450140b6bcdb3ec8f1e1e417c4c37746d6]] Former-commit-id: ae47d9683e Former-commit-id: e2cd95d3f4	2012-03-01 16:59:40 -06:00
Steve Harris	994e79cfb3	Merge branch 'ss_sync' into sync_test ... Former-commit-id: 787aed90f8 [formerly 951ecfe3dd [formerly 7ebcf63686d75d58f8bfea92e825edaf49a30df1]] Former-commit-id: 951ecfe3dd Former-commit-id: 3b9c3e3474	2012-03-01 14:01:16 -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
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
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
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	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	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