Mark Peters
|
1342f67614
|
Omaha #3471 Replace Raytheon plugin calls to deprecated IGraphicsTarget.createShadedShape()
Change-Id: Iea874ecfa2c7f16eacdc7f097039ba20f10fc2b9
Former-commit-id: 88b334cf14 [formerly 22c077d77f [formerly 4bcf01e33f1d2e038499fdece63e81b6288b7152]]
Former-commit-id: 22c077d77f
Former-commit-id: 9be02c8dfe
|
2014-08-04 13:27:45 -05:00 |
|
Mark Peters
|
8d1732d0cf
|
Omaha #3471 Replace Raytheon plugin calls to deprecated IGraphicsTarget.createShadedShape()
Change-Id: Iea874ecfa2c7f16eacdc7f097039ba20f10fc2b9
Former-commit-id: 1342f67614 [formerly 9be02c8dfe] [formerly 22c077d77f] [formerly 1342f67614 [formerly 9be02c8dfe] [formerly 22c077d77f] [formerly 88b334cf14 [formerly 22c077d77f [formerly 4bcf01e33f1d2e038499fdece63e81b6288b7152]]]]
Former-commit-id: 88b334cf14
Former-commit-id: 8ccec2e2c8 [formerly 469f73cb43] [formerly 3dc8f434a87e7d966a11f8dc0dd83eee4a57069c [formerly 666c988f64]]
Former-commit-id: f178c14861fee90813e282109070e3d0703c6657 [formerly ca4003ca7f]
Former-commit-id: 7a4c25190e
|
2014-08-04 13:27:45 -05:00 |
|
Brian.Dyke
|
9abb02ea8a
|
Merge branch 'master_14.2.2' into master_14.3.1 CM-MERGE:14.2.2-17,-18,-19,-20,-21,-22,-23,-24 into 14.3.1
Conflicts:
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/RadarBiasTableDialog.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java
Former-commit-id: b209604e1f0d6e790980d0bc8f1760e38f448076
|
2014-08-04 13:10:13 -04:00 |
|
Brian.Dyke
|
590e37a8f2
|
Merge branch 'master_14.2.2' into master_14.3.1 CM-MERGE:14.2.2-17,-18,-19,-20,-21,-22,-23,-24 into 14.3.1
Conflicts:
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/RadarBiasTableDialog.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java
Former-commit-id: 270d2b0ddb [formerly 9abb02ea8a [formerly b209604e1f0d6e790980d0bc8f1760e38f448076]]
Former-commit-id: 9abb02ea8a
Former-commit-id: 301f3094be
|
2014-08-04 13:10:13 -04:00 |
|
Brian.Dyke
|
1d9494a502
|
Merge branch 'master_14.2.2' into master_14.3.1 CM-MERGE:14.2.2-17,-18,-19,-20,-21,-22,-23,-24 into 14.3.1
Conflicts:
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/RadarBiasTableDialog.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java
Former-commit-id: 590e37a8f2 [formerly 301f3094be] [formerly 9abb02ea8a] [formerly 590e37a8f2 [formerly 301f3094be] [formerly 9abb02ea8a] [formerly 270d2b0ddb [formerly 9abb02ea8a [formerly b209604e1f0d6e790980d0bc8f1760e38f448076]]]]
Former-commit-id: 270d2b0ddb
Former-commit-id: b9da27608c [formerly bbe6ec4d50] [formerly 4f6e23e0fe3a5044b75abe6a89c965ab32b19947 [formerly 37aacfcb96]]
Former-commit-id: ea25ca2fdedff8bbe1c901d0538886147f633e65 [formerly b9daa26f7d]
Former-commit-id: 803ceadaec
|
2014-08-04 13:10:13 -04:00 |
|
Brian.Dyke
|
3598f7b549
|
Merge branch 'asm_14.2.2' into master_14.2.2
Former-commit-id: 96ff2234e0d8893695b33a79d24a026a1a409073
|
2014-07-31 09:56:21 -04:00 |
|
Brian.Dyke
|
a9cf7e9951
|
Merge branch 'asm_14.2.2' into master_14.2.2
Former-commit-id: 905728d2fb [formerly 3598f7b549 [formerly 96ff2234e0d8893695b33a79d24a026a1a409073]]
Former-commit-id: 3598f7b549
Former-commit-id: eeca2f2ec8
|
2014-07-31 09:56:21 -04:00 |
|
Brian.Dyke
|
a395bc2a5a
|
Merge branch 'asm_14.2.2' into master_14.2.2
Former-commit-id: a9cf7e9951 [formerly eeca2f2ec8] [formerly 3598f7b549] [formerly a9cf7e9951 [formerly eeca2f2ec8] [formerly 3598f7b549] [formerly 905728d2fb [formerly 3598f7b549 [formerly 96ff2234e0d8893695b33a79d24a026a1a409073]]]]
Former-commit-id: 905728d2fb
Former-commit-id: d40310d407 [formerly 370b180653] [formerly cb0d54b6f5c9c825dfeb23dea6bf566569b45e86 [formerly e3745633a3]]
Former-commit-id: 5fff891aca335077a8aa0592db78791cd85164e7 [formerly f5030dfeb5]
Former-commit-id: 29bc56c37f
|
2014-07-31 09:56:21 -04:00 |
|
Shawn.Hooper
|
976c7b2d4a
|
ASM #15627 Revert "ASM #15627 - WarnGen leaving out reference to State that is under SVR or TOR Watch in SPS text products."
This reverts commit ba4c386f30 [formerly 00ec5e2d47809d084b3e24e1f1503af96d129fed].
Change-Id: Ie01ca9463a4db371ffce0b6e38d5c43e1f9addf2
Former-commit-id: d272d426f8bd218954a75a7b2e19d21b30f975cb
|
2014-07-30 14:03:51 -04:00 |
|
Shawn.Hooper
|
adcd4dfa64
|
ASM #15627 Revert "ASM #15627 - WarnGen leaving out reference to State that is under SVR or TOR Watch in SPS text products."
This reverts commit c71189dd92 [formerly e24dd6958e] [formerly ba4c386f30] [formerly 8cffe955a9 [formerly ba4c386f30 [formerly 00ec5e2d47809d084b3e24e1f1503af96d129fed]]].
Change-Id: Ie01ca9463a4db371ffce0b6e38d5c43e1f9addf2
Former-commit-id: 4e322737ce [formerly 976c7b2d4a [formerly d272d426f8bd218954a75a7b2e19d21b30f975cb]]
Former-commit-id: 976c7b2d4a
Former-commit-id: 27f50397aa
|
2014-07-30 14:03:51 -04:00 |
|
Shawn.Hooper
|
a774213fa9
|
ASM #15627 Revert "ASM #15627 - WarnGen leaving out reference to State that is under SVR or TOR Watch in SPS text products."
This reverts commit 9732ea69398c323fee2b61570bfc18ab595da709 [formerly 8cffe955a9] [formerly c71189dd92 [formerly e24dd6958e] [formerly ba4c386f30] [formerly c71189dd92 [formerly e24dd6958e] [formerly ba4c386f30] [formerly 8cffe955a9 [formerly ba4c386f30 [formerly 00ec5e2d47809d084b3e24e1f1503af96d129fed]]]]].
Change-Id: Ie01ca9463a4db371ffce0b6e38d5c43e1f9addf2
Former-commit-id: adcd4dfa64 [formerly 27f50397aa] [formerly 976c7b2d4a] [formerly adcd4dfa64 [formerly 27f50397aa] [formerly 976c7b2d4a] [formerly 4e322737ce [formerly 976c7b2d4a [formerly d272d426f8bd218954a75a7b2e19d21b30f975cb]]]]
Former-commit-id: 4e322737ce
Former-commit-id: 6388744d4f [formerly af19d9f9c4] [formerly 04fd2b332f2591e977341aaaa648d03eb4ecc9c3 [formerly fe0fffe51b]]
Former-commit-id: 0693c97544c8dd01a9ad695768ee8e2df2354373 [formerly 17ac974932]
Former-commit-id: 53daf4e3bc
|
2014-07-30 14:03:51 -04:00 |
|
Mark Peters
|
437e127ebc
|
Omaha #3429 Replace Raytheon plugin calls to deprecated IGraphicsTarget.drawLine()
Change-Id: I9de68a9a047a2d6c3744b29de292efb7cfb44bbf
Former-commit-id: a222b29ff24bf81d1c8aefd54fa33f52461c9c25
|
2014-07-29 11:20:53 -05:00 |
|
Mark Peters
|
6376572795
|
Omaha #3429 Replace Raytheon plugin calls to deprecated IGraphicsTarget.drawLine()
Change-Id: I9de68a9a047a2d6c3744b29de292efb7cfb44bbf
Former-commit-id: bac12d844b [formerly 437e127ebc [formerly a222b29ff24bf81d1c8aefd54fa33f52461c9c25]]
Former-commit-id: 437e127ebc
Former-commit-id: 11abefd4de
|
2014-07-29 11:20:53 -05:00 |
|
Mark Peters
|
5cbe006dc9
|
Omaha #3429 Replace Raytheon plugin calls to deprecated IGraphicsTarget.drawLine()
Change-Id: I9de68a9a047a2d6c3744b29de292efb7cfb44bbf
Former-commit-id: 6376572795 [formerly 11abefd4de] [formerly 437e127ebc] [formerly 6376572795 [formerly 11abefd4de] [formerly 437e127ebc] [formerly bac12d844b [formerly 437e127ebc [formerly a222b29ff24bf81d1c8aefd54fa33f52461c9c25]]]]
Former-commit-id: bac12d844b
Former-commit-id: 88edbdafea [formerly 95886b5ded] [formerly 1492820d8873fe4e06b826ecddbb5536f26a2abc [formerly 6edd39cc9e]]
Former-commit-id: cdffd110dc0c39f2afadf75b08b0881b15b96f9a [formerly baecaaaca0]
Former-commit-id: 011ef40360
|
2014-07-29 11:20:53 -05:00 |
|
Michael Gamazaychikov
|
ba4c386f30
|
ASM #15627 - WarnGen leaving out reference to State that is under SVR or TOR Watch in SPS text products.
Change-Id: Ic5689db7714be086d6e4543602db33a07e5b2fc1
Former-commit-id: 00ec5e2d47809d084b3e24e1f1503af96d129fed
|
2014-07-28 15:12:10 -04:00 |
|
Michael Gamazaychikov
|
c71189dd92
|
ASM #15627 - WarnGen leaving out reference to State that is under SVR or TOR Watch in SPS text products.
Change-Id: Ic5689db7714be086d6e4543602db33a07e5b2fc1
Former-commit-id: 8cffe955a9 [formerly ba4c386f30 [formerly 00ec5e2d47809d084b3e24e1f1503af96d129fed]]
Former-commit-id: ba4c386f30
Former-commit-id: e24dd6958e
|
2014-07-28 15:12:10 -04:00 |
|
Michael Gamazaychikov
|
b280c3f5c7
|
ASM #15627 - WarnGen leaving out reference to State that is under SVR or TOR Watch in SPS text products.
Change-Id: Ic5689db7714be086d6e4543602db33a07e5b2fc1
Former-commit-id: c71189dd92 [formerly e24dd6958e] [formerly ba4c386f30] [formerly c71189dd92 [formerly e24dd6958e] [formerly ba4c386f30] [formerly 8cffe955a9 [formerly ba4c386f30 [formerly 00ec5e2d47809d084b3e24e1f1503af96d129fed]]]]
Former-commit-id: 8cffe955a9
Former-commit-id: 4c4132f0aa [formerly f186b49e92] [formerly ff7f89fdff34c0527901d834458ee4e10d6f19f3 [formerly bb7b43be49]]
Former-commit-id: 6829c833cd21836bdce90d24a801642877a0b282 [formerly 134b1286fc]
Former-commit-id: cc3172ead3
|
2014-07-28 15:12:10 -04:00 |
|
Qinglu.Lin
|
1eca5ef51a
|
ASM #15554 - Improve speed/efficiency of WarngenLayer.populateStrings
Change-Id: I6a3b9823ac7c23ba171206708187ab3fc3c7c1ca
Former-commit-id: 3b971d52a82099142fe08986df879a379dfa6314
|
2014-07-28 12:36:07 -04:00 |
|
Qinglu.Lin
|
632ec498ff
|
ASM #15554 - Improve speed/efficiency of WarngenLayer.populateStrings
Change-Id: I6a3b9823ac7c23ba171206708187ab3fc3c7c1ca
Former-commit-id: 2aa16c114a [formerly 1eca5ef51a [formerly 3b971d52a82099142fe08986df879a379dfa6314]]
Former-commit-id: 1eca5ef51a
Former-commit-id: f69a06238b
|
2014-07-28 12:36:07 -04:00 |
|
Qinglu.Lin
|
7f7869a810
|
ASM #15554 - Improve speed/efficiency of WarngenLayer.populateStrings
Change-Id: I6a3b9823ac7c23ba171206708187ab3fc3c7c1ca
Former-commit-id: 632ec498ff [formerly f69a06238b] [formerly 1eca5ef51a] [formerly 632ec498ff [formerly f69a06238b] [formerly 1eca5ef51a] [formerly 2aa16c114a [formerly 1eca5ef51a [formerly 3b971d52a82099142fe08986df879a379dfa6314]]]]
Former-commit-id: 2aa16c114a
Former-commit-id: 3cdad48a5d [formerly 28842008ec] [formerly 0530943e480469d1125783c548c7f3e20af3002b [formerly 80c41d8904]]
Former-commit-id: eb074bc63aab17207cd6f4a5ebca29b3dd524c6a [formerly b3b4c058aa]
Former-commit-id: 000daa2716
|
2014-07-28 12:36:07 -04:00 |
|
Jonathan Sanchez
|
86a8ca4a30
|
Issue #3419 Refactored watches to use the county table.
Change-Id: Ide7e07813203213511640d5ee515e73b278089c1
Former-commit-id: 135d7ffa84af58d7b3c9575e654fa1298b76b2e2
|
2014-07-22 15:32:12 -05:00 |
|
Jonathan Sanchez
|
c479178882
|
Issue #3419 Refactored watches to use the county table.
Change-Id: Ide7e07813203213511640d5ee515e73b278089c1
Former-commit-id: b991838494 [formerly 86a8ca4a30 [formerly 135d7ffa84af58d7b3c9575e654fa1298b76b2e2]]
Former-commit-id: 86a8ca4a30
Former-commit-id: 997485dd22
|
2014-07-22 15:32:12 -05:00 |
|
Jonathan Sanchez
|
1eebd8ac53
|
Issue #3419 Refactored watches to use the county table.
Change-Id: Ide7e07813203213511640d5ee515e73b278089c1
Former-commit-id: c479178882 [formerly 997485dd22] [formerly 86a8ca4a30] [formerly c479178882 [formerly 997485dd22] [formerly 86a8ca4a30] [formerly b991838494 [formerly 86a8ca4a30 [formerly 135d7ffa84af58d7b3c9575e654fa1298b76b2e2]]]]
Former-commit-id: b991838494
Former-commit-id: 3d434c29c1 [formerly f7bc9a8023] [formerly 850ffbd991e733a0bd522e120fa37ad963197e14 [formerly 025c29acc0]]
Former-commit-id: 5b450f5b49602fd2a5be013c2018216984912a58 [formerly 56cbd23141]
Former-commit-id: e4268f814e
|
2014-07-22 15:32:12 -05:00 |
|
David Friedman
|
a45fe1dad0
|
ASM #15052 - WarnGen: service backup should use config.xml from failed site
Change-Id: Icff8ca2a124da595be6b83ac9f9999831daee0b1
Former-commit-id: f9c0dc09ee7bc692c6f70b4a5ad67bb2c2ed5a20
|
2014-07-03 13:58:24 +00:00 |
|
David Friedman
|
b82fb691e0
|
ASM #15052 - WarnGen: service backup should use config.xml from failed site
Change-Id: Icff8ca2a124da595be6b83ac9f9999831daee0b1
Former-commit-id: db8977e281 [formerly a45fe1dad0 [formerly f9c0dc09ee7bc692c6f70b4a5ad67bb2c2ed5a20]]
Former-commit-id: a45fe1dad0
Former-commit-id: 8784501bba
|
2014-07-03 13:58:24 +00:00 |
|
David Friedman
|
b2c35e26d6
|
ASM #15052 - WarnGen: service backup should use config.xml from failed site
Change-Id: Icff8ca2a124da595be6b83ac9f9999831daee0b1
Former-commit-id: b82fb691e0 [formerly 8784501bba] [formerly a45fe1dad0] [formerly b82fb691e0 [formerly 8784501bba] [formerly a45fe1dad0] [formerly db8977e281 [formerly a45fe1dad0 [formerly f9c0dc09ee7bc692c6f70b4a5ad67bb2c2ed5a20]]]]
Former-commit-id: db8977e281
Former-commit-id: 363de7a3c5 [formerly 5270711c5d] [formerly c850f84db3b8b601f2bbda41059ace7ce49e7f85 [formerly d36834080e]]
Former-commit-id: bb504fd33ed91e33e9927f5c6b5ff9592840208c [formerly 4f53bbd556]
Former-commit-id: c44e9f88f6
|
2014-07-03 13:58:24 +00:00 |
|
Richard Peter
|
93bbd98cbc
|
Merge branch 'omaha_14.3.1' (14.3.1-12) into omaha_14.4.1
Conflicts:
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/datastructure/LoopProperties.java
cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java
edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-spring.xml
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/AbstractWatchNotifierSrv.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/SPCWatchSrv.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/TPCWatchSrv.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/WCLWatchSrv.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/WclInfo.java
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
edexOsgi/com.raytheon.edex.plugin.warning/WarningDecoder.py
Change-Id: I6208fb3e1589dd3f2356f19ea9bbdfaa79ae6d61
Former-commit-id: fc71e1cb26481e91c7d0c16ed0bd06ec5c8c22b9
|
2014-07-01 15:34:39 -05:00 |
|
Richard Peter
|
ed38bf2372
|
Merge branch 'omaha_14.3.1' (14.3.1-12) into omaha_14.4.1
Conflicts:
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/datastructure/LoopProperties.java
cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java
edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-spring.xml
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/AbstractWatchNotifierSrv.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/SPCWatchSrv.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/TPCWatchSrv.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/WCLWatchSrv.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/WclInfo.java
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
edexOsgi/com.raytheon.edex.plugin.warning/WarningDecoder.py
Change-Id: I6208fb3e1589dd3f2356f19ea9bbdfaa79ae6d61
Former-commit-id: 8ecc27f714 [formerly 93bbd98cbc [formerly fc71e1cb26481e91c7d0c16ed0bd06ec5c8c22b9]]
Former-commit-id: 93bbd98cbc
Former-commit-id: 6636b301e5
|
2014-07-01 15:34:39 -05:00 |
|
Richard Peter
|
0b0b58e89c
|
Merge branch 'omaha_14.3.1' (14.3.1-12) into omaha_14.4.1
Conflicts:
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/datastructure/LoopProperties.java
cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java
edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-spring.xml
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/AbstractWatchNotifierSrv.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/SPCWatchSrv.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/TPCWatchSrv.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/WCLWatchSrv.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/WclInfo.java
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
edexOsgi/com.raytheon.edex.plugin.warning/WarningDecoder.py
Change-Id: I6208fb3e1589dd3f2356f19ea9bbdfaa79ae6d61
Former-commit-id: ed38bf2372 [formerly 6636b301e5] [formerly 93bbd98cbc] [formerly ed38bf2372 [formerly 6636b301e5] [formerly 93bbd98cbc] [formerly 8ecc27f714 [formerly 93bbd98cbc [formerly fc71e1cb26481e91c7d0c16ed0bd06ec5c8c22b9]]]]
Former-commit-id: 8ecc27f714
Former-commit-id: 948e0cd011 [formerly 552ac6d640] [formerly bb5cc0ca71fa6abf17e95b29fbe41a184ac1297e [formerly fc27824dbc]]
Former-commit-id: 98c7362b289abd5b8e115f957b14dcd73116b99a [formerly 0fefdc7cd6]
Former-commit-id: 342192e967
|
2014-07-01 15:34:39 -05:00 |
|
Brian.Dyke
|
b64d38be69
|
Merge branch 'master_14.3.1' into asm_14.3.1
Former-commit-id: 765d6440b1b19d7b0cf789fb7a873e14b4a679e1
|
2014-07-01 13:47:12 -04:00 |
|
Brian.Dyke
|
31d8874e14
|
Merge branch 'master_14.3.1' into asm_14.3.1
Former-commit-id: 6d93f8f3ef [formerly b64d38be69 [formerly 765d6440b1b19d7b0cf789fb7a873e14b4a679e1]]
Former-commit-id: b64d38be69
Former-commit-id: da6b0f2adf
|
2014-07-01 13:47:12 -04:00 |
|
Brian.Dyke
|
71e18fa7dd
|
Merge branch 'master_14.3.1' into asm_14.3.1
Former-commit-id: 31d8874e14 [formerly da6b0f2adf] [formerly b64d38be69] [formerly 31d8874e14 [formerly da6b0f2adf] [formerly b64d38be69] [formerly 6d93f8f3ef [formerly b64d38be69 [formerly 765d6440b1b19d7b0cf789fb7a873e14b4a679e1]]]]
Former-commit-id: 6d93f8f3ef
Former-commit-id: 3a84980ab9 [formerly 685b53d6bc] [formerly 56b741117eb426467c35c0e97c314eea4a29c418 [formerly 55fa980898]]
Former-commit-id: d0af7de2148b40803d2d1faeaccbc88b78b22e66 [formerly d62782613b]
Former-commit-id: 52977a745e
|
2014-07-01 13:47:12 -04:00 |
|
Steve Harris
|
d4dc1723c1
|
Merge branch 'master_14.2.2' (-16) into master_14.3.1 (-11) CM-MERGE:14.2.2-11,-12,-13,-14,-15,-16 into 14.3.1
Conflicts:
cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/StormTrackDisplay.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/sbu/ServiceBackupDlg.java
cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/GisUtil.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/PortionsUtil.java
edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/postProcessModels/postProcessedModels.xml
edexOsgi/com.raytheon.edex.plugin.shef/res/spring/shef-ingest.xml
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
Change-Id: Ia1c3637d1d6ee482896c9d7a41d77752d70317f5
Former-commit-id: d25ab509cb53d559edbd520dd1e3c036166f2e29
|
2014-07-01 11:08:46 -04:00 |
|
Steve Harris
|
741dc31fcb
|
Merge branch 'master_14.2.2' (-16) into master_14.3.1 (-11) CM-MERGE:14.2.2-11,-12,-13,-14,-15,-16 into 14.3.1
Conflicts:
cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/StormTrackDisplay.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/sbu/ServiceBackupDlg.java
cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/GisUtil.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/PortionsUtil.java
edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/postProcessModels/postProcessedModels.xml
edexOsgi/com.raytheon.edex.plugin.shef/res/spring/shef-ingest.xml
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
Change-Id: Ia1c3637d1d6ee482896c9d7a41d77752d70317f5
Former-commit-id: 7acd9ab2dd [formerly d4dc1723c1 [formerly d25ab509cb53d559edbd520dd1e3c036166f2e29]]
Former-commit-id: d4dc1723c1
Former-commit-id: 2f2958df37
|
2014-07-01 11:08:46 -04:00 |
|
Steve Harris
|
1bbbdc9c62
|
Merge branch 'master_14.2.2' (-16) into master_14.3.1 (-11) CM-MERGE:14.2.2-11,-12,-13,-14,-15,-16 into 14.3.1
Conflicts:
cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/StormTrackDisplay.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/sbu/ServiceBackupDlg.java
cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/GisUtil.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/PortionsUtil.java
edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/postProcessModels/postProcessedModels.xml
edexOsgi/com.raytheon.edex.plugin.shef/res/spring/shef-ingest.xml
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
Change-Id: Ia1c3637d1d6ee482896c9d7a41d77752d70317f5
Former-commit-id: 741dc31fcb [formerly 2f2958df37] [formerly d4dc1723c1] [formerly 741dc31fcb [formerly 2f2958df37] [formerly d4dc1723c1] [formerly 7acd9ab2dd [formerly d4dc1723c1 [formerly d25ab509cb53d559edbd520dd1e3c036166f2e29]]]]
Former-commit-id: 7acd9ab2dd
Former-commit-id: d70da4127e [formerly 7fb4663d75] [formerly 109f5e557e8f5a7076b56c4f8d0f0c548c0f0cc6 [formerly dcbab5621f]]
Former-commit-id: 8343b8e876918b72044e0b509f5b5b8afdbd53e2 [formerly 71357da9d2]
Former-commit-id: 8fb747ad27
|
2014-07-01 11:08:46 -04:00 |
|
Juliya Dynina
|
b5e4bc1fdc
|
Merge "ASM #663 - WarnGen does not properly handle Outer Banks Counties in North Carolina" into asm_14.2.2
Former-commit-id: 714dbccbd26a1b6fafa486b2ddbce98d7f38c8eb
|
2014-07-01 10:05:57 -05:00 |
|
Juliya Dynina
|
9fc999e435
|
Merge "ASM #663 - WarnGen does not properly handle Outer Banks Counties in North Carolina" into asm_14.2.2
Former-commit-id: 102da2d0f7 [formerly b5e4bc1fdc [formerly 714dbccbd26a1b6fafa486b2ddbce98d7f38c8eb]]
Former-commit-id: b5e4bc1fdc
Former-commit-id: bf765525b7
|
2014-07-01 10:05:57 -05:00 |
|
Juliya Dynina
|
01f10d8e38
|
Merge "ASM #663 - WarnGen does not properly handle Outer Banks Counties in North Carolina" into asm_14.2.2
Former-commit-id: 9fc999e435 [formerly bf765525b7] [formerly b5e4bc1fdc] [formerly 9fc999e435 [formerly bf765525b7] [formerly b5e4bc1fdc] [formerly 102da2d0f7 [formerly b5e4bc1fdc [formerly 714dbccbd26a1b6fafa486b2ddbce98d7f38c8eb]]]]
Former-commit-id: 102da2d0f7
Former-commit-id: 174d866359 [formerly b4d23902a7] [formerly 2d2b83dfaec86884c0ce72c54cf9440fd6074009 [formerly 7ed2a8cbd4]]
Former-commit-id: 4eefb3ff8da1d8b45bbb5382f3de7f17a72b1b23 [formerly 8f3581340b]
Former-commit-id: 5a9181fcc1
|
2014-07-01 10:05:57 -05:00 |
|
Qinglu.Lin
|
1200633cd2
|
ASM #663 - WarnGen does not properly handle Outer Banks Counties in North Carolina
Change-Id: If7fbcea362618e0dea5153f65489388b406b7a81
Former-commit-id: 4d50beaed59d785d923e357f8ce036f6625ce4b4
|
2014-06-30 13:09:15 -04:00 |
|
Qinglu.Lin
|
660d1c9ff2
|
ASM #663 - WarnGen does not properly handle Outer Banks Counties in North Carolina
Change-Id: If7fbcea362618e0dea5153f65489388b406b7a81
Former-commit-id: 1d52d020eb [formerly 1200633cd2 [formerly 4d50beaed59d785d923e357f8ce036f6625ce4b4]]
Former-commit-id: 1200633cd2
Former-commit-id: 1180b31875
|
2014-06-30 13:09:15 -04:00 |
|
Qinglu.Lin
|
a4d359fce0
|
ASM #663 - WarnGen does not properly handle Outer Banks Counties in North Carolina
Change-Id: If7fbcea362618e0dea5153f65489388b406b7a81
Former-commit-id: 660d1c9ff2 [formerly 1180b31875] [formerly 1200633cd2] [formerly 660d1c9ff2 [formerly 1180b31875] [formerly 1200633cd2] [formerly 1d52d020eb [formerly 1200633cd2 [formerly 4d50beaed59d785d923e357f8ce036f6625ce4b4]]]]
Former-commit-id: 1d52d020eb
Former-commit-id: 712f3b0f46 [formerly 5e07f13dd8] [formerly 79c9a926a4430a2e87a6959f559d52c89cb1c374 [formerly 6e4b7e1e6d]]
Former-commit-id: d7eb9af4998b1fcd67d349f3068f4af192e86aff [formerly 3eaedad105]
Former-commit-id: 7235488050
|
2014-06-30 13:09:15 -04:00 |
|
David Friedman
|
18b3b61afc
|
ASM #660 - WarnGen can generate polygons that do not match hatched area
Change-Id: I48e93e69d75e903b266f5bb615dd8a72e8813652
Former-commit-id: 993663cbee3f794981fc7f4cc97f96e3b86c47f8
|
2014-06-27 19:17:55 +00:00 |
|
David Friedman
|
5c62d368ea
|
ASM #660 - WarnGen can generate polygons that do not match hatched area
Change-Id: I48e93e69d75e903b266f5bb615dd8a72e8813652
Former-commit-id: dc25040a25 [formerly 18b3b61afc [formerly 993663cbee3f794981fc7f4cc97f96e3b86c47f8]]
Former-commit-id: 18b3b61afc
Former-commit-id: c4967a96fb
|
2014-06-27 19:17:55 +00:00 |
|
David Friedman
|
f2728065ba
|
ASM #660 - WarnGen can generate polygons that do not match hatched area
Change-Id: I48e93e69d75e903b266f5bb615dd8a72e8813652
Former-commit-id: 5c62d368ea [formerly c4967a96fb] [formerly 18b3b61afc] [formerly 5c62d368ea [formerly c4967a96fb] [formerly 18b3b61afc] [formerly dc25040a25 [formerly 18b3b61afc [formerly 993663cbee3f794981fc7f4cc97f96e3b86c47f8]]]]
Former-commit-id: dc25040a25
Former-commit-id: 2e4cf863dd [formerly 217aa6ce76] [formerly 7b3bdb180812815c4f2d1bc65959d40cce07d595 [formerly b546ca6ac8]]
Former-commit-id: d5d8e4678be9cbb6c94920e0cb97562c13b4888f [formerly a756c1436b]
Former-commit-id: 18b1d17550
|
2014-06-27 19:17:55 +00:00 |
|
Michael Gamazaychikov
|
7004d99fb8
|
ASM #513 - Maps loaded before opening WarnGen not retained when WarnGen is closed.
Change-Id: I6d3a180d850060483742130c1550ac88f133d6e6
Former-commit-id: 7b7a2fcb393b09b9f0cb2077f1603410edcc9dab
|
2014-06-23 13:58:38 -04:00 |
|
Michael Gamazaychikov
|
065557f582
|
ASM #513 - Maps loaded before opening WarnGen not retained when WarnGen is closed.
Change-Id: I6d3a180d850060483742130c1550ac88f133d6e6
Former-commit-id: 3a340e084c [formerly 7004d99fb8 [formerly 7b7a2fcb393b09b9f0cb2077f1603410edcc9dab]]
Former-commit-id: 7004d99fb8
Former-commit-id: 27789e1601
|
2014-06-23 13:58:38 -04:00 |
|
Michael Gamazaychikov
|
5d399eb63c
|
ASM #513 - Maps loaded before opening WarnGen not retained when WarnGen is closed.
Change-Id: I6d3a180d850060483742130c1550ac88f133d6e6
Former-commit-id: 065557f582 [formerly 27789e1601] [formerly 7004d99fb8] [formerly 065557f582 [formerly 27789e1601] [formerly 7004d99fb8] [formerly 3a340e084c [formerly 7004d99fb8 [formerly 7b7a2fcb393b09b9f0cb2077f1603410edcc9dab]]]]
Former-commit-id: 3a340e084c
Former-commit-id: 93411f0a7f [formerly f9bc1deab4] [formerly 8fb3c798d0ba03ded3aa7bcf584d55ff28f45816 [formerly 7ca228ca84]]
Former-commit-id: b48e80dc66dd0ef694bdb08247b011e550f89abe [formerly e39b6b0c6f]
Former-commit-id: a5e993422b
|
2014-06-23 13:58:38 -04:00 |
|
Steve Harris
|
b84dda5930
|
CM-MERGE:14.1.3-2,-3 into 14.2.2
Merge branch 'master_14.1.3' (-3) into master_14.2.2 (-14)
Conflicts:
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.gfe/src/com/raytheon/edex/plugin/gfe/spc/SPCWatchSrv.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/tpc/TPCWatchSrv.java
edexOsgi/com.raytheon.edex.plugin.gfe/test/com/raytheon/edex/plugin/gfe/watch/TestWCLWatchSrv.java
edexOsgi/com.raytheon.edex.plugin.warning/WarningDecoder.py
edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/gis/GeospatialFactory.java
Former-commit-id: ce5767f2bbf5c9627bd43e766c6193c261c48af3
|
2014-06-20 14:01:55 -04:00 |
|
Steve Harris
|
869235c02a
|
CM-MERGE:14.1.3-2,-3 into 14.2.2
Merge branch 'master_14.1.3' (-3) into master_14.2.2 (-14)
Conflicts:
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.gfe/src/com/raytheon/edex/plugin/gfe/spc/SPCWatchSrv.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/tpc/TPCWatchSrv.java
edexOsgi/com.raytheon.edex.plugin.gfe/test/com/raytheon/edex/plugin/gfe/watch/TestWCLWatchSrv.java
edexOsgi/com.raytheon.edex.plugin.warning/WarningDecoder.py
edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/gis/GeospatialFactory.java
Former-commit-id: 419c5f4aba [formerly b84dda5930 [formerly ce5767f2bbf5c9627bd43e766c6193c261c48af3]]
Former-commit-id: b84dda5930
Former-commit-id: 16f5ff0979
|
2014-06-20 14:01:55 -04:00 |
|
Steve Harris
|
7e7529e482
|
CM-MERGE:14.1.3-2,-3 into 14.2.2
Merge branch 'master_14.1.3' (-3) into master_14.2.2 (-14)
Conflicts:
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.gfe/src/com/raytheon/edex/plugin/gfe/spc/SPCWatchSrv.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/tpc/TPCWatchSrv.java
edexOsgi/com.raytheon.edex.plugin.gfe/test/com/raytheon/edex/plugin/gfe/watch/TestWCLWatchSrv.java
edexOsgi/com.raytheon.edex.plugin.warning/WarningDecoder.py
edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/gis/GeospatialFactory.java
Former-commit-id: 869235c02a [formerly 16f5ff0979] [formerly b84dda5930] [formerly 869235c02a [formerly 16f5ff0979] [formerly b84dda5930] [formerly 419c5f4aba [formerly b84dda5930 [formerly ce5767f2bbf5c9627bd43e766c6193c261c48af3]]]]
Former-commit-id: 419c5f4aba
Former-commit-id: bab435f286 [formerly af06c5a890] [formerly dd639a780b77ef5a2f827ee961c20e9db23d2d31 [formerly 66d30e59a3]]
Former-commit-id: 27bd7f3ff5ce8e46cd91569a3f0cf62fa9127e53 [formerly 935542914d]
Former-commit-id: 196f53e609
|
2014-06-20 14:01:55 -04:00 |
|