Commit graph

153 commits

Author SHA1 Message Date
Steve Harris
bc695ee025 12.5.1-6 baseline
Former-commit-id: ba6d779949 [formerly df80148db6] [formerly ffae06aa7059ba46bdf5d6194d790ed5d3513713 [formerly 24474489f9]] [formerly fa87dc6cf1 [formerly 24474489f9 [formerly a75af2f0de38d65dcbbd919e159c3b0a268fc245]]]
Former-commit-id: fa87dc6cf1
Former-commit-id: 0fa00c0acf0db00500f5839edb5595f4cd6535d5 [formerly c452cce633]
Former-commit-id: 4792884ab2
2012-05-16 16:41:22 -05:00
Brad Gonzales
cb2a542494 Issue #628 Backing out PGEN changes with remote target checking
Former-commit-id: e1a73f505b [formerly 6e170a377f] [formerly 4e629cc7e4] [formerly 0db325a1cd [formerly 4e629cc7e4 [formerly b5babbb4b852c83680b93b35311d14297f41532e]]]
Former-commit-id: 0db325a1cd
Former-commit-id: a027f3c4e688bd56785e0ced9e520fa88ff146a3 [formerly aeaf7d922b]
Former-commit-id: 00935dded7
2012-05-16 14:43:53 -05:00
Brad Gonzales
61532c6c9c Issue #628 changed NCEP PGEN PgenStaticDataProder.java to cause the staticdataprovider Activator to be loaded. in PgenResource.drawGhost() check for dispatch target before drawing.
Former-commit-id: bbce83bc0a [formerly d44a07d33f] [formerly b732df5f1c] [formerly 11b93412bf [formerly b732df5f1c [formerly b4229b04a76044a10848460f01b2b500add537e1]]]
Former-commit-id: 11b93412bf
Former-commit-id: 135afd4586c7fb36493d90439869f42a66768f0c [formerly 64774ccf32]
Former-commit-id: aa731cc329
2012-05-16 13:09:52 -05:00
Brad Gonzales
c1bd5e5d97 Issue #628 Nate's additional ncep pgen changes including PGEN's SymbolSetElement.java
Former-commit-id: 9f2101cafc [formerly 85f331b8b0] [formerly 50eba2317a] [formerly d7babbaebd [formerly 50eba2317a [formerly 23e99f88390a6865e0ba5d449402b4ef2febbd34]]]
Former-commit-id: d7babbaebd
Former-commit-id: 95a37eca94575c31ba0219be4bb6f90e46ba0c96 [formerly 4b30085d9d]
Former-commit-id: e8a5c38fa7
2012-05-16 10:12:27 -05:00
Brad Gonzales
d062622541 Issue #628 Nate's ncep pgen feature.xml.
Former-commit-id: 3a00952cda [formerly dd0192fef2] [formerly 1a763575ed] [formerly 877b13b79b [formerly 1a763575ed [formerly 5151a8934bd6f9558c91b5493273ca02c93b2064]]]
Former-commit-id: 877b13b79b
Former-commit-id: 0fa186627cb7e5eb0869ff488f2b0b375352ec5e [formerly c909b32d0b]
Former-commit-id: d0953dd11a
2012-05-11 10:12:47 -05:00
Brad Gonzales
634def5162 Issue #628 committing more PGEN code received from Plummer on 4-19-2012.
Former-commit-id: dcfb950cfb [formerly 22a29b98b2] [formerly a90d64e1fc] [formerly 0df0aa8663 [formerly a90d64e1fc [formerly bd658184b246452b5d3e2154d79f2179bdc12594]]]
Former-commit-id: 0df0aa8663
Former-commit-id: a5aab1ab3583a86ff017397d59291cb56b659f40 [formerly e1f03d9369]
Former-commit-id: af92e8d329
2012-05-10 17:02:18 -05:00
Brad Gonzales
6df38c98de Issue #628 committing PGEN code received from Plummer on 4-19-2012.
Former-commit-id: 1d576ac27d [formerly fda897d2d0] [formerly 253e8bc948] [formerly 295cbf95e5 [formerly 253e8bc948 [formerly 0816cd253c86acc699cb90866131619c4679f631]]]
Former-commit-id: 295cbf95e5
Former-commit-id: 85f06f12e49d774ff6df946ee3b7ae0ffed95a4c [formerly ae3d17c698]
Former-commit-id: 2a3bf4ec32
2012-05-10 16:50:45 -05:00
Steve Harris
fe7ac96625 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: fc70139990 [formerly d7f7c26582] [formerly 092efd6072] [formerly 31b3e87ffa [formerly 092efd6072 [formerly f98354aae305ad227eaf3b36e4393b8aefc80f02]]]
Former-commit-id: 31b3e87ffa
Former-commit-id: 606a1f5f70c4344a8a6b5b7da1c351cf7707cda2 [formerly 98447412f8]
Former-commit-id: 53d2822329
2012-05-09 13:19:47 -05:00
Steve Harris
43f936900c Merge branch 'ss_sync' (OB12.4.1-10) into 11-Collaboration
Conflicts:
	cave/com.raytheon.uf.viz.ui.menus/src/com/raytheon/uf/viz/ui/menus/xml/IncludeMenuItem.java

