xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
2147 commits 31 branches 40 tags 3.8 GiB
Commit graph

154 commits

Author SHA1 Message Date
Steve Harris
ee7b53c7c4 12.5.1-9 baseline 
Former-commit-id: b8de76b45e [formerly 8f3c9ebfb7] [formerly b8de76b45e [formerly 8f3c9ebfb7] [formerly 1f542697cb [formerly 25a4d3ed99c4be73a118b92c230c6365b65b56eb]]]
Former-commit-id: 1f542697cb
Former-commit-id: d23b0e4d60 [formerly ce0422a34a]
Former-commit-id: 399c00d295
 2012-05-21 17:48:55 -05:00
Steve Harris
26ed02c3dc 12.5.1-6 baseline 
Former-commit-id: df80148db6 [formerly 24474489f9] [formerly df80148db6 [formerly 24474489f9] [formerly fa87dc6cf1 [formerly a75af2f0de38d65dcbbd919e159c3b0a268fc245]]]
Former-commit-id: fa87dc6cf1
Former-commit-id: 4792884ab2 [formerly c452cce633]
Former-commit-id: 2738af2019
 2012-05-16 16:41:22 -05:00
Brad Gonzales
b47ae13f47 Issue #628 Backing out PGEN changes with remote target checking 
Former-commit-id: 6e170a377f [formerly 4e629cc7e4] [formerly 6e170a377f [formerly 4e629cc7e4] [formerly 0db325a1cd [formerly b5babbb4b852c83680b93b35311d14297f41532e]]]
Former-commit-id: 0db325a1cd
Former-commit-id: 00935dded7 [formerly aeaf7d922b]
Former-commit-id: 6a7397b0f6
 2012-05-16 14:43:53 -05:00
Brad Gonzales
7af3b1e16c 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: d44a07d33f [formerly b732df5f1c] [formerly d44a07d33f [formerly b732df5f1c] [formerly 11b93412bf [formerly b4229b04a76044a10848460f01b2b500add537e1]]]
Former-commit-id: 11b93412bf
Former-commit-id: aa731cc329 [formerly 64774ccf32]
Former-commit-id: bb04dccd7b
 2012-05-16 13:09:52 -05:00
Brad Gonzales
34d055ea22 Issue #628 Nate's additional ncep pgen changes including PGEN's SymbolSetElement.java 
Former-commit-id: 85f331b8b0 [formerly 50eba2317a] [formerly 85f331b8b0 [formerly 50eba2317a] [formerly d7babbaebd [formerly 23e99f88390a6865e0ba5d449402b4ef2febbd34]]]
Former-commit-id: d7babbaebd
Former-commit-id: e8a5c38fa7 [formerly 4b30085d9d]
Former-commit-id: 6c9898e98a
 2012-05-16 10:12:27 -05:00
Brad Gonzales
8d46ba706c Issue #628 Nate's ncep pgen feature.xml. 
Former-commit-id: dd0192fef2 [formerly 1a763575ed] [formerly dd0192fef2 [formerly 1a763575ed] [formerly 877b13b79b [formerly 5151a8934bd6f9558c91b5493273ca02c93b2064]]]
Former-commit-id: 877b13b79b
Former-commit-id: d0953dd11a [formerly c909b32d0b]
Former-commit-id: 66d5bb6d4b
 2012-05-11 10:12:47 -05:00
Brad Gonzales
cb1ff65e77 Issue #628 committing more PGEN code received from Plummer on 4-19-2012. 
Former-commit-id: 22a29b98b2 [formerly a90d64e1fc] [formerly 22a29b98b2 [formerly a90d64e1fc] [formerly 0df0aa8663 [formerly bd658184b246452b5d3e2154d79f2179bdc12594]]]
Former-commit-id: 0df0aa8663
Former-commit-id: af92e8d329 [formerly e1f03d9369]
Former-commit-id: 998c7b3174
 2012-05-10 17:02:18 -05:00
Brad Gonzales
632020195a Issue #628 committing PGEN code received from Plummer on 4-19-2012. 
Former-commit-id: fda897d2d0 [formerly 253e8bc948] [formerly fda897d2d0 [formerly 253e8bc948] [formerly 295cbf95e5 [formerly 0816cd253c86acc699cb90866131619c4679f631]]]
Former-commit-id: 295cbf95e5
Former-commit-id: 2a3bf4ec32 [formerly ae3d17c698]
Former-commit-id: a610dcde73
 2012-05-10 16:50:45 -05:00
