Nate Jensen
e2273ed91d
Merge "Issue #2950 Support dynamic color counts for color map editing." into development
...
Former-commit-id: 992a00b18c
[formerly 6989999e95
] [formerly 5129002e91
] [formerly 992a00b18c
[formerly 6989999e95
] [formerly 5129002e91
] [formerly 5bad21f3e6
[formerly 5129002e91
[formerly b196bf0463ea59d55dec4e70373ca731152123f9]]]]
Former-commit-id: 5bad21f3e6
Former-commit-id: 7c7b5851a7
[formerly 58516f3a9f
] [formerly 80e6eaeae66bf6576685319ea3e0cf04186e38c2 [formerly 92f0182d3f
]]
Former-commit-id: a18f7fab710c311296f870364da3764831a1befa [formerly a08e3a4f1a
]
Former-commit-id: 4fe2e3a01b
2014-04-09 11:20:04 -05:00
Everett Kladstrup
f815fbcb60
Issue #2725 Move derived parameters logic to common
...
* Make derived parameters not use VizException
* Move derived parameters packages from the viz hierarchy
to the common hierarchy
* Move data cube classes that don't depend on derived parameters
to thier own plugin
* Moved DataCubeContainer and supporting frontend classes from
viz.core to viz.datacube
Former-commit-id: eab1358602
[formerly 8b19b3601a
] [formerly 06d6961c0f
] [formerly eab1358602
[formerly 8b19b3601a
] [formerly 06d6961c0f
] [formerly 0699041518
[formerly 06d6961c0f
[formerly ad4a8cfbbc6de72810492c8f1de9701d381b6019]]]]
Former-commit-id: 0699041518
Former-commit-id: 29ce7781c9
[formerly 86bf2b5ea0
] [formerly eb5b00071037510aefc04c8c20411cc18c44abb0 [formerly 260d0beddc
]]
Former-commit-id: 41d01092799ccea952f65c9d6b66d93b56557541 [formerly d96b56c91a
]
Former-commit-id: 7b2683532a
2014-04-09 09:31:12 -05:00
Ben Steffensmeier
883474adf0
Issue #2950 Support dynamic color counts for color map editing.
...
Former-commit-id: c23ef56706
[formerly 9d7504e2c3
] [formerly c5a48642eb
] [formerly c23ef56706
[formerly 9d7504e2c3
] [formerly c5a48642eb
] [formerly c805a5fed7
[formerly c5a48642eb
[formerly 85528bf2bbdbbaacc9631b76ef710e9fd0210110]]]]
Former-commit-id: c805a5fed7
Former-commit-id: 4c72a79253
[formerly cf3456c6cd
] [formerly be88286e2cfc17a580f9a83f0f911cee38d4ed27 [formerly 16446101a4
]]
Former-commit-id: 075aeccc30fd1d6a00f2c10de006958f3601b57d [formerly e0ff68736e
]
Former-commit-id: 80476e1f60
2014-04-08 15:27:57 -05:00
Ben Steffensmeier
1aa51a118b
Issue #2874 Initial implementation of RTOFS data.
...
Former-commit-id: 9e2e500040
[formerly 1c18e800b3
] [formerly 55046a8e1e
] [formerly 9e2e500040
[formerly 1c18e800b3
] [formerly 55046a8e1e
] [formerly 12ed72b0c0
[formerly 55046a8e1e
[formerly 11837e612778ea7a1d42fbfac1e0e2b3d3678f1c]]]]
Former-commit-id: 12ed72b0c0
Former-commit-id: 26558fad1e
[formerly aadc22091e
] [formerly 17445664d752b4ffa0186bdce951baaffefd1f21 [formerly ab8293c6a1
]]
Former-commit-id: b8e1bca2fe93a3c4fa125052086c7d64a243b406 [formerly d20a1a6f54
]
Former-commit-id: 77d809f66a
2014-03-24 11:10:18 -05:00
Brad Gonzales
b404e07694
Issue #2873 Removed 32 bit native libraries and references.
...
Change-Id: I52debdaa954ebb0193f64bdaadf45f26500aa40f
Former-commit-id: 25050d57f6
[formerly de508133ff
] [formerly 08dde4824f
] [formerly 25050d57f6
[formerly de508133ff
] [formerly 08dde4824f
] [formerly 189234f162
[formerly 08dde4824f
[formerly d0108c2cb27c63c8133a7381b0d2c1bbdb89f1d6]]]]
Former-commit-id: 189234f162
Former-commit-id: 02a20c0e37
[formerly 0022633626
] [formerly b1f2574d3b73438b586d2b8edcd4477283696b6d [formerly d303662a51
]]
Former-commit-id: 9d6f627b3d954f1806f2ed939de355f3fe6bafcb [formerly f859a625d0
]
Former-commit-id: 412262edcf
2014-03-20 13:27:39 -05:00
Steve Harris
24c55c616c
Merge branch 'omaha_14.2.1' (14.2.1-13) into development
...
Former-commit-id: 1dd9192564
[formerly 5efb16fa8b
] [formerly d0aeb854f5
] [formerly 1dd9192564
[formerly 5efb16fa8b
] [formerly d0aeb854f5
] [formerly 0c2c5ad4bd
[formerly d0aeb854f5
[formerly a2318f04eea89a258400dea526daa4fe67b69271]]]]
Former-commit-id: 0c2c5ad4bd
Former-commit-id: 016a659753
[formerly 5d95d594f8
] [formerly 0a080d6ea36c63666072fb90d560b4b114c279fb [formerly b5a2d2237f
]]
Former-commit-id: fde598cdbbe0d12d61ab87081d43c79970894959 [formerly 3a82fa7ac6
]
Former-commit-id: a936941dff
2014-03-17 15:55:41 -05:00
Nate Jensen
87eaf289e1
Merge "Issue #2718 Update to GeoTools 10.5 Undo reformatting of ncep code Move com.raytheon.edex.common.shapefiles.ShapeFile.java to com.raytheon.edex.plugin.radar.util" into development
...
Former-commit-id: a45175cbc9
[formerly a9381c505e
] [formerly 540d0f2e1d
] [formerly a45175cbc9
[formerly a9381c505e
] [formerly 540d0f2e1d
] [formerly 27625eb93a
[formerly 540d0f2e1d
[formerly ee5c599bf4822f73e488e42240c5794189e2d70f]]]]
Former-commit-id: 27625eb93a
Former-commit-id: c2fde2241e
[formerly 5f554ade56
] [formerly 685d628805abded0ae9728b016ad3cb6833fc05a [formerly d8edb8e91b
]]
Former-commit-id: a39642ba88c4d15d783728b3396c1262932e9519 [formerly 432926c40b
]
Former-commit-id: b8b63869ed
2014-03-13 11:16:00 -05:00
Ron Anderson
9accd00e1f
Issue #2718 Update to GeoTools 10.5
...
Undo reformatting of ncep code
Move com.raytheon.edex.common.shapefiles.ShapeFile.java to com.raytheon.edex.plugin.radar.util
Change-Id: I2bdf4d7d08061ace24589dafca26f00bac00aa2a
Former-commit-id: d752e068c7
[formerly ab69d3e318
] [formerly 1c727465ee
] [formerly d752e068c7
[formerly ab69d3e318
] [formerly 1c727465ee
] [formerly bcfaf40ebf
[formerly 1c727465ee
[formerly efc65ad66fc4df90319f821f289e13dc9dbeb3a0]]]]
Former-commit-id: bcfaf40ebf
Former-commit-id: cbd408ce4e
[formerly 06b0b5b684
] [formerly c46a1807b76708c6b5217ba3deb670bd9ca60b66 [formerly 4b2a388628
]]
Former-commit-id: cfe7b7159bee965bab52438c7b1f622e5351016b [formerly 4ffc16ce53
]
Former-commit-id: 98e22f6e59
2014-03-13 11:11:53 -05:00
Bryan Kowal
49142d88a1
Issue #2851 - initial 64-bit build of the bignsharp DLL
...
./ncep/gov.noaa.nws.ncep.ui.nsharp.win32/bignsharp.dll
./ncep/gov.noaa.nws.ncep.ui.nsharp.win64/bignsharp.dll
file ./ncep/gov.noaa.nws.ncep.ui.nsharp.win32/bignsharp.dll
./ncep/gov.noaa.nws.ncep.ui.nsharp.win32/bignsharp.dll: PE32 executable for MS Windows (DLL) (console) Intel 80386 32-bit
file ./ncep/gov.noaa.nws.ncep.ui.nsharp.win64/bignsharp.dll
./ncep/gov.noaa.nws.ncep.ui.nsharp.win64/bignsharp.dll: PE32+ executable for MS Windows (DLL) (console) Mono/.Net assembly
Amend: update Java version and Plugin version
Change-Id: I377e8b51eb9d7fd9964092040d1bcde3f9bcfd27
Former-commit-id: 40578d5fe0
[formerly b0de1fba76
] [formerly cac6709da8
] [formerly 40578d5fe0
[formerly b0de1fba76
] [formerly cac6709da8
] [formerly 438e594868
[formerly cac6709da8
[formerly 3189f870d55219372438213441fd1359a6bb5cc4]]]]
Former-commit-id: 438e594868
Former-commit-id: cfe069e216
[formerly fe9b652d52
] [formerly deff90d8a30f3ac8617a91216fe1f97ec2c6f28a [formerly 9ec8e864a7
]]
Former-commit-id: 114c71d431ade597e2d6c55cf0917beb0ccb9af7 [formerly 2c101a12dd
]
Former-commit-id: 3440a5b64c
2014-03-11 16:47:11 -05:00
Brian.Dyke
0a1ef77d16
Merge branch 'ncep_14.2.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.2.1
...
Former-commit-id: 8d4a1e1204
[formerly 24785068be
] [formerly d710aec521
] [formerly 8d4a1e1204
[formerly 24785068be
] [formerly d710aec521
] [formerly fda6ab1344
[formerly d710aec521
[formerly ac54324fb0eff1483dd2c3aa8d94273760451dab]]]]
Former-commit-id: fda6ab1344
Former-commit-id: d197a72c20
[formerly c5502af3fa
] [formerly 6ec1b00cf64c71cead90fca582edef188ec24710 [formerly 0aff5875b0
]]
Former-commit-id: 28dc637ae8563b78153684cbfa60e954caea69c9 [formerly dcade6e18a
]
Former-commit-id: 26e19974d1
2014-03-10 15:14:59 -04:00
Ben Steffensmeier
fd2fbe839d
Issue #2791 Move DataSource/DataDestination to its own project, add DataFilter.
...
Former-commit-id: 094086b5c2
[formerly c0b478eb97
] [formerly 9122b6da99
] [formerly 094086b5c2
[formerly c0b478eb97
] [formerly 9122b6da99
] [formerly 8650074737
[formerly 9122b6da99
[formerly ba5ff870337c7ac66d633077d84de867e5df967c]]]]
Former-commit-id: 8650074737
Former-commit-id: bf5b777b0d
[formerly 5e4c35e93f
] [formerly b86eb15482eef7c6ed811b7be5a9d782dbcfa838 [formerly d3043fda5a
]]
Former-commit-id: 97f709f323c3b2bc50eb72f596874288c2f388b5 [formerly a1ac082c94
]
Former-commit-id: ad4ce67e85
2014-03-07 18:15:32 -06:00
Stephen Gilbert
806b78cf4d
VLab Issue #3224 - NSHARP: Fix erroneous mixing heights
...
Change-Id: Ib27352c1f0e5f2ee860577e5b3e96be5252902f2
Former-commit-id: 8560c21c50
[formerly 200c7e60da
] [formerly 65dd8b4c3c
] [formerly 8560c21c50
[formerly 200c7e60da
] [formerly 65dd8b4c3c
] [formerly f203a4c035
[formerly 65dd8b4c3c
[formerly 459cd2e6772efa05a683073798a1d4424aa2facf]]]]
Former-commit-id: f203a4c035
Former-commit-id: 803a4584c9
[formerly 00c1f40997
] [formerly ad4b7bcc63f7e8c66ec4b0f39eea3f4a987956f1 [formerly 46ebeb9969
]]
Former-commit-id: d34facf3627b4a21886984446a4d5d04222a5da1 [formerly abb11feb16
]
Former-commit-id: aaa14d1b1d
2014-03-07 19:10:08 -05:00
Stephen Gilbert
e3d279329d
VLab Issue #3223 - NSHARP: Improve selection operation
...
Change-Id: I4d0e92d1db24b3136f60fa224c908dfc020afa1d
Former-commit-id: ba4869af46
[formerly 5fcb45a629
] [formerly 9a457213bb
] [formerly ba4869af46
[formerly 5fcb45a629
] [formerly 9a457213bb
] [formerly e3aedaa1d6
[formerly 9a457213bb
[formerly 16fcc171c65d79d5698feeb3ff0ace49c31d976f]]]]
Former-commit-id: e3aedaa1d6
Former-commit-id: fb4c74e0cd
[formerly c4b73eb02e
] [formerly c9da8cd134141da14e27b89961b37aff9bce21eb [formerly b1e1d9178a
]]
Former-commit-id: d2c9ed404a1b1977c532dfd66aa6f8681ccc6fad [formerly 05328b9103
]
Former-commit-id: 08b8f4c679
2014-03-07 19:07:28 -05:00
Stephen Gilbert
5652cbdde4
VLab Issue #3222 - Fix for Plotmodel CAVE hangs in NCP
...
Change-Id: I825c3b0af5177258f531b625f2cc66761e932d57
Former-commit-id: 78e4214f3d
[formerly a7fd09a409
] [formerly 1632166902
] [formerly 78e4214f3d
[formerly a7fd09a409
] [formerly 1632166902
] [formerly 49a6d6ec7e
[formerly 1632166902
[formerly 24e07a3215a7879e459afc74e020eab0a8e1c646]]]]
Former-commit-id: 49a6d6ec7e
Former-commit-id: fee37acf0c
[formerly 6d40a42c39
] [formerly cf3ae4ba60186788d49675c04096c67eee23603a [formerly de6e50d8e6
]]
Former-commit-id: 6488fc0d38e5381f3847719213a5fbb4e7249d10 [formerly 40a62c63cd
]
Former-commit-id: 5eea989db5
2014-03-07 18:49:21 -05:00
Stephen Gilbert
3787125175
VLab Issue #3221 - Fix XML serialization problems
...
A few problems reading/writing XML files were noticed after upgrading to
14.2.1. This commit fixes the saving of SPFs, reading of image style
rules, and the location of lockedColorMap file.
Change-Id: I8aad4197029c70f72612299a25329687892884af
Former-commit-id: 6f8caa3515
[formerly cce06bfbe3
] [formerly 625fcb0064
] [formerly 6f8caa3515
[formerly cce06bfbe3
] [formerly 625fcb0064
] [formerly 6dd6ae8d36
[formerly 625fcb0064
[formerly 4f58998c899e28521658bf17dee852592c534713]]]]
Former-commit-id: 6dd6ae8d36
Former-commit-id: b69374b56d
[formerly ce73240c40
] [formerly 53869af84fd3c1760276c2fccf36acd25767d8aa [formerly 204d047289
]]
Former-commit-id: 24c6ee760a153abacd30869121c5aeaaddae79fa [formerly ebafac1725
]
Former-commit-id: e0f2f91b21
2014-03-07 18:36:42 -05:00
Steve Harris
9c0f484340
Merge branch 'omaha_14.2.1' into development
...
Conflicts:
edexOsgi/com.raytheon.edex.plugin.obs/res/spring/obs-ingest.xml
Former-commit-id: 865fef97b1
[formerly 51b755a476
] [formerly 873bd6b889
] [formerly 865fef97b1
[formerly 51b755a476
] [formerly 873bd6b889
] [formerly f60aba35d6
[formerly 873bd6b889
[formerly 7d94859f45aaa3d732cbb25fc55348996cfe481c]]]]
Former-commit-id: f60aba35d6
Former-commit-id: edeb1833ae
[formerly c24108e75b
] [formerly dd4a41540248d59f726530a16fc9cba204845e67 [formerly 708485427e
]]
Former-commit-id: 5762fd74e7f2363c52a036a1f2863c4bad83bfa3 [formerly 61af779433
]
Former-commit-id: ed7921643c
2014-03-07 15:43:40 -06:00
Steve Harris
3348f6857a
Merge branch 'master_14.2.1' into omaha_14.2.1
...
Former-commit-id: da2d7fc334
[formerly 068297b90a
] [formerly 92232fa063
] [formerly da2d7fc334
[formerly 068297b90a
] [formerly 92232fa063
] [formerly 40b543f9a8
[formerly 92232fa063
[formerly 81f446dbc2ae8f8c54cba5b29ed57f113d318160]]]]
Former-commit-id: 40b543f9a8
Former-commit-id: a94f800324
[formerly 4d1fbf8743
] [formerly b74d7aa4530a565aa9b8f8596b6981c8ead91adb [formerly f992a6b046
]]
Former-commit-id: 0b70d2b7739772b630136c56408866dc53a2bdcd [formerly ea01373320
]
Former-commit-id: e29b96b6bd
2014-03-07 15:16:18 -06:00
Brian.Dyke
15a5404df3
Merge branch 'ncep_14.2.1' of /data/Integration/winterfell-build/vlab/AWIPS2_Dev_Baseline into master_14.2.1
...
Former-commit-id: 92bff38059
[formerly 48cc3b6c55
] [formerly 3ac2a61218
] [formerly 92bff38059
[formerly 48cc3b6c55
] [formerly 3ac2a61218
] [formerly 1fe5504d4c
[formerly 3ac2a61218
[formerly 8b6d5b889e652cbf82c66ae831c9c116626c1494]]]]
Former-commit-id: 1fe5504d4c
Former-commit-id: 1f7e61b3df
[formerly 48f1f544d6
] [formerly a7d6f4f47c9df94b8ae88988530dc06d80b92b0a [formerly 0c4b9469b0
]]
Former-commit-id: abc0a250d76460ad95e9e08c0cae29d6d481bfd2 [formerly 795c5424cb
]
Former-commit-id: d9f1b98ce7
2014-03-07 11:50:06 -05:00
Steve Harris
a19beb1e5d
Merge branch 'master_14.1.1' (-21) into 'master_14.2.1' (-8)
...
merge performed by Richard Peter
Conflicts:
cave/build/static/common/cave/etc/gfe/userPython/procedures/MergeHazards.py
cave/build/static/common/cave/etc/gfe/userPython/utilities/SmartScript.py
edexOsgi/build.edex/esb/conf/log4j-ingest.xml
edexOsgi/build.edex/esb/conf/log4j-registry.xml
edexOsgi/build.edex/esb/conf/log4j.xml
edexOsgi/com.raytheon.edex.plugin.airep/res/spring/airep-ingest.xml
edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-common.xml
edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-request.xml
edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-spring.xml
edexOsgi/com.raytheon.edex.plugin.grib/res/spring.deprecated/grib-decode.xml
edexOsgi/com.raytheon.edex.plugin.grib/res/spring.future/grib-decode.xml
edexOsgi/com.raytheon.edex.plugin.grib/res/spring/grib-distribution.xml
edexOsgi/com.raytheon.edex.plugin.modelsounding/res/spring/modelsounding-ingest.xml
edexOsgi/com.raytheon.edex.plugin.pirep/res/spring/pirep-ingest.xml
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/alarms/AlertalarmStdTextProductUtil.java
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/alarms/Constants.java
edexOsgi/com.raytheon.edex.plugin.taf/src/com/raytheon/edex/plugin/taf/common/ChangeGroup.java
edexOsgi/com.raytheon.edex.plugin.taf/src/com/raytheon/edex/plugin/taf/common/TafRecord.java
edexOsgi/com.raytheon.edex.plugin.warning/res/spring/warning-ingest.xml
edexOsgi/com.raytheon.uf.common.jms/src/com/raytheon/uf/common/jms/JmsPooledConnectionFactory.java
edexOsgi/com.raytheon.uf.common.jms/src/com/raytheon/uf/common/jms/JmsPooledSession.java
edexOsgi/com.raytheon.uf.edex.cpgsrv/res/spring/cpgsrv-spring.xml
edexOsgi/com.raytheon.uf.edex.grid.staticdata/res/spring/grid-staticdata-process.xml
edexOsgi/com.raytheon.uf.edex.ohd/res/spring/ohd-common.xml
edexOsgi/com.raytheon.uf.edex.ohd/res/spring/satpre-spring.xml
ncep/gov.noaa.nws.ncep.common.dataplugin.nctaf/src/gov/noaa/nws/ncep/common/dataplugin/nctaf/NcTafRecord.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.ncairep/res/spring/ncairep-ingest.xml
ncep/gov.noaa.nws.ncep.edex.plugin.ncccfp/res/spring/ncccfp-ingest.xml
ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/res/spring/ncgrib-distribution.xml
ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/res/spring/ncgrib-ingest.xml
ncep/gov.noaa.nws.ncep.edex.plugin.ncpirep/res/spring/ncpirep-ingest.xml
ncep/gov.noaa.nws.ncep.edex.plugin.ncscat/res/spring/ncscat-ingest.xml
ncep/gov.noaa.nws.ncep.edex.plugin.ntrans/res/spring/ntrans-ingest.xml
rpms/awips2.core/Installer.ant/scripts/profile.d/awips2Ant.csh
Former-commit-id: 52226061e9
[formerly 3ba28aabea
] [formerly 069093884f
] [formerly 52226061e9
[formerly 3ba28aabea
] [formerly 069093884f
] [formerly ffcc34f8d4
[formerly 069093884f
[formerly 889200c9eb3fbb835f8fef067476799f30a7a7e0]]]]
Former-commit-id: ffcc34f8d4
Former-commit-id: d2a6b0c18b
[formerly 587f15a95d
] [formerly 075449ff82fabd2fc67648dd472bd7d35adee380 [formerly 96658d8ce0
]]
Former-commit-id: 988fe07191d81cd8942573f69248d26d68d20315 [formerly 36a0533f19
]
Former-commit-id: 2db5dcf6eb
2014-03-06 08:39:43 -06:00
Steve Harris
b7bde83b40
Merge branch 'master_14.2.1' into ncep_14.2.1
...
Former-commit-id: 18ae41769e
[formerly 1a666f9f71
] [formerly 167ce61d6c
] [formerly 18ae41769e
[formerly 1a666f9f71
] [formerly 167ce61d6c
] [formerly 4b01c57c0a
[formerly 167ce61d6c
[formerly 505bcf7b47aac1344bb46bac690ce83591b8e554]]]]
Former-commit-id: 4b01c57c0a
Former-commit-id: 8dcd31be32
[formerly 12d8ff2fce
] [formerly 6f64a4f733692a35b9219e001f7c17834f34eb7c [formerly 6e361c0a57
]]
Former-commit-id: b13ffe319da176594078f6a0b2c43783b9cba1cd [formerly b00cecc2ab
]
Former-commit-id: 86476b5064
2014-03-05 13:00:23 -06:00
Max Schenkelberg
7c66cf792b
Issue #2861 Rewrote HierarchicalPreferenceStore to be more efficient and thread safe when reading values.
...
Amend: Added comments and cleaned up preference store
Change-Id: Iac708c0988fc1b8f552d3bccf76b1706d6324b8d
Former-commit-id: dbc6cc3fc6
[formerly 59434c8a60
] [formerly a01a6d68d0
] [formerly dbc6cc3fc6
[formerly 59434c8a60
] [formerly a01a6d68d0
] [formerly cbf8b9249c
[formerly a01a6d68d0
[formerly cc34e3dbebe13ec4f63b7529f5053391135837ef]]]]
Former-commit-id: cbf8b9249c
Former-commit-id: d85fd52c26
[formerly 39e1c4fa46
] [formerly d886f6a0f4f81e75f3b006fbf72cebc9033f58c2 [formerly 654da3c0a2
]]
Former-commit-id: 22a289abbef9ce66bd6d9f68b9610a2b65dc9258 [formerly f509321134
]
Former-commit-id: c6cf08db73
2014-03-04 09:23:36 -06:00
Brian Clements
dbb33ceac2
Issue #2667 fixed bin lightning menus
...
the column name for the source of the lightning data was changed
Former-commit-id: dedd9e80ed
[formerly 5d21675a91
] [formerly 91936beadf
] [formerly dedd9e80ed
[formerly 5d21675a91
] [formerly 91936beadf
] [formerly 7a7d476899
[formerly 91936beadf
[formerly 62e8a279840672f1ee2bb9f3ecf982c80a04d83c]]]]
Former-commit-id: 7a7d476899
Former-commit-id: 472d08d2ad
[formerly bf4c119278
] [formerly dbc2261d04afbbeaa80308981a4752188bec6977 [formerly 724bafd44f
]]
Former-commit-id: fcbaab390c314bd0db75b372cf855bd45a12a942 [formerly dc8667011b
]
Former-commit-id: 44fdea985e
2014-03-03 13:17:05 -06:00
Richard Peter
ef2ff1d0f7
Merge branch 'omaha_14.2.1' (14.2.1-8) into development
...
Conflicts:
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/localization/LocalizationManager.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/ui/zoneselector/ZoneSelectorResource.java
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/GeneralGridData.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.edex.plugin.textlightning/src/com/raytheon/edex/plugin/textlightning/impl/TextLightningParser.java
edexOsgi/com.raytheon.uf.common.comm/src/com/raytheon/uf/common/comm/HttpClient.java
edexOsgi/com.raytheon.uf.common.dataaccess/src/com/raytheon/uf/common/dataaccess/response/GridResponseData.java
edexOsgi/com.raytheon.uf.common.dataaccess/src/com/raytheon/uf/common/dataaccess/util/PDOUtil.java
edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth.ncf/src/com/raytheon/uf/edex/datadelivery/bandwidth/sbn/SbnSimulator.java
Change-Id: Ia74f80ced9091ff0497ccc6d93e876b5a9807f75
Former-commit-id: 79d3aa4e1a
[formerly 7bd6a07913
] [formerly 0e25ae35c1
] [formerly 79d3aa4e1a
[formerly 7bd6a07913
] [formerly 0e25ae35c1
] [formerly 1c150e6e8b
[formerly 0e25ae35c1
[formerly a47eaa9af45db41391fe46e36ec0793f70d06ad6]]]]
Former-commit-id: 1c150e6e8b
Former-commit-id: 1d6e9816e0
[formerly 50a1b270c5
] [formerly 23c2e13876eeacd0c485ad3110006f8bd36a537c [formerly f13c86bc3e
]]
Former-commit-id: 1916128dada6d785b45f3c66eda571278ddb03d7 [formerly 9b3f8f9649
]
Former-commit-id: 5fab51d41b
2014-02-27 15:18:26 -06:00
Richard Peter
7f36cf564b
Issue #2509 : Fix Merge of 13.5.2-4 ncep resources
...
Change-Id: I9ed15a3114d07a210795cd26e3096a8cddd548d3
Former-commit-id: 63da19f472
[formerly c267c5a08f
] [formerly 86d42ed603
] [formerly 63da19f472
[formerly c267c5a08f
] [formerly 86d42ed603
] [formerly 862069dfd3
[formerly 86d42ed603
[formerly 08990cfd910707cbf1731a8f271a52ff922a6345]]]]
Former-commit-id: 862069dfd3
Former-commit-id: 9f43d8e4b2
[formerly 237ada7b8b
] [formerly 2ae63270ca0112aca619a0c7564fa8a1154ef4f9 [formerly c0d495d9c3
]]
Former-commit-id: 1a965b16ce71e4ece17a9ac8efbc506a1d823b59 [formerly 9489565efb
]
Former-commit-id: 68eade49a2
2014-02-27 13:46:47 -06:00
Brian.Dyke
de9e6553a9
OB_14.1.1-19 baseline
...
Former-commit-id: 3508e488f5
[formerly 779553142c
] [formerly cfa4997978
] [formerly 3508e488f5
[formerly 779553142c
] [formerly cfa4997978
] [formerly 10b723647b
[formerly cfa4997978
[formerly db2a591456383d8f980d33757e8c161bdcc01d3a]]]]
Former-commit-id: 10b723647b
Former-commit-id: 5a11fbbfdb
[formerly c41dd22ff2
] [formerly f52dfb462cf92e04bf51f942fd80bfc621074563 [formerly 64044e7ce5
]]
Former-commit-id: 8cf9beeb99ea9f03c45e09f6c11fba57ddab3585 [formerly 1b359c2564
]
Former-commit-id: f86f9f8918
2014-02-21 06:50:59 -05:00
Ron Anderson
41a6f52eff
Issue #2819 Removed more unnecessary .clone() calls
...
Change-Id: I6924801040b238354527edfd57b4a3999f844617
Former-commit-id: 5f3248574f
[formerly 663cb4cb62
] [formerly 5258aecf45
] [formerly 5f3248574f
[formerly 663cb4cb62
] [formerly 5258aecf45
] [formerly 419e9d0b8d
[formerly 5258aecf45
[formerly ce896b573fcef99e30e3bda5f53b0941cd1b2e36]]]]
Former-commit-id: 419e9d0b8d
Former-commit-id: 84bea14340
[formerly 908e43039e
] [formerly ba993f1f22c77f61f4ea6ed8c28039e69d6a34b2 [formerly 8a41723ba6
]]
Former-commit-id: a122ae5f46b63941580c026c45106c52001929d6 [formerly b0a4b63689
]
Former-commit-id: e91fd1d683
2014-02-19 11:55:11 -06:00
Greg Armendariz
8a8127ab0c
Issue #2754 - Fix import
...
Former-commit-id: 11db377bf8
[formerly 5490e216be
] [formerly e611dbe912
] [formerly 11db377bf8
[formerly 5490e216be
] [formerly e611dbe912
] [formerly 2e79658417
[formerly e611dbe912
[formerly 1c9160bd5fe0e8c08ead5a67d9da426834a7669c]]]]
Former-commit-id: 2e79658417
Former-commit-id: 4cc403c2e7
[formerly 744c6fd9b1
] [formerly 7f15c3386a71f2f598d58c1cb6cc6594a4e6792d [formerly 23f17b3f63
]]
Former-commit-id: 0b20dae07d945ca03185d36e38562999d99055f7 [formerly ac169b4f24
]
Former-commit-id: e47453df3b
2014-02-03 14:45:47 -06:00
Stephen Gilbert
c13f9333a0
VLab Issue #2916 - NSHARP Errors Swapping into main pane
...
Fixed some widget management errors in the Show Text dialog's close
method. Ensure Text Dislog's close method is called when swapping
Nsharp display.
Change-Id: I6e645aa552980b49e552a2830f9f148d95f27f3b
Former-commit-id: 5b447b3861
[formerly d849e051c8
] [formerly ba72d87f07
] [formerly 5b447b3861
[formerly d849e051c8
] [formerly ba72d87f07
] [formerly 3f6c7ef92c
[formerly ba72d87f07
[formerly 0ff12f2c322d9cbed696f9ee4f2049d9efed7863]]]]
Former-commit-id: 3f6c7ef92c
Former-commit-id: e8ba3c7e61
[formerly 838a8e4faa
] [formerly 792d509298c3b21bbd4b328b20b94425de1790d8 [formerly 323eeb31c9
]]
Former-commit-id: 600b0e7e1ca25aab2ffe37f80a32a6ca264bcc5b [formerly e4c1561c19
]
Former-commit-id: df9518ae2b
2014-02-03 14:55:25 -05:00
Steve Harris
95a936e9dc
Merge branch 'omaha_14.2.1' into development
...
Conflicts:
ncep/gov.noaa.nws.ncep.viz.ui.perspectives/plugin.xml
Former-commit-id: f1a9ec2d1e
[formerly ae2b849157
] [formerly 7a156e297a
] [formerly f1a9ec2d1e
[formerly ae2b849157
] [formerly 7a156e297a
] [formerly 7b59bd41eb
[formerly 7a156e297a
[formerly debbd62a40cf8d27b1990d1b06f273d09dd9a981]]]]
Former-commit-id: 7b59bd41eb
Former-commit-id: 116d836ab3
[formerly 4a379aa6e5
] [formerly 675dc12528eb749e423c405fa15dbe8b66201362 [formerly aa9b488963
]]
Former-commit-id: 0dd75fee1d6fbdae1f20d879a1069b131d9cd16f [formerly b9af02c0b3
]
Former-commit-id: e6cab2a902
2014-02-03 10:29:16 -06:00
Steve Harris
b016112b8f
Merge branch 'master_14.2.1' into omaha_14.2.1
...
Former-commit-id: ab0609007c
[formerly 131af8538e
] [formerly b2032880ac
] [formerly ab0609007c
[formerly 131af8538e
] [formerly b2032880ac
] [formerly eb9d4319dc
[formerly b2032880ac
[formerly 9133aeccd450b0e241953c588192c2ee33fcbe8e]]]]
Former-commit-id: eb9d4319dc
Former-commit-id: ae4332665e
[formerly 6883c64744
] [formerly 66f652cd9d2fbc7c64872d432745217d602f2015 [formerly 33aea09906
]]
Former-commit-id: 538ff84c8a7daabd62a35c1ea90e3f4c3651fc70 [formerly d8989145ac
]
Former-commit-id: 08700a77b1
2014-02-03 10:26:11 -06:00
Brian.Dyke
4deb06cc50
Merge branch 'omaha_14.2.1' of cm2:/home/slharris/repos/AWIPS2_baseline.14.2.1 into master_14.2.1
...
Former-commit-id: 8b06bfd2f9
[formerly 89b824b846
] [formerly 4e7b1b207f
] [formerly 8b06bfd2f9
[formerly 89b824b846
] [formerly 4e7b1b207f
] [formerly 40ce5ccc2a
[formerly 4e7b1b207f
[formerly 0409f7045a797c8c051a353d69de1991b8c8b681]]]]
Former-commit-id: 40ce5ccc2a
Former-commit-id: 1f222c489d
[formerly 3fd2ef82ab
] [formerly f0782f5fb1a9ed0a419e5942875e692fbf816d81 [formerly dd183bc0e9
]]
Former-commit-id: 7e826c4c3fd87de1a5c5fc4057ef18e6c2819ffe [formerly df55ab5503
]
Former-commit-id: a540be3064
2014-01-31 08:28:09 -05:00
Stephen Gilbert
8e70fc371e
VLab Issue #2867 - Remove dependency on Mcidas dataplugin
...
Removed the dependency for mcidas dataplugin. The ncep feature
dependencies don't allow for that causing an error in the build scripts.
Change-Id: I9cccc6d93158465f54cb0d9db0e57b16604e1d09
Former-commit-id: 17598bc377
[formerly beaee1eaf0
] [formerly c9af367a72
] [formerly 17598bc377
[formerly beaee1eaf0
] [formerly c9af367a72
] [formerly 0e96169b6f
[formerly c9af367a72
[formerly 0fa8b0ae9f21df9a1d773edd7e997151c6db9c8f]]]]
Former-commit-id: 0e96169b6f
Former-commit-id: bad69bc7e1
[formerly e0e74ad5fd
] [formerly b1f331f4a7e0b7dacbc9abc9350a207b7d9b3eac [formerly 71e8735fdf
]]
Former-commit-id: df5950ccef02530cec5110e181a176e1490ff078 [formerly f5327455c3
]
Former-commit-id: e60e1873c0
2014-01-29 09:58:10 -05:00
Stephen Gilbert
ec4d735498
VLab Issue #2867 - Add dependency for Mcidas dataplugin
...
Don't like it, but added a dependency for mcidas dataplugin to the
gov.noaa.nws.ncep.vix.common plugin.
Change-Id: Ie8aff1c3ae1733191cb74b7dc0c4593bb37ca28b
Former-commit-id: d19279fbab
[formerly e60635f47d
] [formerly ac68b01bbc
] [formerly d19279fbab
[formerly e60635f47d
] [formerly ac68b01bbc
] [formerly f21b0f5d82
[formerly ac68b01bbc
[formerly 61c5dce6e5ee16d776bcac2740ddf4e860fbb40f]]]]
Former-commit-id: f21b0f5d82
Former-commit-id: cbf5fd5372
[formerly 29ca14c4b7
] [formerly e88492cf6e3b7e15e084b09596f70de340b6008e [formerly 486096ada2
]]
Former-commit-id: 6a2f8151cb7e1256817c6b8baaf36f96dd1e7fa8 [formerly fb46c34d1c
]
Former-commit-id: 39c149a747
2014-01-28 14:52:46 -05:00
Stephen Gilbert
d55a30413e
Merge "VLab Issue #2867 - NCEP CAVE plugin delivery for 14.2.1" into ncep_14.2.1
...
Former-commit-id: 90917307fb
[formerly 312a09983a
] [formerly 64c2460028
] [formerly 90917307fb
[formerly 312a09983a
] [formerly 64c2460028
] [formerly 1af8bfa176
[formerly 64c2460028
[formerly b928cda17148473922bcd3ad11e33cc93c1e37c3]]]]
Former-commit-id: 1af8bfa176
Former-commit-id: 7607cd015b
[formerly 7f3e8b5c21
] [formerly 4713e121a372bd9e590289df0e094c3f4646818c [formerly d62a9f3b08
]]
Former-commit-id: e37e62740f5ac23fd6116df99c13fa498b772dd0 [formerly 05655af06b
]
Former-commit-id: 202f929a5f
2014-01-27 14:23:02 -05:00
Stephen Gilbert
2b65be7c31
Merge "VLab Issue #2867 - NCEP CAVE plugin delivery for 14.2.1" into ncep_14.2.1
...
Former-commit-id: ef9b4279bc
[formerly a7ce764b19
] [formerly a70450b064
] [formerly ef9b4279bc
[formerly a7ce764b19
] [formerly a70450b064
] [formerly bf7fcc1952
[formerly a70450b064
[formerly 2989403fe879801729b1233a54cd5ea314bb2dae]]]]
Former-commit-id: bf7fcc1952
Former-commit-id: 7ae8c668c6
[formerly 48aeec0c17
] [formerly beb85c45aff9872eb3c656babb7195987348c330 [formerly 3a3f8a7be0
]]
Former-commit-id: 1ddc083427fcb030b06255db392d49e39e56b254 [formerly f39c9fdaa4
]
Former-commit-id: 21dea78fde
2014-01-27 14:22:17 -05:00
Stephen Gilbert
ea7563f109
Merge "VLab Issue #2866 - EDEX and EDEX Common delivery for 14.2.1" into ncep_14.2.1
...
Former-commit-id: 7383aa8502
[formerly 53fa8822e0
] [formerly 6785474b17
] [formerly 7383aa8502
[formerly 53fa8822e0
] [formerly 6785474b17
] [formerly b64adbed81
[formerly 6785474b17
[formerly 57ce64e6119d2bf540da80c1161b88b04474d53c]]]]
Former-commit-id: b64adbed81
Former-commit-id: 023ac1960f
[formerly 511123b38c
] [formerly 9726e54239f843bd384b3ad71761a58541ba9389 [formerly d947a0e7c1
]]
Former-commit-id: cfa23f5e70f04398b69beec17e564d605fac6509 [formerly 4cd6847849
]
Former-commit-id: f7c1bee352
2014-01-27 14:20:47 -05:00
Stephen Gilbert
b52d0bc459
VLab Issue #2867 - NCEP CAVE plugin delivery for 14.2.1
...
Many changes in NCEP Viz plugins for 14.2.1 enhancements and big fixes
for the National Centers Perspective and PGEN
Change-Id: I4fa707cf0844800a4c77961e110338daafbb0354
Former-commit-id: 01f013e2d0
[formerly e1d16e1aeb
] [formerly 14d218ddc5
] [formerly 01f013e2d0
[formerly e1d16e1aeb
] [formerly 14d218ddc5
] [formerly 369d2592fe
[formerly 14d218ddc5
[formerly e3a35c9c3eb2184818b21ba1b23aac988a0148ee]]]]
Former-commit-id: 369d2592fe
Former-commit-id: 1bb9e4c3e4
[formerly 405cdee1ca
] [formerly cbeb097387af8cc564bfd909a4840579c3c07c47 [formerly 6480693089
]]
Former-commit-id: d7a18e7961e4f977446c1916d8722f1551e40297 [formerly f78b216bcd
]
Former-commit-id: 7a3a3de048
2014-01-24 10:46:37 -05:00
Stephen Gilbert
8b907d592c
VLab Issue #2867 - NCEP CAVE plugin delivery for 14.2.1
...
Updates to configuration files used by the National Centers Perspective
Change-Id: Ie2c8c4f8d0eb57031fb25acbe450b6e3ac56c109
Former-commit-id: 688690ea97
[formerly 4b28ca1baf
] [formerly 95bbc2f2b2
] [formerly 688690ea97
[formerly 4b28ca1baf
] [formerly 95bbc2f2b2
] [formerly 10a718853d
[formerly 95bbc2f2b2
[formerly 12d9868db2939c53ed49b1cf3092f7d638189696]]]]
Former-commit-id: 10a718853d
Former-commit-id: 445c082c6a
[formerly f65b0ab7fe
] [formerly 534ee8af4b6cac013a0164544170fe9a9cdf1bec [formerly 2432ca3a04
]]
Former-commit-id: 634b91108adfbb09290b923d0610e616ed059aed [formerly 8018ae86f7
]
Former-commit-id: 436332a951
2014-01-24 10:33:14 -05:00
Stephen Gilbert
f62797e088
VLab Issue #2866 - EDEX and EDEX Common delivery for 14.2.1
...
Updates to GRIB decoder tables.
Changes to some decoder plugins to support data ingest through qpid.
Change-Id: Id42e993b1ac76040ad19c970c43036d3f852def0
Former-commit-id: e64020e271
[formerly 185f06495f
] [formerly a12b83ddfb
] [formerly e64020e271
[formerly 185f06495f
] [formerly a12b83ddfb
] [formerly 2bd1588ad4
[formerly a12b83ddfb
[formerly f64ce96da2871e55b40b6fe4ba0e77eaed266103]]]]
Former-commit-id: 2bd1588ad4
Former-commit-id: 2e2034bb1d
[formerly 081ef1a246
] [formerly ed33756c50a2ab718a474d22ed268e2af3dd027b [formerly cfa9fdb6cf
]]
Former-commit-id: 8112316f71b8de964aa381a2f1d759b4e42d961e [formerly 6ef117ac7d
]
Former-commit-id: e75a572abf
2014-01-24 10:14:17 -05:00
Stephen Gilbert
1916e8532c
Merge "VLab Issue #2841 - SWPC delivery for 14.2.1" into ncep_14.2.1
...
Former-commit-id: ca2016cb72
[formerly e49e5d406f
] [formerly b9eefb97b4
] [formerly ca2016cb72
[formerly e49e5d406f
] [formerly b9eefb97b4
] [formerly bae1844e81
[formerly b9eefb97b4
[formerly 015664232a6214feb624262196e45aadc8ee4636]]]]
Former-commit-id: bae1844e81
Former-commit-id: d30d723cc3
[formerly a468328a3e
] [formerly e100d8460661b67f275541169a79b8fa253a1a9b [formerly 935eebbb2a
]]
Former-commit-id: 1d614a5e466e82a45972d405471ab8b23b8d061a [formerly cdeffde325
]
Former-commit-id: 27e600f90b
2014-01-23 17:12:28 -05:00
Stephen Gilbert
80ca139a7b
VLab Issue #2841 - SWPC delivery for 14.2.1
...
Contains functionality for image calculations such
as differencing and ratios.
Also includes config files for displaying SWPC gridded terrestrial data.
Amending commit to address code-review concerns with some java classes.
Change-Id: I3e6e8dbd5015ef825386c1203c333091c6a24f25
Former-commit-id: f841786213
[formerly 90a5cf53d3
] [formerly e02136a026
] [formerly f841786213
[formerly 90a5cf53d3
] [formerly e02136a026
] [formerly f0f1a832c7
[formerly e02136a026
[formerly 5823fba56ae3036682814548004afd076174bb06]]]]
Former-commit-id: f0f1a832c7
Former-commit-id: 3d70db144f
[formerly 0c053a145b
] [formerly 94129f483f09e5269c4bcaed7df0cc11fee8fd8f [formerly 25ad64175c
]]
Former-commit-id: 51d88b7968dbe16f577ea62d0699b46d048806b3 [formerly a8426c759b
]
Former-commit-id: 14b5ceaa17
2014-01-23 11:58:55 -05:00
Nate Jensen
fb2b766513
Merge "Issue #2312 Add ability to export gif and image export dialog. Change-Id: I10aaeba20a4acc7888cd566107ffff3e6a4fad05" into development
...
Former-commit-id: b8fd9afeca
[formerly 1f5a26dc30
] [formerly e2f9e86659
] [formerly b8fd9afeca
[formerly 1f5a26dc30
] [formerly e2f9e86659
] [formerly 738c70e8ea
[formerly e2f9e86659
[formerly 8c8215778f5e37dfa4ec2df000db90f1193107ac]]]]
Former-commit-id: 738c70e8ea
Former-commit-id: 438afc8ddf
[formerly 96ad72aa9e
] [formerly f1d07570e73e9dfb9bf87e2e898ca0f0586aadff [formerly 10f9feddba
]]
Former-commit-id: b2dea7c83c6d1de985f1b4598ccc72711b55517f [formerly db7e3f7368
]
Former-commit-id: 91396bb5a7
2014-01-22 09:36:33 -06:00
Ben Steffensmeier
65aa3c40b4
Issue #2312 Add ability to export gif and image export dialog.
...
Change-Id: I10aaeba20a4acc7888cd566107ffff3e6a4fad05
Former-commit-id: 7a8c934c5c
[formerly b70faf1f7d
] [formerly fc1c56f9cb
] [formerly 7a8c934c5c
[formerly b70faf1f7d
] [formerly fc1c56f9cb
] [formerly 4ad4b4a859
[formerly fc1c56f9cb
[formerly e2159c422ca93aa76c6ba7a30a09234e8f9da4ce]]]]
Former-commit-id: 4ad4b4a859
Former-commit-id: b7cdcc757c
[formerly cd295e4172
] [formerly e898590f6488b3cb1f76a669ff09fbe8f3b22604 [formerly 8b2e5a06bc
]]
Former-commit-id: 76e237cf9830a546563213b73950004196e1a1d8 [formerly 7d083a08c5
]
Former-commit-id: 9a87e95aac
2014-01-21 18:09:13 -06:00
Steve Harris
0a5772e795
Merge branch 'omaha_14.2.1' into development
...
Conflicts:
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/perspective/GFEPerspectiveManager.java
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/GeneralGridData.java
cave/com.raytheon.viz.product.awips/awips.product
edexOsgi/com.raytheon.uf.edex.plugin.fssobs/src/com/raytheon/uf/edex/plugin/fssobs/FSSObsUtils.java
edexOsgi/com.raytheon.uf.edex.pointdata/src/com/raytheon/uf/edex/pointdata/PointDataPluginDao.java
Former-commit-id: 56f5ae9f48
[formerly a465718a0d
] [formerly 24ab7cff49
] [formerly 56f5ae9f48
[formerly a465718a0d
] [formerly 24ab7cff49
] [formerly 69dc3d835b
[formerly 24ab7cff49
[formerly 2d255c9772a017e84b0d1b4b42cdc5de8fd53b90]]]]
Former-commit-id: 69dc3d835b
Former-commit-id: 6cb92b1f57
[formerly b62efa9387
] [formerly 24faa7a52a1fc22725c96c64ac33b0850b177a02 [formerly 252c7ee40a
]]
Former-commit-id: 800d6b432a0b97ae5f3b770d37e08ca17eb7e05a [formerly 2a967fc9b5
]
Former-commit-id: 69626ab704
2014-01-21 12:36:54 -06:00
Richard Peter
5d077eeb6f
Issue #2724 : Fix Airep/Pirep Autoboxing NPE
...
Change-Id: Ieb2823dc220daf4d77a071ba8baaf3831957bd38
Former-commit-id: 1377205d2a
[formerly d831e8c692
] [formerly c6206fd6a8
] [formerly 1377205d2a
[formerly d831e8c692
] [formerly c6206fd6a8
] [formerly 57f6096833
[formerly c6206fd6a8
[formerly cbdaaf4d6e28d7001df205ffb7d8d2d56bacd35f]]]]
Former-commit-id: 57f6096833
Former-commit-id: f759bef6c7
[formerly ee5fce8be6
] [formerly 475cd6c235c1c72aec40bf5bd60d2e54fb7720f5 [formerly d372cf80f9
]]
Former-commit-id: 08986df14f41c2850e2e733a0b1b93b3ced307e5 [formerly 593d58322c
]
Former-commit-id: 17cf9406ad
2014-01-21 11:26:30 -06:00
Nate Jensen
0d56221fc4
Issue #2359 fix ncep pirep decoding null pointer
...
Change-Id: Id255abcda2d8c661ce8d7d0b022addc69f7635ea
Former-commit-id: 104f88b3ea
[formerly 7961052b41
] [formerly 8f10f7e17253afdeb7f5bf63926d2f2ec0f33fcf [formerly 7f7f05b8ba
]] [formerly 104f88b3ea
[formerly 7961052b41
] [formerly 8f10f7e17253afdeb7f5bf63926d2f2ec0f33fcf [formerly 7f7f05b8ba
]] [formerly 5a860252ad
[formerly 7f7f05b8ba
[formerly 5f554ec21fcedc7f8ef5b3b00fc951527bb424bb]]]]
Former-commit-id: 5a860252ad
Former-commit-id: d2b3488271
[formerly 4b570ada33
] [formerly f33cec7c56fa3bc29a69437e8a4601464274ccd0 [formerly c0d49c4b24
]]
Former-commit-id: 0796cbea90a22e6db4cb7d418444aeec5aef611f [formerly 6809d67737
]
Former-commit-id: 283bcf652f
2014-01-20 13:11:36 -06:00
Steve Harris
f8496662a0
Merge branch 'master_14.2.1' into omaha_14.2.1
...
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/IFPGridDatabase.java
Former-commit-id: 002b2492ac
[formerly 5fcccbff1b
] [formerly 454d557884
] [formerly 002b2492ac
[formerly 5fcccbff1b
] [formerly 454d557884
] [formerly 9371eeeee0
[formerly 454d557884
[formerly cf9f10b2e5a4038dce0003a1c0a4f227335d5db4]]]]
Former-commit-id: 9371eeeee0
Former-commit-id: 9843517cb3
[formerly 7ea285c48b
] [formerly 54d4fab62b427e6be3f978f3502c7e059e776520 [formerly 0ba307d616
]]
Former-commit-id: 656727c4e55c34f4fb4a1128b81b68286b1e7757 [formerly b5f7f35ccb
]
Former-commit-id: ccd2f6cdaa
2014-01-20 10:17:44 -06:00
Nate Jensen
c1ac49fe5b
Issue #2359 fix annoying ncep null pointer
...
Change-Id: I5d606f42bfe4060f8874d2cfaf01a48b548ce25e
Former-commit-id: 9d7eb95eac
[formerly f46b6e0a8f
] [formerly c7addfbdbf
] [formerly 9d7eb95eac
[formerly f46b6e0a8f
] [formerly c7addfbdbf
] [formerly fa79f2aa14
[formerly c7addfbdbf
[formerly 0cb0975786aa578e93fe06227c666feb759e0433]]]]
Former-commit-id: fa79f2aa14
Former-commit-id: 270b3afecd
[formerly 09bc3382d6
] [formerly 4cdae6e45ee095c11e9c313188a44bdfc245a4a2 [formerly 012ee681e5
]]
Former-commit-id: 9817d241e0739dcf5be66438fccf4b695fe75a76 [formerly f00fb13946
]
Former-commit-id: 0e7647cdc6
2014-01-17 10:24:10 -06:00
Ron Anderson
f33f5aec85
Merge branch 'master_14.1.1' into solutions
...
Conflicts:
cave/com.raytheon.uf.viz.xy.crosssection/src/com/raytheon/uf/viz/xy/crosssection/rsc/CrossSectionVectorResource.java
cave/com.raytheon.uf.viz.xy.timeseries/META-INF/MANIFEST.MF
cave/com.raytheon.uf.viz.xy.varheight/META-INF/MANIFEST.MF
cave/com.raytheon.uf.viz.xy.varheight/src/com/raytheon/uf/viz/xy/varheight/rsc/VarHeightResource.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/DataManager.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/GFEResource.java
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/GeneralGridData.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParmManager.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/IFPGridDatabase.java
edexOsgi/com.raytheon.uf.edex.archive/utility/common_static/base/archiver/purger/PROCESSED_DATA.xml
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/dao/CoreDao.java
Change-Id: I8c5fabf90d864db89a0db7d5f3f6f54c1e5f44a5
Former-commit-id: 2e8cbade9f
[formerly 0bde38cef3
] [formerly ba7a25a88f
] [formerly 2e8cbade9f
[formerly 0bde38cef3
] [formerly ba7a25a88f
] [formerly 62c445d872
[formerly ba7a25a88f
[formerly 9f121ec921a2f8635c48f005ddb71787ad6bf166]]]]
Former-commit-id: 62c445d872
Former-commit-id: 46735c9afe
[formerly dca7f21f7b
] [formerly 7dfb50efe6365a72db2ee0a724484df4f74fef25 [formerly 624375267e
]]
Former-commit-id: 550b8ecf890edc1befc4cc61d160811052a5c599 [formerly 5076217d8f
]
Former-commit-id: 77c132f706
2014-01-13 17:45:20 -06:00
Nate Jensen
a9961219b3
Issue #2359 prevent obnoxious ncep decoder null pointer exceptions
...
Change-Id: I731614a8a6c9ec38bb6c1b29c4d9f6ca5a7c03d7
Former-commit-id: 79e387fc94
[formerly 52293fd154
] [formerly 2c0e3f05ca
] [formerly 79e387fc94
[formerly 52293fd154
] [formerly 2c0e3f05ca
] [formerly e509a2883f
[formerly 2c0e3f05ca
[formerly 514d0cfecd3eb8c81a6d2120406225856d964c9e]]]]
Former-commit-id: e509a2883f
Former-commit-id: 7371990c29
[formerly de5d7565e2
] [formerly d150fe75866671138e7bd888dc3ce56b60f9a3c4 [formerly 488956a259
]]
Former-commit-id: 3d18784348fe8d2b3d591b1ee3f7582cd7f8177d [formerly bdf8ff8ad4
]
Former-commit-id: d9427f900f
2014-01-07 12:38:49 -06:00