Former-commit-id: bcc12e03ed [formerly 572e1bb476] [formerly 27bc369818] [formerly 58037cb5d1 [formerly 27bc369818 [formerly 8f71c807be1d604cea51ab522f04f8bbf8c11f83]]]
Former-commit-id: 58037cb5d1
Former-commit-id: ec875d4e25b0d41a71abbea662364ddefd6fe144 [formerly 63ea8599d7]
Former-commit-id: 9c9e01dbda
2012-05-09 13:14:00 -05:00
Steve Harris
8025cc609e 12.5.1-2 baseline
Former-commit-id: c1bc408f84 [formerly ac708c050d] [formerly 84d191e7b6] [formerly b36c69cc67 [formerly 84d191e7b6 [formerly ff847bf86803a485212f08a098be13bc3d83b0b8]]]
Former-commit-id: b36c69cc67
Former-commit-id: 22cf2530d98a6c3d2d24e8ef75454ae00fe19292 [formerly a821111fbf]
Former-commit-id: f6300cd995
2012-05-03 19:17:13 -05:00
Steve Harris
3992b18e28 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: fe946166ed [formerly 4ec294b525] [formerly 2ed7249613] [formerly 7b75b781ad [formerly 2ed7249613 [formerly 05d9729acfe9e0f4af4a6ec030052ab26b0a5eb9]]]
Former-commit-id: 7b75b781ad
Former-commit-id: 228c26d32b0b13d4cccf51b188ca617ec417aba4 [formerly 6dd3ee8809]
Former-commit-id: 7c7fc97131
2012-05-01 18:31:09 -05:00
Steve Harris
40aa780b3d 12.4.1-10 baseline
Former-commit-id: 7fa9dbd5fb [formerly 4bfbdad17d] [formerly 9f8cb727a5] [formerly 8485b90ff8 [formerly 9f8cb727a5 [formerly bf53d06834caa780226121334ac1bcf0534c3f16]]]
Former-commit-id: 8485b90ff8
Former-commit-id: 73930fb29d0c1e91204e76e6ebfdbe757414f319 [formerly a28d70b5c5]
Former-commit-id: 33a67cdd82
2012-05-01 18:06:13 -05:00
Dave Hladky
9ae2445f9f Issue #15 Re-wrote SimDate integration for menus, alert observers after
merge headache.

Former-commit-id: 37da8763eb [formerly 42a12fa7a5] [formerly 1b7473572f] [formerly 5b7ecea866 [formerly 1b7473572f [formerly 647b7ac154dbdaf945231b231f491bbca86d2a24]]]
Former-commit-id: 5b7ecea866
Former-commit-id: d98bc5d5887a016d68a6737704a6fb5e552d838c [formerly 61e31c62ff]
Former-commit-id: a1a3a361dd
2012-04-30 13:43:34 -05:00
Richard Peter
51e9a72371 Issue #538: Fix Serialization Annotations and Serialization Issues
Change-Id: I436997106438ab283e987cb7e3055fcee009b608