Steve Harris
d040b14742 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: d7f7c26582 [formerly 092efd6072] [formerly d7f7c26582 [formerly 092efd6072] [formerly 31b3e87ffa [formerly f98354aae305ad227eaf3b36e4393b8aefc80f02]]]
Former-commit-id: 31b3e87ffa
Former-commit-id: 53d2822329 [formerly 98447412f8]
Former-commit-id: 7ee04eb560
 2012-05-09 13:19:47 -05:00
Steve Harris
1d2ad9224a 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: 572e1bb476 [formerly 27bc369818] [formerly 572e1bb476 [formerly 27bc369818] [formerly 58037cb5d1 [formerly 8f71c807be1d604cea51ab522f04f8bbf8c11f83]]]
Former-commit-id: 58037cb5d1
Former-commit-id: 9c9e01dbda [formerly 63ea8599d7]
Former-commit-id: 7978d3b640
 2012-05-09 13:14:00 -05:00
Steve Harris
ef49f63d8d 12.5.1-2 baseline 
Former-commit-id: ac708c050d [formerly 84d191e7b6] [formerly ac708c050d [formerly 84d191e7b6] [formerly b36c69cc67 [formerly ff847bf86803a485212f08a098be13bc3d83b0b8]]]
Former-commit-id: b36c69cc67
Former-commit-id: f6300cd995 [formerly a821111fbf]
Former-commit-id: 377ae76413
 2012-05-03 19:17:13 -05:00
Steve Harris
491aa53a0c 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: 4ec294b525 [formerly 2ed7249613] [formerly 4ec294b525 [formerly 2ed7249613] [formerly 7b75b781ad [formerly 05d9729acfe9e0f4af4a6ec030052ab26b0a5eb9]]]
Former-commit-id: 7b75b781ad
Former-commit-id: 7c7fc97131 [formerly 6dd3ee8809]
Former-commit-id: fd9e226b35
 2012-05-01 18:31:09 -05:00
Steve Harris
0c25458510 12.4.1-10 baseline 
Former-commit-id: 4bfbdad17d [formerly 9f8cb727a5] [formerly 4bfbdad17d [formerly 9f8cb727a5] [formerly 8485b90ff8 [formerly bf53d06834caa780226121334ac1bcf0534c3f16]]]
Former-commit-id: 8485b90ff8
Former-commit-id: 33a67cdd82 [formerly a28d70b5c5]
Former-commit-id: e5543a0e86
 2012-05-01 18:06:13 -05:00
Dave Hladky
7fc0c65ef4 Issue #15 Re-wrote SimDate integration for menus, alert observers after 
merge headache.

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

Former-commit-id: c33a392a8c [formerly 349adaeedd] [formerly c33a392a8c [formerly 349adaeedd] [formerly b11df888d3 [formerly 3aadbc778d9bb22dc9c0b4b93bbbaa70c3fa07d0]]]
Former-commit-id: b11df888d3
Former-commit-id: ae35c2f27c [formerly e3323febc5]
Former-commit-id: 0212d3108f
 2012-04-27 12:08:29 -05:00
Steve Harris
f1eb6efb23 12.4.1-10 baseline 
Former-commit-id: 418489e726 [formerly 704b75e1a1] [formerly 418489e726 [formerly 704b75e1a1] [formerly 01457fbbde [formerly 5bd6393d7577e5625c6c85b7fe5e7beb9f8c477a]]]
Former-commit-id: 01457fbbde
Former-commit-id: 97caaa0327 [formerly aabc3842ac]
Former-commit-id: 3ed3a665cb
 2012-04-24 15:38:29 -05:00
Steve Harris
989dd653f2 12.4.1-7 baseline 
Former-commit-id: 6d585942fe [formerly 90ae4bbb36] [formerly 6d585942fe [formerly 90ae4bbb36] [formerly cca73b3c62 [formerly 3524730cc38b5420e7529b5a75d62313695e64d6]]]
Former-commit-id: cca73b3c62
Former-commit-id: 4c88c0ae6c [formerly d9f966008c]
Former-commit-id: 5a3a53936f
 2012-04-24 15:24:39 -05:00
Steve Harris
9b8c6e395d 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: 63f11892e8 [formerly 4d7572a632] [formerly 63f11892e8 [formerly 4d7572a632] [formerly 625cd4262c [formerly 5e1b9319941eed516a08a135a2049c14bad77863]]]
Former-commit-id: 625cd4262c
Former-commit-id: e86dc647be [formerly def458753d]
Former-commit-id: 19657ae52d
 2012-04-19 11:11:02 -05:00
