David Gillingham
0f2ea852c0
Issue #647 : Ensure records with the same data URI get archived only
...
once, implement PerisistableDataObject.getIdentifier and setIdentifier
for StdTextProduct.
Former-commit-id: 343f42b325855745db0695e1582a2234303477ac95e1582a2234303477ac9dabcca4f8031558955d
2012-05-23 15:49:49 -05:00
David Gillingham
ecd4a38f1d
Issue #649 : Make compression of archived Java objects optional.
...
Former-commit-id: 173f110759513d0e628005a58dadf128bdf26f2e05a58dadf128bdf26f2ef5fe7e6be7f58f89dce7
2012-05-21 16:48:02 -05:00
David Gillingham
40a1b95aae
Issue #646 : Fix NullPointerException when decoding Level3 radar products
...
introduced by previous change.
Change-Id: I3689e003e367be2b69033f13f1744c381d597616
Former-commit-id: c11202e8a232799c46d294a4cbd1077c84c67c6794a4cbd1077c84c67c678d877d7784f3ac7a8090
2012-05-21 13:10:10 -05:00
David Gillingham
61484252c3
Issue #646 : Ensure radar obs use TimeTools to set reftime.
...
Former-commit-id: 84bcf0cf3ef12f83c80b4f9061fcea091e0325ea4f9061fcea091e0325eaea06b163b9e779d44a4e
2012-05-18 16:31:16 -05:00
David Gillingham
0b28847c7c
Issue #643 : Fix regression to ProfilerObs.setPointDataView() from issue
...
538.
Former-commit-id: a831cac4239106c31a453b1ab25b1749fe4c42a63b1ab25b1749fe4c42a62a3b400c3caae96ea26c
2012-05-18 10:49:01 -05:00
Ron Anderson
2008d8979b
Issue #502 Fix staticTopo notifications
...
Change-Id: Ib1003426ab9e0c17325da425fbf1602e93983ed1
Former-commit-id: 0cd6bac8a05461b92346902bde0f2dcd0fd140ad902bde0f2dcd0fd140ad301827523972ee9f490d
2012-05-11 10:06:29 -05:00
Benjamin Phillippe
585db5f22d
Issue #502 Eliminated call to database to alleviate performance bottleneck in GfeIngestNotificationFilter
...
Change-Id: I8b2b250323c7caafcf357e3101b9ac4802b6b2c9
Former-commit-id: d358d7caf4272323baa6bd0e56daaf16f7fbe9cbbd0e56daaf16f7fbe9cbacf8c7290f953f50718c
2012-05-11 10:06:18 -05:00
Richard Peter
7a54b09c59
Issue #502 : Update grib/gfe thread/memory usage for grib notification route
...
Change-Id: Ifa295f02c6e465bc151268c47fc71bfc67646e36
Former-commit-id: 7a5aea8ee47b14c9499ae431671ff2150d16b24ee431671ff2150d16b24e33c7d4cb87fe6dc2652c
2012-05-11 10:06:04 -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: fc70139990d7f7c26582092efd607231b3e87ffa092efd607231b3e87ffa98447412f853d2822329
2012-05-09 13:19:47 -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: fe946166ed4ec294b5252ed72496137b75b781ad2ed72496137b75b781ad6dd3ee88097c7fc97131
2012-05-01 18:31:09 -05:00
Steve Harris
40aa780b3d
12.4.1-10 baseline
...
Former-commit-id: 7fa9dbd5fb4bfbdad17d9f8cb727a58485b90ff89f8cb727a58485b90ff8a28d70b5c533a67cdd82
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: 37da8763eb42a12fa7a51b7473572f5b7ecea8661b7473572f5b7ecea86661e31c62ffa1a3a361dd
2012-04-30 13:43:34 -05:00
David Gillingham
576e994c04
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: ddd78ed32f0ff20419594aadd41fde98787936184aadd41fde9878793618a1a62aa8f18c4eda7ae7
2012-04-27 13:26:37 -05:00
David Gillingham
eeb836f5eb
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: 034cab50006497272c1dc28bfaddee292374ce21c28bfaddee292374ce216f40ba77f11107eac65d
2012-04-27 12:43:04 -05:00
Richard Peter
51e9a72371
Issue #538 : Fix Serialization Annotations and Serialization Issues
...
Change-Id: I436997106438ab283e987cb7e3055fcee009b608
Former-commit-id: 231d98b79ec33a392a8c349adaeeddb11df888d3349adaeeddb11df888d3e3323febc5ae35c2f27c
2012-04-27 12:08:29 -05:00
David Gillingham
7bf4680605
Issue #473 : Properly archive text plugin records,
...
fix bugs in DatabaseArchiver.determineStartTime().
Change-Id: I2a7a71bcf7bdbc5ea786d949631b45342675ce1f
Former-commit-id: be0570d2fe8592a9a50d526abfd36e04ab5d619b526abfd36e04ab5d619b36717c7a3ecf74c74cc2
2012-04-25 17:08:21 -05:00
David Gillingham
102d8422bd
Issue #473 : Fix CWA and TCS plugin's decoders to use ingest file name for datatime.
...
Change-Id: I54bbf7f1562ff48617721f6d88ef536c0afd7b61
Former-commit-id: 715dce755730d5e0d2ddbdbc16d31c58e7a0f310bdbc16d31c58e7a0f3105850d4cfb1e8fdf9d48f
2012-04-19 17:10:08 -05:00
Bryan Kowal
562a5377f0
Issue #501 - eliminated (duplicate statements) unreachable code to fix the Wes2Bridge build.
...
Former-commit-id: dbcc538fa872068507a9b1561d67a0b90b6f101eb1561d67a0b90b6f101ea9b51192d20514785b3a
2012-04-19 13:09:58 -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: 634d40a15663f11892e84d7572a632625cd4262c4d7572a632625cd4262cdef458753de86dc647be
2012-04-19 11:11:02 -05:00
Steve Harris
98d8b3f188
12.4.1-4 baseline
...
Former-commit-id: 4767b0e069750b7543dd67a5a683002a216f333c67a5a683002a216f333ca4e519f3cda2a6a18fae
2012-04-18 15:18:16 -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: 6a1f2160bdc90ce9d54eed26e06df2fee53dea94ed26e06df2fee53dea94dcdd7f064851bb9ebb46
2012-04-10 12:50:03 -05:00
Bryan Kowal
438e88cc58
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: 476ad5de1ff49aadd9c81afa927c33839d7c886f1afa927c33839d7c886f24148c19a9ab70749ea4
2012-04-09 09:32:45 -05:00
Bryan Kowal
0591ab00cc
Merge branch '9-Wes2Bridge' of ssh://lightning:29418/thunder into 9-Wes2Bridge
...
Former-commit-id: 4d73e617c821ff4bf657f1e81b1a95dcc3c7bb59f1e81b1a95dcc3c7bb59240c3a1806774d05de1b
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: 3b47db95415193184abf87142f9f4ee0e57577ff87142f9f4ee0e57577ff84f0765dbabef6e3d504
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: 5f9463bc573e039dc79fe792b2a16f2ed20e107de792b2a16f2ed20e107d5f4d6f600aedb7431d0a
2012-04-04 18:29:13 -05:00
David Gillingham
0fd14b8a0b
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: ae703513d7c9d5823d2ca9398fe4cde0e8e6d00aa9398fe4cde0e8e6d00ab4439bc5e84ff79099ac
2012-04-03 14:16:33 -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: b4846ce8a8a4e4792bb5d3ad6095b75cdda77afbd3ad6095b75cdda77afb6aa18f74f69845ef53f9
2012-03-30 09:50:48 -05:00
Steve Harris
11e448aa39
12.3.1-10 baseline
...
Former-commit-id: 760ead20470e4128712b4068f5295f22bd792cd94068f5295f22bd792cd9ce3b74c6058bc60b1e32
2012-03-30 08:38:33 -05:00
Steve Harris
239813406d
Merge branch 'sync_test' (VCModules) into ss_sync
...
Former-commit-id: b05701d2d70665862abe70357d90bca0abcf812070357d90bca0abcf8120688452075065aa72fee7
2012-03-29 10:03:05 -05:00
Steve Harris
1bc33e26e6
Merge branch '104-integration' into ss_sync; 4-Thin_Client and 10-Tech_Blocked (tear-off menus) -> ss_sync
...
Former-commit-id: 770ccb152094e6323c0a132d68acc654a1d9cdbc132d68acc654a1d9cdbc4b853c56c62c3f9271bf
2012-03-29 10:01:55 -05:00
David Gillingham
d1bf70a7be
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: a1ac93704be33083c11a13af9170b1ed74b9058913af9170b1ed74b905895dac19bde9558c69401d
2012-03-14 15:07:59 -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: 5a61f3ae238fb7eccb736e5964df9d50765e8a346e5964df9d50765e8a34cf440b38848f08fab0a7
2012-03-14 09:49:32 -05:00
David Gillingham
9cc2c09ae5
Issue #417 : Refactor HPEDhrSrv to work from a 2-stage queueing process.
...
Former-commit-id: edde99f0b87e5ec12276e13850a2b6d433b7d4d6e13850a2b6d433b7d4d62b5588bd1e3c4e90e0bf
2012-03-13 12:31:38 -05:00
Steve Harris
4d58cdca1b
Issue #16 - Recovering mpduff 9-Wes2Bridge code that fell out of a rebase while fixing a review set
...
Former-commit-id: 229fa2944d6d2af585b15bbf80a38410dc1407475bbf80a38410dc1407477bdde9f6907fc8cf3d94
2012-03-12 13:10:34 -05:00
Bryan Kowal
474e2fae6d
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: 08451e8a63eab9c845bb58bfa6298166e05f4c9658bfa6298166e05f4c963b9738335464a7f1db84
2012-03-12 11:43:34 -05:00
David Gillingham
ad170c7b51
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: d3d2046df0efc9e9000b9a75c878293cfa029f4b9a75c878293cfa029f4b1818e488c5882544b165
2012-03-06 16:24:58 -06:00
David Gillingham
8bf167bc15
Issue #361 : Refactor IscDataRecRequest handler to execute iscDataRec
...
asynchronously.
Former-commit-id: b8acb1912c8d2ea4cfbaff231f33f41d69867594ff231f33f41d698675948c0b121cbc000ca27db9
2012-03-05 16:49:23 -06:00
Bryan Kowal
b0fc22d8ca
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: 3bd189df23ed81095573bea56356fd00759729a4bea56356fd00759729a41fda54a89b0b690e438c
2012-03-05 14:36:56 -06:00
Max Schenkelberg
2300065c15
Issue #358 merged esb.camel project for plot update compatibility
...
Former-commit-id: 8438bc54db225dfd15be0cf00cb7f476e7a02f760cf00cb7f476e7a02f76e27d36432ab23dc95d40
2012-03-02 13:26:44 -06:00
Max Schenkelberg
236c8f4ba3
Issue #358 merged dataURI changes from thinclient in for plot
...
compatibility
Former-commit-id: 7337ff7ed64d91a4fd74f96ff962591f714b1a5bf96ff962591f714b1a5be4914cbe8979365f1f62
2012-03-02 12:24:19 -06:00
Max Schenkelberg
52c7dec2e8
Issue #358 Committing NPP core rendering improvements merged with Thin
...
Client core improvements
Former-commit-id: fe1811c167e2cd95d3f4ae47d9683e48b6d45f00ae47d9683e48b6d45f003212cc6ebb0554abdde0
2012-03-01 16:59:40 -06:00
Steve Harris
6fdae68267
Merge branch 'ss_sync' into sync_test
...
Former-commit-id: 994e79cfb33b9c3e3474951ecfe3dd787aed90f8951ecfe3dd787aed90f8db45babec8b3f831a7b4
2012-03-01 14:01:16 -06:00
David Gillingham
d5779b3101
Issue #20 : Fix breakage to alertViz caused by changes to
...
FileUtil.join().
Former-commit-id: 33b41f1b0e6a2b7e12d6c6803ba4348a45f1f4c3c6803ba4348a45f1f4c3953f8a6535234801c998
2012-03-01 11:19:22 -06:00
Ben Steffensmeier
cc8e7897cf
Issue #353 add logic to syncronize times for thin client data updates..
...
Change-Id: Id1f8e31bc95f0b0262821050be6660bfe66df9d1
Former-commit-id: 07d98eb7dc56d97c95d55c303ed189c61e40c4265c303ed189c61e40c42684e6c9beb8390700efb0
2012-02-29 15:49:47 -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: 6d0178411524059a5b4e9b67525e95e5b56c99ab9b67525e95e5b56c99ab40d735716573a337bc31
2012-02-27 15:58:49 -06:00
David Gillingham
d9def42052
Issue #346 : Fix disappearing ISC data from VCParms, fix threading issues in Scalar/Vector pickup value dialogs.
...
Change-Id: If465b8daf5ef04a76084500425ac3114a48ab908
Former-commit-id: adfd42b5ce5a8ba0f0fb32b2c0698885998bc65432b2c0698885998bc65488dcd4d09d9ff631305a
2012-02-23 13:23:59 -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: 5a96582f1692084b3f20d0bbbfefcc7a10ca9766d0bbbfefcc7a10ca97663d511fe71992b7072b82
2012-02-23 10:06:18 -06:00
Steve Harris
13a3edd4f6
Merging SS OB12.2.1 into ss_sync
...
Former-commit-id: 829d2791e98da36046dec8aae9874154be9660f1c8aae9874154be9660f14450cf8963b55a488ed8
2012-02-22 11:14:43 -06:00
Steve Harris
139d42c594
Merge branch 14-NCEP into 'ss_sync'
...
Former-commit-id: a811ac888f85075e610794c2ea985b9995d22e2594c2ea985b9995d22e25aaead73ec5610fdf3f4e
2012-02-22 10:12:49 -06:00
Steve Harris
3371e158a6
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: 121ec88a98ec0f1aebfcb89ebc5e01496cc6a06bb89ebc5e01496cc6a06b4a93298877dd3a5a8d88
2012-02-20 16:38:06 -06:00