Former-commit-id: 231d98b79e [formerly c33a392a8c] [formerly 349adaeedd] [formerly b11df888d3 [formerly 349adaeedd [formerly 3aadbc778d9bb22dc9c0b4b93bbbaa70c3fa07d0]]]
Former-commit-id: b11df888d3
Former-commit-id: 8e9c6244c73799f26e260982a3f71ee5ca3d5c9a [formerly e3323febc5]
Former-commit-id: ae35c2f27c
2012-04-27 12:08:29 -05:00
Steve Harris
caab7c1fbb 12.4.1-10 baseline
Former-commit-id: 931087306f [formerly 418489e726] [formerly 704b75e1a1] [formerly 01457fbbde [formerly 704b75e1a1 [formerly 5bd6393d7577e5625c6c85b7fe5e7beb9f8c477a]]]
Former-commit-id: 01457fbbde
Former-commit-id: bd1ff6d9b99902d235b63b9c84d31f1a058625ee [formerly aabc3842ac]
Former-commit-id: 97caaa0327
2012-04-24 15:38:29 -05:00
Steve Harris
55b2a4df32 12.4.1-7 baseline
Former-commit-id: 98c92073b5 [formerly 6d585942fe] [formerly 90ae4bbb36] [formerly cca73b3c62 [formerly 90ae4bbb36 [formerly 3524730cc38b5420e7529b5a75d62313695e64d6]]]
Former-commit-id: cca73b3c62
Former-commit-id: e1236b435e1110728cc2c913cb89b44372ea9903 [formerly d9f966008c]
Former-commit-id: 4c88c0ae6c
2012-04-24 15:24:39 -05:00
Steve Harris
6aa0898aae 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: 634d40a156 [formerly 63f11892e8] [formerly 4d7572a632] [formerly 625cd4262c [formerly 4d7572a632 [formerly 5e1b9319941eed516a08a135a2049c14bad77863]]]
Former-commit-id: 625cd4262c
Former-commit-id: f6efcfd8ee5a2a4ca8ad3ed217945853b75bfa5f [formerly def458753d]
Former-commit-id: e86dc647be
2012-04-19 11:11:02 -05:00
Steve Harris
98d8b3f188 12.4.1-4 baseline
Former-commit-id: 4767b0e069 [formerly 750b7543dd] [formerly 67a5a68300] [formerly 2a216f333c [formerly 67a5a68300 [formerly ad648deaf4d3edaabdda15184289b3a927308bd7]]]
Former-commit-id: 2a216f333c
Former-commit-id: e8514db31c64b82122112f0e87cbbf3cda2d8c2b [formerly a4e519f3cd]
Former-commit-id: a2a6a18fae
2012-04-18 15:18:16 -05:00
Max Schenkelberg
652dc33e7f Issue #239 Refactored Collaboration rendering so it looks up renderes by
extension point so radar renderer can be injected by a radar
collaboration project