Steve Harris
74b66d9683 12.4.1-4 baseline 
Former-commit-id: 750b7543dd [formerly 67a5a68300] [formerly 750b7543dd [formerly 67a5a68300] [formerly 2a216f333c [formerly ad648deaf4d3edaabdda15184289b3a927308bd7]]]
Former-commit-id: 2a216f333c
Former-commit-id: a2a6a18fae [formerly a4e519f3cd]
Former-commit-id: 8cd5974f4c
 2012-04-18 15:18:16 -05:00
Max Schenkelberg
6f1c372790 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: 490c75f684 [formerly 9b018ea151] [formerly 490c75f684 [formerly 9b018ea151] [formerly 7d2a7d987d [formerly 79f4d46bf18fc03c79df0c80c8dde025fe954f0c]]]
Former-commit-id: 7d2a7d987d
Former-commit-id: fcb459e91d [formerly fa3d39c5e2]
Former-commit-id: ab94346224
 2012-04-16 17:29:59 -05:00
Steve Harris
f51d290333 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: c90ce9d54e [formerly ed26e06df2] [formerly c90ce9d54e [formerly ed26e06df2] [formerly fee53dea94 [formerly 3bd9b3a16b0105822983302efa5dd2834aaf5a5f]]]
Former-commit-id: fee53dea94
Former-commit-id: 51bb9ebb46 [formerly dcdd7f0648]
Former-commit-id: 58cb18d860
 2012-04-10 12:50:03 -05:00
Bryan Kowal
58a8ef45c0 Merge branch '9-Wes2Bridge' of ssh://lightning:29418/thunder into 9-Wes2Bridge 
Former-commit-id: 21ff4bf657 [formerly f1e81b1a95] [formerly 21ff4bf657 [formerly f1e81b1a95] [formerly dcc3c7bb59 [formerly f0c0e0692dae0ee53a43b714be9dfb6df0f4c7a6]]]
Former-commit-id: dcc3c7bb59
Former-commit-id: 774d05de1b [formerly 240c3a1806]
Former-commit-id: 64c328e151
 2012-04-09 09:19:02 -05:00
David Gillingham
963a44fec9 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: 5193184abf [formerly 87142f9f4e] [formerly 5193184abf [formerly 87142f9f4e] [formerly e0e57577ff [formerly d2e45df86fb0dbbe234c55cdb0cfc9cb31b71c43]]]
Former-commit-id: e0e57577ff
Former-commit-id: bef6e3d504 [formerly 84f0765dba]
Former-commit-id: 3c0c8de495
 2012-04-05 15:49:23 -05:00
Bryan Kowal
faefa46212 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: 3e039dc79f [formerly e792b2a16f] [formerly 3e039dc79f [formerly e792b2a16f] [formerly 2ed20e107d [formerly 6b206773eff05abf20ecc87b27e96c47b67ba600]]]
Former-commit-id: 2ed20e107d
Former-commit-id: edb7431d0a [formerly 5f4d6f600a]
Former-commit-id: 3db4653b1e
 2012-04-04 18:29:13 -05:00
Steve Harris
1556e72eeb 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: a4e4792bb5 [formerly d3ad6095b7] [formerly a4e4792bb5 [formerly d3ad6095b7] [formerly 5cdda77afb [formerly 879a2e0a4a31999bf4d624ff59e77bbd68195458]]]
Former-commit-id: 5cdda77afb
Former-commit-id: 9845ef53f9 [formerly 6aa18f74f6]
Former-commit-id: 9fee09c9e4
 2012-03-30 09:50:48 -05:00
Max Schenkelberg
9366a5f308 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: 8fb7eccb73 [formerly 6e5964df9d] [formerly 8fb7eccb73 [formerly 6e5964df9d] [formerly 50765e8a34 [formerly 7e4abe637edacca71e1e1c98d99521cd33415fb0]]]
Former-commit-id: 50765e8a34
Former-commit-id: 8f08fab0a7 [formerly cf440b3884]
Former-commit-id: 6378e8c4ee
 2012-03-14 09:49:32 -05:00
Max Schenkelberg
ae389f0b57 Issue #358 Committing NPP core rendering improvements merged with Thin 
Client core improvements

Former-commit-id: e2cd95d3f4 [formerly ae47d9683e] [formerly e2cd95d3f4 [formerly ae47d9683e] [formerly 48b6d45f00 [formerly 206bd0450140b6bcdb3ec8f1e1e417c4c37746d6]]]
Former-commit-id: 48b6d45f00
Former-commit-id: 0554abdde0 [formerly 3212cc6ebb]
Former-commit-id: 585e979c76
 2012-03-01 16:59:40 -06:00
Nate Jensen
25a134cc57 Integrating Richard's changes with 12.2.1 
Change-Id: I774e69f166dbc48c7cb31d066cb8bf5dd626520c

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

Former-commit-id: 94ae63b740 [formerly d18a15535a] [formerly 94ae63b740 [formerly d18a15535a] [formerly afe3c5db9c [formerly 729a478cf151a4d61bb31adba4193c3fc33717a1]]]
Former-commit-id: afe3c5db9c
Former-commit-id: a65f8d8242 [formerly 74b6e7b389]
Former-commit-id: 5c1aae46e1
 2012-02-28 09:37:45 -06:00
Steve Harris
f8ae79c35c 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: 24059a5b4e [formerly 9b67525e95] [formerly 24059a5b4e [formerly 9b67525e95] [formerly e5b56c99ab [formerly fb9d0adece5806382d0aa5c7c3e7c41f89594143]]]
Former-commit-id: e5b56c99ab
Former-commit-id: 73a337bc31 [formerly 40d7357165]
Former-commit-id: 21f12bae82
 2012-02-27 15:58:49 -06:00
Nate Jensen
a9a165f471 Merge "Issue #185 handle CommunicationExceptions from the LevelFactory in remerged ncep grib decoder." into 4-Thin_Client 
Former-commit-id: a914aa38c8 [formerly e3e44707a4] [formerly a914aa38c8 [formerly e3e44707a4] [formerly fef3fcb60c [formerly fd448c2a996aef215802dc501b68d28747f66414]]]
Former-commit-id: fef3fcb60c
Former-commit-id: e0e2a82d83 [formerly d03ff9824e]
Former-commit-id: 57c46aa9e1
 2012-02-23 11:50:39 -06:00
Ben Steffensmeier
c77d5e6d98 Issue #176 update merged ncep plot classes to use new plot interface. 
Change-Id: I345a970aa0d292fcd05ba4c19e77536e03057f72

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

Former-commit-id: a2db6975c9 [formerly 4dedc8b30d] [formerly a2db6975c9 [formerly 4dedc8b30d] [formerly 73a08e9d4e [formerly 951c8c2a77c8f58a04a576148ac583ccdcc21e02]]]
Former-commit-id: 73a08e9d4e
Former-commit-id: d937284ab2 [formerly d5d8697d9f]
Former-commit-id: 92962fdd2c
 2012-02-23 10:49:56 -06:00
Steve Harris
321a11e44c Revert PlotResource2.java to ss_sync version for merge into 4-Thin_Client 
Former-commit-id: a5f8708b6a [formerly db065fcd50] [formerly a5f8708b6a [formerly db065fcd50] [formerly e94b322dc3 [formerly 8a1ef8c6f0e3cdd8b4eb581218d499bc8fc19aeb]]]
Former-commit-id: e94b322dc3
Former-commit-id: 97184f1dc4 [formerly 78ea2de6d3]
Former-commit-id: 91ffb88ac7
 2012-02-23 10:16:02 -06:00
Steve Harris
3aef320ffd 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: 92084b3f20 [formerly d0bbbfefcc] [formerly 92084b3f20 [formerly d0bbbfefcc] [formerly 7a10ca9766 [formerly 5528a1374781f3a4d55702ae1f0c34efcf1e3865]]]
Former-commit-id: 7a10ca9766
Former-commit-id: 92b7072b82 [formerly 3d511fe719]
Former-commit-id: ae9c52b012
 2012-02-23 10:06:18 -06:00
Bryan Kowal
6d311633c4 Issue #34 - recompiled the nsharp dll with the latest ncep code. 
Former-commit-id: 2ce7c520b3 [formerly c8dba08a9d] [formerly 2ce7c520b3 [formerly c8dba08a9d] [formerly 4888756560 [formerly d3affc909e299af8826d16bc02754fc61754e287]]]
Former-commit-id: 4888756560
Former-commit-id: e4da2bcb9c [formerly 71fe94b322]
Former-commit-id: 82513080ba
 2012-02-16 12:51:24 -06:00