Former-commit-id: a9864fa590 [formerly 490c75f684] [formerly 9b018ea151] [formerly 7d2a7d987d [formerly 9b018ea151 [formerly 79f4d46bf18fc03c79df0c80c8dde025fe954f0c]]]
Former-commit-id: 7d2a7d987d
Former-commit-id: ea904c0632a530246f3994e307cb058b799313b4 [formerly fa3d39c5e2]
Former-commit-id: fcb459e91d
2012-04-16 17:29:59 -05:00
Steve Harris
a4eb467a34 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: 6a1f2160bd [formerly c90ce9d54e] [formerly ed26e06df2] [formerly fee53dea94 [formerly ed26e06df2 [formerly 3bd9b3a16b0105822983302efa5dd2834aaf5a5f]]]
Former-commit-id: fee53dea94
Former-commit-id: 530c02831155693cd7d1ae3b27691f3302b2bbe3 [formerly dcdd7f0648]
Former-commit-id: 51bb9ebb46
2012-04-10 12:50:03 -05:00
Bryan Kowal
0591ab00cc Merge branch '9-Wes2Bridge' of ssh://lightning:29418/thunder into 9-Wes2Bridge
Former-commit-id: 4d73e617c8 [formerly 21ff4bf657] [formerly f1e81b1a95] [formerly dcc3c7bb59 [formerly f1e81b1a95 [formerly f0c0e0692dae0ee53a43b714be9dfb6df0f4c7a6]]]
Former-commit-id: dcc3c7bb59
Former-commit-id: d309520ea9fa039612c8a81873e58c06eedee69b [formerly 240c3a1806]
Former-commit-id: 774d05de1b
2012-04-09 09:19:02 -05:00
David Gillingham
c39ee5a3c0 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: 3b47db9541 [formerly 5193184abf] [formerly 87142f9f4e] [formerly e0e57577ff [formerly 87142f9f4e [formerly d2e45df86fb0dbbe234c55cdb0cfc9cb31b71c43]]]
Former-commit-id: e0e57577ff
Former-commit-id: f9200a739ae6f82c440eea10738de05476856c19 [formerly 84f0765dba]
Former-commit-id: bef6e3d504
2012-04-05 15:49:23 -05:00
Bryan Kowal
f24e7a4d31 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: 5f9463bc57 [formerly 3e039dc79f] [formerly e792b2a16f] [formerly 2ed20e107d [formerly e792b2a16f [formerly 6b206773eff05abf20ecc87b27e96c47b67ba600]]]
Former-commit-id: 2ed20e107d
Former-commit-id: f64428b1eaf89e8c4b8fc84f44d88dfab230717f [formerly 5f4d6f600a]
Former-commit-id: edb7431d0a
2012-04-04 18:29:13 -05:00
Steve Harris
c6071e24c5 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: b4846ce8a8 [formerly a4e4792bb5] [formerly d3ad6095b7] [formerly 5cdda77afb [formerly d3ad6095b7 [formerly 879a2e0a4a31999bf4d624ff59e77bbd68195458]]]
Former-commit-id: 5cdda77afb
Former-commit-id: a5d7cad4cf9dcde7d77f5ce8ca8a3ccca2fdde58 [formerly 6aa18f74f6]
Former-commit-id: 9845ef53f9
2012-03-30 09:50:48 -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
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
Nate Jensen
88d65bde01 Integrating Richard's changes with 12.2.1
Change-Id: I774e69f166dbc48c7cb31d066cb8bf5dd626520c

Former-commit-id: 43538daf06 [formerly a22448c3d5] [formerly 2515d56c9f] [formerly c5ba181cd8 [formerly 2515d56c9f [formerly 50680111c00b8d2bec9f2479a0cc22380ef6ecfe]]]
Former-commit-id: c5ba181cd8
Former-commit-id: 347bc2c5bd372e1a2607ac2c2f9145fdcbaf53d5 [formerly 699e417731]
Former-commit-id: 414785ee0e
2012-02-28 09:42:47 -06:00
Nate Jensen
87691e4627 Integrating Richard's changes with 12.2.1
Change-Id: I1831502d72bed7b804287bb7c3e4ea501514ada4

Former-commit-id: 8106ba956f [formerly 94ae63b740] [formerly d18a15535a] [formerly afe3c5db9c [formerly d18a15535a [formerly 729a478cf151a4d61bb31adba4193c3fc33717a1]]]
Former-commit-id: afe3c5db9c
Former-commit-id: 046f91bda3cc120bf473a4bc36c00fa19e038a47 [formerly 74b6e7b389]
Former-commit-id: a65f8d8242
2012-02-28 09:37:45 -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
Nate Jensen
2db5dbe305 Merge "Issue #185 handle CommunicationExceptions from the LevelFactory in remerged ncep grib decoder." into 4-Thin_Client
Former-commit-id: b07575c5b3 [formerly a914aa38c8] [formerly e3e44707a4] [formerly fef3fcb60c [formerly e3e44707a4 [formerly fd448c2a996aef215802dc501b68d28747f66414]]]
Former-commit-id: fef3fcb60c
Former-commit-id: 834f82bd59e01c6c99532d9991840fdacffe244d [formerly d03ff9824e]
Former-commit-id: e0e2a82d83
2012-02-23 11:50:39 -06:00
Ben Steffensmeier
d1b9b4bc84 Issue #176 update merged ncep plot classes to use new plot interface.
Change-Id: I345a970aa0d292fcd05ba4c19e77536e03057f72

Former-commit-id: 41ca3213a4 [formerly 0b0047e29d] [formerly 703d59a968] [formerly 03d9230879 [formerly 703d59a968 [formerly 2e22a794183e4be8758997b9e76f896917a761db]]]
Former-commit-id: 03d9230879
Former-commit-id: 892ee6361f74622da1f7045e0847bcce6026e627 [formerly 6db9a03560]
Former-commit-id: f048713c31
2012-02-23 11:23:01 -06:00
Ben Steffensmeier
3f86d825d5 Issue #185 handle CommunicationExceptions from the LevelFactory in remerged ncep grib decoder.
Change-Id: I343e4e61d5f96938e84709392c32f6d94b244b17

Former-commit-id: 127dde9454 [formerly a2db6975c9] [formerly 4dedc8b30d] [formerly 73a08e9d4e [formerly 4dedc8b30d [formerly 951c8c2a77c8f58a04a576148ac583ccdcc21e02]]]
Former-commit-id: 73a08e9d4e
Former-commit-id: 57785c3dff7f653eb1377659f11622f20ae35a74 [formerly d5d8697d9f]
Former-commit-id: d937284ab2
2012-02-23 10:49:56 -06:00
Steve Harris
391451e14b Revert PlotResource2.java to ss_sync version for merge into 4-Thin_Client
Former-commit-id: 909a19606c [formerly a5f8708b6a] [formerly db065fcd50] [formerly e94b322dc3 [formerly db065fcd50 [formerly 8a1ef8c6f0e3cdd8b4eb581218d499bc8fc19aeb]]]
Former-commit-id: e94b322dc3
Former-commit-id: e5d89cf4f3149ec572a32c84f492bd3f9f2178c4 [formerly 78ea2de6d3]
Former-commit-id: 97184f1dc4
2012-02-23 10:16:02 -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
Bryan Kowal
134afd329c Issue #34 - recompiled the nsharp dll with the latest ncep code.
Former-commit-id: 573356d574 [formerly 2ce7c520b3] [formerly c8dba08a9d] [formerly 4888756560 [formerly c8dba08a9d [formerly d3affc909e299af8826d16bc02754fc61754e287]]]
Former-commit-id: 4888756560
Former-commit-id: 5a1a83e71fb5f2c49f093b157a87cfb844467487 [formerly 71fe94b322]
Former-commit-id: e4da2bcb9c
2012-02-16 12:51:24 -06:00
Ben Steffensmeier
34c03d78d0 Issue #235 Added ability to capture multiple frames to NSharp
Change-Id: Ib6ab3acff6d9357679f4116493c1d3a97b57c2cc

Former-commit-id: 8a5a87c2b1 [formerly 08e8343d98] [formerly 5cdcd5a261] [formerly 6bfd8ccfee [formerly 5cdcd5a261 [formerly 447253e7cd0ea5ab64c020a4fe0822ffc3a01d3f]]]
Former-commit-id: 6bfd8ccfee
Former-commit-id: b17c805c928548abe79f8ce56d670d4b8f032bbf [formerly 512e0f1bd5]
Former-commit-id: 9d442083a1
2012-02-09 10:54:02 -06:00
Ben Steffensmeier
c704c716f6 Issue #237 revert Silver Spring changes to nsharp activator which break windows. Fix grib decoder to handle grib files with lo1 on the dateline.
Change-Id: I4991e7f02c8cdcfd608c3c6d987f4d0ea8593f40

Former-commit-id: 2960e33fbd [formerly 1e0bd549a4] [formerly 324b358c44] [formerly 851046ccf3 [formerly 324b358c44 [formerly 2b0f9f149c4dc2031cb9178538899eb3f9f5de23]]]
Former-commit-id: 851046ccf3
Former-commit-id: 232439ebed901aaa529649061733fcb56372d5a1 [formerly 56c1b70d03]
Former-commit-id: 6da56f59fc
2012-02-06 16:55:48 -06:00
Ben Steffensmeier
460820bac9 Issue #230 fix scaling problems with printing to high dpi printers
Change-Id: I64e609d3b01a839d3b8927eedfd85f81ffc0301f