Ben Steffensmeier
e50ddeed23 Issue #235 Added ability to capture multiple frames to NSharp 
Change-Id: Ib6ab3acff6d9357679f4116493c1d3a97b57c2cc

Former-commit-id: 08e8343d98 [formerly 5cdcd5a261] [formerly 08e8343d98 [formerly 5cdcd5a261] [formerly 6bfd8ccfee [formerly 447253e7cd0ea5ab64c020a4fe0822ffc3a01d3f]]]
Former-commit-id: 6bfd8ccfee
Former-commit-id: 9d442083a1 [formerly 512e0f1bd5]
Former-commit-id: e1eeef7827
 2012-02-09 10:54:02 -06:00
Ben Steffensmeier
12e294d9e7 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: 1e0bd549a4 [formerly 324b358c44] [formerly 1e0bd549a4 [formerly 324b358c44] [formerly 851046ccf3 [formerly 2b0f9f149c4dc2031cb9178538899eb3f9f5de23]]]
Former-commit-id: 851046ccf3
Former-commit-id: 6da56f59fc [formerly 56c1b70d03]
Former-commit-id: 9543134762
 2012-02-06 16:55:48 -06:00
Ben Steffensmeier
b338fc07e7 Issue #230 fix scaling problems with printing to high dpi printers 
Change-Id: I64e609d3b01a839d3b8927eedfd85f81ffc0301f

Former-commit-id: 89b327974a [formerly d35d365b7f] [formerly 89b327974a [formerly d35d365b7f] [formerly f78fa301a8 [formerly 22418489fd697c94b2350d79e7701c8399842e2e]]]
Former-commit-id: f78fa301a8
Former-commit-id: 25adbef6ab [formerly 55689025ff]
Former-commit-id: ffe5d42a03
 2012-02-03 12:49:59 -06:00
Ben Steffensmeier
a7bc0dc8f3 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: 6194dc8210 [formerly 9cc983549d] [formerly 6194dc8210 [formerly 9cc983549d] [formerly 9254b762ff [formerly 94d4feb2973ed201d369a21126b3443606041179]]]
Former-commit-id: 9254b762ff
Former-commit-id: 75f49627c8 [formerly 484a0f64f8]
Former-commit-id: 0c4a26a41c
 2012-01-30 17:04:47 -06:00
Ben Steffensmeier
50d560a874 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: 3c673896a0 [formerly b3463d27fc] [formerly 3c673896a0 [formerly b3463d27fc] [formerly 0d75fbf942 [formerly 1b2496a6db33fc65efecfdffb380d8b4e07ec590]]]
Former-commit-id: 0d75fbf942
Former-commit-id: 8b1cdd8db1 [formerly c22f135dbc]
Former-commit-id: 713811bb95
 2012-01-30 16:39:57 -06:00
David Gillingham
e8d336e205 Issue #20: Merge all changes from previous SVN repo to GIT. 
Former-commit-id: b31f40ec9d [formerly 845e6c19af] [formerly b31f40ec9d [formerly 845e6c19af] [formerly b056e18757 [formerly 926a2a6a5af5b3514c29097deb0fc24b093643a2]]]
Former-commit-id: b056e18757
Former-commit-id: ea7a55ad8d [formerly 87b15de88b]
Former-commit-id: d85d78f180
 2012-01-26 17:38:43 -06:00
Nate Jensen
12e15993ea Issue #181 fix ncep 
Change-Id: If0e2947c33523ada50036212666867a7c5138c17

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

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


Former-commit-id: e3d3629375 [formerly cf1383a412] [formerly e3d3629375 [formerly cf1383a412] [formerly beae8e7e59 [formerly 874ae116e412c39b73dc3cc74ee3f3a3b02d82f7]]]
Former-commit-id: beae8e7e59
Former-commit-id: 49dfa99cc5 [formerly e1fc0b48c1]
Former-commit-id: 03ad145679
 2012-01-26 15:05:25 -06:00
Roger Ferrel
7f4f111729 Issue #181 
new files not indexed


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

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

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

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

Former-commit-id: 6366bc35cb [formerly fe52a35f7a] [formerly 6366bc35cb [formerly fe52a35f7a] [formerly 33756de9c8 [formerly 3aa13bd49e23ef963127f7efbc91054c06808f1c]]]
Former-commit-id: 33756de9c8
Former-commit-id: 7301ad5c66 [formerly 3b7a082f41]
Former-commit-id: ef5349fb63
 2012-01-24 09:59:50 -06:00