Former-commit-id: 15afb5b8bd [formerly 89b327974a] [formerly d35d365b7f] [formerly f78fa301a8 [formerly d35d365b7f [formerly 22418489fd697c94b2350d79e7701c8399842e2e]]]
Former-commit-id: f78fa301a8
Former-commit-id: 968bdeb040264a08ad8cd18803cb98f7c769e7e9 [formerly 55689025ff]
Former-commit-id: 25adbef6ab
2012-02-03 12:49:59 -06:00
Ben Steffensmeier
174dd81c57 Issue #176 Change plots to no longer require id in updates. Change thin client updates to request pdo's instead of redoTimeMatching, which grabs any updates, not just new resource times.
Change-Id: I23763bae287d5c49d3973707228e78144cc83ab1

Former-commit-id: 539ebd56d3 [formerly 6194dc8210] [formerly 9cc983549d] [formerly 9254b762ff [formerly 9cc983549d [formerly 94d4feb2973ed201d369a21126b3443606041179]]]
Former-commit-id: 9254b762ff
Former-commit-id: 2274967c42d2f8b4145457a05f022995e7ac081d [formerly 484a0f64f8]
Former-commit-id: 75f49627c8
2012-01-30 17:04:47 -06:00
Ben Steffensmeier
13f6e4f868 Issue #185 change LevelFactory to throw exceptions when there is no network connection so that everything can be reinitialized when the connection is restored..
Change-Id: Id5c82e7d01e7f229bc99366b1339bc38333ffa5a

Former-commit-id: 700cb47baa [formerly 3c673896a0] [formerly b3463d27fc] [formerly 0d75fbf942 [formerly b3463d27fc [formerly 1b2496a6db33fc65efecfdffb380d8b4e07ec590]]]
Former-commit-id: 0d75fbf942
Former-commit-id: 3e19b92cbce5cee988b6ee87c18925f5342d0749 [formerly c22f135dbc]
Former-commit-id: 8b1cdd8db1
2012-01-30 16:39:57 -06:00
David Gillingham
f2b58b2f16 Issue #20: Merge all changes from previous SVN repo to GIT.
Former-commit-id: 91ecb60c1f [formerly b31f40ec9d] [formerly 845e6c19af] [formerly b056e18757 [formerly 845e6c19af [formerly 926a2a6a5af5b3514c29097deb0fc24b093643a2]]]
Former-commit-id: b056e18757
Former-commit-id: 589441ef8a8b0e931380208ea6dea9adff2ba461 [formerly 87b15de88b]
Former-commit-id: ea7a55ad8d
2012-01-26 17:38:43 -06:00
Nate Jensen
b0c285c305 Issue #181 fix ncep
Change-Id: If0e2947c33523ada50036212666867a7c5138c17

Former-commit-id: 6418e0edda [formerly f3875948e8] [formerly ca923b9475] [formerly 15e0a5e68d [formerly ca923b9475 [formerly 8d7433be62e5b815d012b330c31fe069db16b5b4]]]
Former-commit-id: 15e0a5e68d
Former-commit-id: e0dbbff654bb803f9a78bd56c5fbd86943f2b93e [formerly 29be9b82bd]
Former-commit-id: 637a516ae5
2012-01-26 17:28:06 -06:00
Nate Jensen
b5b699baec Issue #181 fix empty src dirs
Change-Id: If03015cf64f5791b4f5b340cc6aba4514a6a6d43

Former-commit-id: dfa1c4bbfe [formerly 3c2701dd43] [formerly 6fabe216d8] [formerly 638f900d41 [formerly 6fabe216d8 [formerly 25ad3a67efb293afc2bf3ef9442ff2fc296bef18]]]
Former-commit-id: 638f900d41
Former-commit-id: 1d33d2975072dd99272e54765d2bc2a604cf19c5 [formerly 18540298b4]
Former-commit-id: 710bcd1d8d
2012-01-26 15:42:55 -06:00
Roger Ferrel
901d493ecf Issue #181
Added files to index.


Former-commit-id: 7324dcd368 [formerly e3d3629375] [formerly cf1383a412] [formerly beae8e7e59 [formerly cf1383a412 [formerly 874ae116e412c39b73dc3cc74ee3f3a3b02d82f7]]]
Former-commit-id: beae8e7e59
Former-commit-id: c8669b5ab7910607c5f11760fd75aaf1865a062e [formerly e1fc0b48c1]
Former-commit-id: 49dfa99cc5
2012-01-26 15:05:25 -06:00
Roger Ferrel
84fc2cf17c Issue #181
new files not indexed


Former-commit-id: 5fe3d78cb2 [formerly 732004d9cd] [formerly 472e788dba] [formerly 69f8daedff [formerly 472e788dba [formerly 6e2032f9290e77e8e597ae4256ffe7ad8142407b]]]
Former-commit-id: 69f8daedff
Former-commit-id: ef41863ce82e3fa3eeb978a1d320f1286ca06bae [formerly c6f2b90560]
Former-commit-id: 2be2e8478f
2012-01-26 14:37:19 -06:00
Roger Ferrel
38f1182c6e Issue #181
Changes from January ncep_cave

Former-commit-id: aa10b2f656 [formerly ae0981ac0f] [formerly 7427aeaf29] [formerly fa42f2dc60 [formerly 7427aeaf29 [formerly 6a878c3c5f400c53d39d7920c0619362aaafb946]]]
Former-commit-id: fa42f2dc60
Former-commit-id: f688e047f0ccf0adc31f824c5e1224b8d1c1598b [formerly 376f6868b6]
Former-commit-id: 9475b22c54
2012-01-26 09:26:07 -06:00
Nate Jensen
1240be3682 Issue #181 fix ncep mistake
Change-Id: Ic86240830412ab530dae6a8d0003149c8eb034f8

Former-commit-id: 705d66f303 [formerly 24f90ed13d] [formerly 8299f30726] [formerly 94aab854ae [formerly 8299f30726 [formerly f4e8cf7df44f7935dbce427b8f977d609572fa25]]]
Former-commit-id: 94aab854ae
Former-commit-id: fcffc9963ff5dc9f15d9fa745bc9304aeff79693 [formerly f12bd97443]
Former-commit-id: 6b4ab6c0e6
2012-01-24 15:01:13 -06:00
Nate Jensen
f8f70f6a4c Issue #181 fixing edex feature and component deploys
Change-Id: Id7bad29c6914b13b3a6f47452f772999b696f48d

Former-commit-id: a8c1e39554 [formerly fae8fd5a6d] [formerly 8e3730adbf] [formerly 1dabb12dce [formerly 8e3730adbf [formerly 0c82def5c753aab240848aac8dc906a161461ac3]]]
Former-commit-id: 1dabb12dce
Former-commit-id: 293fd5a235bdb1e4c85b58d55c98c802941e8fe6 [formerly 9c4ad58867]
Former-commit-id: 802607c79f
2012-01-24 12:15:01 -06:00
Nate Jensen
bf2e1850f3 Issue #181 integrating ncep edex code
Change-Id: Iaf11559e4cdb4f846d02283c5d2038474c0118e3

Former-commit-id: daa0663af0 [formerly 6366bc35cb] [formerly fe52a35f7a] [formerly 33756de9c8 [formerly fe52a35f7a [formerly 3aa13bd49e23ef963127f7efbc91054c06808f1c]]]
Former-commit-id: 33756de9c8
Former-commit-id: 2cdd1911db9699c1da43ed376abd9ca94f036c25 [formerly 3b7a082f41]
Former-commit-id: 7301ad5c66
2012-01-24 09:59:50 -06:00
Nate Jensen
c1ca48ab19 Issue #181 integrating ncep edex code
Change-Id: I7f3fd64d1e21d5a82b29b404bb90a62bfa6f79bf

Former-commit-id: adb8188f98 [formerly 873469f771] [formerly f96e6a822b] [formerly a015cc136b [formerly f96e6a822b [formerly 71d87e07ef1d5ce2509fddce9170870a5950ba7b]]]
Former-commit-id: a015cc136b
Former-commit-id: bf42c95476b1354c34e606131e248046867b8dff [formerly e951995736]
Former-commit-id: ba529c4a12
2012-01-24 09:49:27 -06:00