Matthew Howard
|
df6fb9c83d
|
Merge "ASM #641 - Filtered cases where Areas do not match Zones." into asm_14.3.1
Former-commit-id: 7f1afc7176 [formerly 4c650fec35] [formerly aa273ffb70] [formerly 7f1afc7176 [formerly 4c650fec35] [formerly aa273ffb70] [formerly 6e0d48d840 [formerly aa273ffb70 [formerly f33abc302597a3120c9220278e28d865d5f185b6]]]]
Former-commit-id: 6e0d48d840
Former-commit-id: c7fa5827ad [formerly 7f464afac7] [formerly 4bca28549f5bfe6ca45333848dfc7ace2b7c045b [formerly 5a54cf0d33]]
Former-commit-id: 2b9e0b35c5abc3678ee07bfccfa56f1e3169fa46 [formerly 3508956a81]
Former-commit-id: 6bd366d178
|
2014-09-15 15:03:36 -05:00 |
|
Daniel.Huffman
|
f3e3d97263
|
ASM #641 - Filtered cases where Areas do not match Zones.
Change-Id: I1207442f77aece9d79b010669755ee7fc6f82362
Former-commit-id: 2240767eec [formerly da198f916a] [formerly bacc914bd0] [formerly 2240767eec [formerly da198f916a] [formerly bacc914bd0] [formerly 0f30c0f897 [formerly bacc914bd0 [formerly bf6acaafc42ba98e4257d3eb089b7a1e7adf7bd4]]]]
Former-commit-id: 0f30c0f897
Former-commit-id: 0e58d65d18 [formerly 5e9b53f601] [formerly 0b5d98fae41ce8317528285ee24937bbb30161fc [formerly 716bc02504]]
Former-commit-id: ab0f889515c3fe9a6c8949e9ec5201c2552e4137 [formerly 49797e0c78]
Former-commit-id: 3621d185ed
|
2014-09-15 19:18:33 +00:00 |
|
Brian.Dyke
|
c8f3fbfa22
|
Merge branch 'master_14.3.1' into asm_14.3.1
Former-commit-id: eb63c3e61a [formerly 54b26b3616] [formerly 216f34fb25] [formerly eb63c3e61a [formerly 54b26b3616] [formerly 216f34fb25] [formerly 1541e4c255 [formerly 216f34fb25 [formerly 8e4f6e96f7b70d6f2b7517f3f0695350506169c7]]]]
Former-commit-id: 1541e4c255
Former-commit-id: f2750cb31f [formerly 5115becdef] [formerly f7dde4d7662c0fb29ffb1d09bf474a5e8a04ae17 [formerly ffa56ef950]]
Former-commit-id: 4de6d3d3fa8ae33113a69367f47a1402cf7fe844 [formerly 26b1938813]
Former-commit-id: 55a25f2525
|
2014-09-15 10:46:25 -04:00 |
|
Brian.Dyke
|
74f3dd287f
|
Merge branch 'master_14.2.4' into master_14.3.1 CM-MERGE:14.2.4-6-7-8 into 14.3.1
Conflicts:
cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/ArchiveRetentionDlg.java
cave/com.raytheon.uf.viz.ui.menus/src/com/raytheon/uf/viz/ui/menus/widgets/tearoff/MenuItemComposite.java
Former-commit-id: d8271549ff [formerly fe85eb9f70] [formerly 3d9a3de6e4] [formerly d8271549ff [formerly fe85eb9f70] [formerly 3d9a3de6e4] [formerly 01dfe503f5 [formerly 3d9a3de6e4 [formerly a3365943e7b7972a5c86f8cb1ad39667ab9e0695]]]]
Former-commit-id: 01dfe503f5
Former-commit-id: 3319853886 [formerly 29364e2b9f] [formerly 3c59646613e08582e0a259ecdec538060ca047c5 [formerly c42733eb39]]
Former-commit-id: 582e8cd843a57e8f4ac7a6572a5b3e23cd3b4f25 [formerly a31d3d702e]
Former-commit-id: 0f9fe8301a
|
2014-09-09 11:44:30 -04:00 |
|
Qinglu.Lin
|
e4c8ecb46f
|
ASM #15551 - WarnGen: only WCN should be used while including TOR/SVR watches in WarnGen products
Change-Id: I0438af111b0db290373c7553006002edec2b2110
Former-commit-id: efd54751a5 [formerly 62bcefb9e1] [formerly 8c28597210] [formerly efd54751a5 [formerly 62bcefb9e1] [formerly 8c28597210] [formerly 902b6c55bd [formerly 8c28597210 [formerly 33adaf353c6a4b7dc418dc86428257dae260c4c5]]]]
Former-commit-id: 902b6c55bd
Former-commit-id: 750951ed31 [formerly 920b6bb53b] [formerly 4fb24f077ee8254399c85a7e1b5bdb926ee3bf91 [formerly 9c67b89df7]]
Former-commit-id: 24838cc154dff53eef269cc01790469a9c0466f9 [formerly c746dbabad]
Former-commit-id: ec9b3fa971
|
2014-09-04 14:09:24 -04:00 |
|
Qinglu.Lin
|
175af9a9d3
|
ASM #15551 - WarnGen: only WCN should be used while including TOR/SVR watches in WarnGen products
Change-Id: I286bc4cc809fcc9257f72051f1bb74f8acc24c05
Former-commit-id: dda32f85e9 [formerly b32ea40289] [formerly 2374673f8d] [formerly dda32f85e9 [formerly b32ea40289] [formerly 2374673f8d] [formerly ae13ea419e [formerly 2374673f8d [formerly 59890eef397f3282ef26f259ca85ffea3db7b710]]]]
Former-commit-id: ae13ea419e
Former-commit-id: 5c521a214c [formerly 3fcdc279ea] [formerly 153a4d5b66ab5d399ab180ca9af559bd33c0b1bf [formerly 075df9d234]]
Former-commit-id: 04e6c13acdb23e049d0e8a380998b12c7056105a [formerly 415af39911]
Former-commit-id: 7ec0ec8877
|
2014-09-02 14:37:19 -04:00 |
|
Brian.Dyke
|
42e17418ed
|
Merge branch 'master_14.3.1' into asm_14.3.1
Former-commit-id: 8f69c4b855 [formerly cbe59aded5] [formerly 6f3d0508e4] [formerly 8f69c4b855 [formerly cbe59aded5] [formerly 6f3d0508e4] [formerly 2c25f68437 [formerly 6f3d0508e4 [formerly f34bc4f81eb5ac92ef306f73f8c34243d3f78e31]]]]
Former-commit-id: 2c25f68437
Former-commit-id: 4afabdfb18 [formerly 07ffb04445] [formerly a36a933e1051f5ac6e37163907155d158df993b0 [formerly 2abed9c0eb]]
Former-commit-id: 1bf17b8d14f9883ca968441daded2fdc1e43f653 [formerly 8d7b13548f]
Former-commit-id: b01c60ca50
|
2014-08-29 10:19:02 -04:00 |
|
David Friedman
|
64b66c9dde
|
ASM #15658 - WarnGen: inclusion of watch information in marine products
Change-Id: I9f99e6136027f1a6419800f87e5a5709fe5be6b9
Former-commit-id: bb421fd3e4 [formerly ea1e9feb1d] [formerly a2dfe8e8f6] [formerly bb421fd3e4 [formerly ea1e9feb1d] [formerly a2dfe8e8f6] [formerly ea9230b37c [formerly a2dfe8e8f6 [formerly 6bfa1d6662b00925814be7126592bbe340651649]]]]
Former-commit-id: ea9230b37c
Former-commit-id: 25e0bcdc6f [formerly 10114b0bd1] [formerly 74a7d88387ec143a88a15084374737200a0e031a [formerly bc22f7309c]]
Former-commit-id: 2553d508e5b2d1bb6b928ee04f40220c66d897ac [formerly bfc3fa98b4]
Former-commit-id: 39c7024668
|
2014-08-28 15:43:32 +00:00 |
|
Brian.Dyke
|
2da6c7b93b
|
Merge branch 'master_14.2.4' into master_14.3.1 CM-MERGE:14.2.4-5 into 14.3.1
Conflicts:
cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/StormTrackDisplay.java
cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java
cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
edexOsgi/com.raytheon.uf.common.comm/src/com/raytheon/uf/common/comm/HttpClient.java
Former-commit-id: 0a5ddf7457 [formerly a08db8d73d] [formerly e654318431] [formerly 0a5ddf7457 [formerly a08db8d73d] [formerly e654318431] [formerly aa83bf804f [formerly e654318431 [formerly 7334d3991903dfe8a62728de33c21e81534fdbb6]]]]
Former-commit-id: aa83bf804f
Former-commit-id: 4a56b6f6e1 [formerly f90649d7e7] [formerly c580412a81e899b2803a785d3de77c4ea7ca97b3 [formerly f7f16ff9eb]]
Former-commit-id: 2b5f667a78842762d60c8ab0ba442f22b9229095 [formerly c0dc594eda]
Former-commit-id: 7e4ab705cc
|
2014-08-27 11:19:19 -04:00 |
|
David Friedman
|
b970f9769c
|
ASM #16703 - Errors issuing Marine Products over areas under a Watch
Change-Id: Idd28b86771295c90cec3c9b3e7e2dfc96c84ff4f
Former-commit-id: 280f4a4b64 [formerly b053e1e2ce] [formerly 78ee5a56c5] [formerly 280f4a4b64 [formerly b053e1e2ce] [formerly 78ee5a56c5] [formerly 6a7638ddae [formerly 78ee5a56c5 [formerly 7027ff533991251f64f2e5a0deb31e2945cdde5f]]]]
Former-commit-id: 6a7638ddae
Former-commit-id: 4f3458f5fb [formerly 95fbbdf730] [formerly e0968bdffeb4e1072679ff80338a84d7bb82e1e9 [formerly 76d78ff72e]]
Former-commit-id: 2eb00233e833c805596310a628d40ea6515979a3 [formerly 2ce533f866]
Former-commit-id: 40c7d1971e
|
2014-08-20 14:13:32 +00:00 |
|
Michael Gamazaychikov
|
aa8278e995
|
ASM #15701 WarnGen displaying error for Watch Wording when switching from backup site to local site
Change-Id: I9ff834f0b3717d046f278b8a21ca955e5f5c4805
Former-commit-id: d0c9d21538 [formerly 2b450af136] [formerly 9897417235] [formerly d0c9d21538 [formerly 2b450af136] [formerly 9897417235] [formerly c14a5287ac [formerly 9897417235 [formerly 126ec43423a864df597bd6dd745671ee0bf4fbfb]]]]
Former-commit-id: c14a5287ac
Former-commit-id: 3050ad699d [formerly ab21a0f8e9] [formerly 2fcf1110fa9581e169e37c41d84f20cc066eb8b5 [formerly 4097a7ddd0]]
Former-commit-id: 158147e009c43f9b7c0c8b9b3edd0709f3289054 [formerly 2115121def]
Former-commit-id: 65daa0f117
|
2014-08-15 11:03:23 -04:00 |
|
Brian.Dyke
|
2e18cc1022
|
Merge branch 'master_14.3.1' into asm_14.3.1
Conflicts:
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
Former-commit-id: 770b56e740 [formerly 8ea5c4f98b] [formerly 6f6daaa249] [formerly 770b56e740 [formerly 8ea5c4f98b] [formerly 6f6daaa249] [formerly 7fbb3b6a54 [formerly 6f6daaa249 [formerly f22cc09d0a6fdc7a806726d5207f6b3507972b94]]]]
Former-commit-id: 7fbb3b6a54
Former-commit-id: 05a368a3e1 [formerly 3e56f7e403] [formerly 0500f4276b4789b2caf13c0deac9ff644eca9eb5 [formerly 45cfe1aa9c]]
Former-commit-id: 4b8332900546e194d9cc4c27193213c3281c4d78 [formerly 861a40ce5a]
Former-commit-id: 4be2bcf64a
|
2014-08-04 16:40:02 -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
|
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
|
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 |
|
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
|
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
|
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
|
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 |
|
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
|
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
|
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
|
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
|
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
|
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
|
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 |
|
Brian.Dyke
|
71ca3ae180
|
CM-MERGE:OB13.5.6-4 into 14.1.3
Former-commit-id: e3dc97e246 [formerly be589ceb9b] [formerly 399c06820a] [formerly e3dc97e246 [formerly be589ceb9b] [formerly 399c06820a] [formerly 8ecdd9a192 [formerly 399c06820a [formerly 86dc406cd227362abc5274f4cd64813ceb91d00d]]]]
Former-commit-id: 8ecdd9a192
Former-commit-id: f09000ec64 [formerly e28febcf27] [formerly 9723a25d830a41cf2e060dc218ad841643217c3e [formerly 9031f58d02]]
Former-commit-id: c6144f8a9f4e5c44b2c2c7442f0100f646622fba [formerly 3e10995d87]
Former-commit-id: b602d29456
|
2014-06-18 08:55:49 -04:00 |
|
Steve Harris
|
cf2950abdb
|
Merge branch master_14.2.2-10 into master_14.3.1-6 CM-MERGE:OB14.2.2-7,-8,-9,-10 into 14.3.1
Conflicts:
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG518E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG549E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG579E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_122E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_152E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_183E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_20.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_213E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_244E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_274E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_30.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_305E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_335E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_366E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_396E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_40.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_427E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_457E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_488E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_50.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_610E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_61E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_640E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_671E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_701E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_732E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_762E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_91E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge0ftIncr_PHISH.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge1ftIncr_PHISH.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge2ftIncr_PHISH.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge3ftIncr_PHISH.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_122E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_152E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_183E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_20.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_213E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_244E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_274E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_30.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_305E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_335E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_366E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_396E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_40.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_427E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_457E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_488E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_50.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_610E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_61E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_640E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_671E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_701E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_732E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_762E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_91E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/Wind.xml
cave/com.raytheon.uf.viz.derivparam/src/com/raytheon/uf/viz/derivparam/library/DerivedParameterGenerator.java
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResource.java
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
cave/com.raytheon.viz.grid/localization/volumebrowser/FieldDisplayTypes.xml
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/D2DGridResource.java
cave/com.raytheon.viz.volumebrowser/localization/menus/xml/planesMenusPlanView.xml
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/Area.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/Wx.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
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/text/AbstractLockingBehavior.java
cave/com.raytheon.viz.warnings/src/com/raytheon/viz/warnings/rsc/WarningsResource.java
edexOsgi/build.edex/esb/conf/spring/64-bit/architecture.properties
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
edexOsgi/com.raytheon.edex.plugin.warning/src/com/raytheon/edex/plugin/warning/gis/GeospatialDataGenerator.java
edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPUtils.java
edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/db/objects/GridLocation.java
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG518E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG549E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG579E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_122E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_152E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_183E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_20.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_213E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_244E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_274E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_30.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_305E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_335E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_366E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_396E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_40.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_427E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_457E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_488E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_50.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_610E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_61E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_640E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_671E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_701E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_732E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_762E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_91E2.xml
edexOsgi/com.raytheon.uf.edex.plugin.datadelivery.retrieval/res/spring/retrieval-common.xml
Change-Id: Id84acd273efd3da66b423533cac93bf445fabb66
Former-commit-id: 08308cd279 [formerly 3de24b7b07] [formerly 99bc6f990c] [formerly 08308cd279 [formerly 3de24b7b07] [formerly 99bc6f990c] [formerly 3b16bbafb1 [formerly 99bc6f990c [formerly 117fa26f537131552bbe51b2c5fe12405a26db32]]]]
Former-commit-id: 3b16bbafb1
Former-commit-id: 9458ea3648 [formerly bfa4255eea] [formerly 85d55d73802af25d3be5119fe234f4bf09ff39dc [formerly 9b98b41cd4]]
Former-commit-id: a54e34e905540883ccd6d6eb5c78370ac905f651 [formerly 144354c369]
Former-commit-id: 172cca39d9
|
2014-05-27 14:48:24 -04:00 |
|
Brian.Dyke
|
4671c25ea4
|
Merge branch 'master_14.2.1' into master_14.2.2 CM-MERGE:OB14.2.1-25,-26,-27,-28 into 14.2.2
Conflicts:
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/PolygonUtil.java
Former-commit-id: 5afaee3d33 [formerly 822ad181bf] [formerly 2fd18d14d6] [formerly 5afaee3d33 [formerly 822ad181bf] [formerly 2fd18d14d6] [formerly db68b80bbd [formerly 2fd18d14d6 [formerly ed430b59789d9a00e20bdaadc8d55b92a4a4064b]]]]
Former-commit-id: db68b80bbd
Former-commit-id: 5a07e9c984 [formerly 937b9bb9ce] [formerly 6fbbfc0267046011d5fd8ba4c15aa6b2ab182188 [formerly ebcaebb28d]]
Former-commit-id: 6e138f1746a6c0aa092e3c298cd91ece951e39d3 [formerly f42d40c3a3]
Former-commit-id: b0b377e811
|
2014-05-20 14:35:34 -04:00 |
|
Brian.Dyke
|
be5e377068
|
Merge branch 'master_14.1.2' into master_14.2.1 CM-MERGE:OB14.1.2-6,-7 into 14.2.1
Former-commit-id: 432e5f15a5 [formerly c4b7b8dd74] [formerly dbd3bb54e8] [formerly 432e5f15a5 [formerly c4b7b8dd74] [formerly dbd3bb54e8] [formerly d5a4669fc4 [formerly dbd3bb54e8 [formerly 19032f03b1d2166f4afd936bb2b56e0b4851d9f4]]]]
Former-commit-id: d5a4669fc4
Former-commit-id: f113398a16 [formerly f2885c9996] [formerly 9eb0d56ad4743d868045273e945e80f0d2e0674f [formerly f30bd7d9ae]]
Former-commit-id: b203c0e47900941c64b4992284bdc8701c374b29 [formerly 39d8bd9004]
Former-commit-id: 3d35be33cb
|
2014-05-19 14:07:04 -04:00 |
|
Brian.Dyke
|
be2b29e0f3
|
CM-MERGE:OB13.5.5-8 into 14.1.2
Former-commit-id: 75f7d77c45 [formerly 2eae2be646] [formerly b29db01a59] [formerly 75f7d77c45 [formerly 2eae2be646] [formerly b29db01a59] [formerly 06c2478539 [formerly b29db01a59 [formerly 8d67230c49c6a7a1aa9a1f94996de8b6c0c01470]]]]
Former-commit-id: 06c2478539
Former-commit-id: 534d211494 [formerly 3558d8f162] [formerly 8d732a149cd7483006dfc9f0e4e9c03c2adcc03f [formerly 9baa09f4bc]]
Former-commit-id: 976e0f4a32e004b04954001cee7a9831fc35972a [formerly c88e8d41b6]
Former-commit-id: b65a3a3214
|
2014-05-19 13:26:45 -04:00 |
|
Brian.Dyke
|
0545cfd2f6
|
CM-MERGE:OB13.5.5-7 into 14.1.2
Former-commit-id: a9f2fdb086 [formerly 509616ba6a] [formerly f8ed9c7944] [formerly a9f2fdb086 [formerly 509616ba6a] [formerly f8ed9c7944] [formerly e9bd17a21f [formerly f8ed9c7944 [formerly 3595e9c0962e9ef4ea987da3c52fdaf8b9b68114]]]]
Former-commit-id: e9bd17a21f
Former-commit-id: 3772c8d2bf [formerly e563eb3376] [formerly d77fe7357769ccd29689730a70de23400e90fee7 [formerly 409a48b907]]
Former-commit-id: ffcdc5842385a946631a64cb44a2f992361237b3 [formerly acf4cbbd78]
Former-commit-id: eefa4dbf96
|
2014-05-19 07:55:42 -04:00 |
|
Brian.Dyke
|
0febfec9e7
|
Merge branch 'master_14.2.1' into master_14.2.2 CM-MERGE:OB14.2.1-24 into 14.2.2
Conflicts:
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.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
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/text/AbstractLockingBehavior.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/text/ICommonPatterns.java
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
edexOsgi/com.raytheon.edex.plugin.warning/src/com/raytheon/edex/plugin/warning/gis/GeospatialDataGenerator.java
rpms/awips2.core/Installer.ldm/component.spec
Former-commit-id: 8c0709798d [formerly f38d0138e6] [formerly 627541512d] [formerly 8c0709798d [formerly f38d0138e6] [formerly 627541512d] [formerly d3fa10028c [formerly 627541512d [formerly f7d6bee49c5777e5d63c724eba1242a1baf153ac]]]]
Former-commit-id: d3fa10028c
Former-commit-id: a6b42a776b [formerly b0837b4905] [formerly 91d88625eae6852df94fbb04133d89826c605aad [formerly 68f3a0169e]]
Former-commit-id: c54c6441e46c95271889db670ff46e1bedce8459 [formerly f87775928f]
Former-commit-id: 1d53f6d304
|
2014-05-14 16:08:16 -04:00 |
|
Qinglu.Lin
|
2e3a1d2374
|
ASM #556 - WarnGen: use noon/midnight instead of 1200 PM/1200 AM
Change-Id: I31cc6fe46fff0f9246585ddbf84b2f94b3d8c22c
Former-commit-id: c9e359f947 [formerly b7d276d00f] [formerly 75c4b15e8e] [formerly c9e359f947 [formerly b7d276d00f] [formerly 75c4b15e8e] [formerly c5097660c2 [formerly 75c4b15e8e [formerly 763641d787f7f8c79bf28456314dcc16786702ed]]]]
Former-commit-id: c5097660c2
Former-commit-id: bdf527d5f2 [formerly bdae3cdfdf] [formerly cba5eacd009b07ca51d595c26e8a4b851d4605b4 [formerly 89fa05128e]]
Former-commit-id: 129e4eff1386649cdd84ed945399d5abd11dab4a [formerly 42c5ce2aff]
Former-commit-id: 603c6a1843
|
2014-05-14 15:30:16 -04:00 |
|
Steve Harris
|
24df80c520
|
Merge branch 'master_14.1.2' (-4) into master_14.2.1 (-23)
Conflicts:
cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/time/D2DTimeMatcher.java
cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/time/TimeMatcher.java
edexOsgi/com.raytheon.edex.plugin.shef/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.edex.plugin.warning/src/com/raytheon/edex/plugin/warning/gis/GeospatialDataGenerator.java
edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/config/DialogConfiguration.java
edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/config/WarngenConfiguration.java
tests/.classpath
tests/unit/com/raytheon/edex/plugin/shef/TestM2SOptions.java
tests/unit/com/raytheon/edex/plugin/shef/TestMetarToShefTransformer.java
Former-commit-id: 343444715e [formerly 848519177d] [formerly cf62cf4a6e] [formerly 343444715e [formerly 848519177d] [formerly cf62cf4a6e] [formerly fc2bf6b45c [formerly cf62cf4a6e [formerly a830db2a282e6a29d119fc0d3357c2223c48d175]]]]
Former-commit-id: fc2bf6b45c
Former-commit-id: ae2d525c8a [formerly 32f255cada] [formerly a8635bd2e1fdd0fe84e47c2435e9f0073d86e4e2 [formerly 233922471a]]
Former-commit-id: d12e1920a9ce76da64ae45fed23fe5b2ed9fa884 [formerly 74a325ce74]
Former-commit-id: 82045e2409
|
2014-05-12 16:13:19 -05:00 |
|
Brian.Dyke
|
9bc1055c87
|
CM-MERGE:OB13.5.5-5 into 14.1.2
Former-commit-id: 82ce970ad6 [formerly 3aa2f7974b] [formerly 386ec058e1] [formerly 82ce970ad6 [formerly 3aa2f7974b] [formerly 386ec058e1] [formerly 41ba5fc348 [formerly 386ec058e1 [formerly 3b0df2482b87ba9d37dd32d50e8e1fc3b3ae55e3]]]]
Former-commit-id: 41ba5fc348
Former-commit-id: 4004b627e2 [formerly dc5bc1d2a4] [formerly 3193dce8b50276edb5c6e0829236339aa91b9172 [formerly 2f704c898d]]
Former-commit-id: 4b5ff1e5a8372daadb66b3b58132714ed0a54eae [formerly 82663c0ab6]
Former-commit-id: 464cc1a479
|
2014-05-12 14:07:11 -04:00 |
|
Michael Gamazaychikov
|
ce8c015507
|
ASM #526 - Duration menu disabled after creating text for a COR SVS.
Change-Id: I360935bb87b5b95e9814f0f70da7cfe2d70d958c
Former-commit-id: 23e7c1c5b1 [formerly 65353b595e] [formerly 4f541a5460] [formerly 23e7c1c5b1 [formerly 65353b595e] [formerly 4f541a5460] [formerly 8a9c7ecb11 [formerly 4f541a5460 [formerly 988d5f26d3bd3e42397f62288a8c9b10e341495b]]]]
Former-commit-id: 8a9c7ecb11
Former-commit-id: 1c57fda24f [formerly eb159fb31f] [formerly 7e7e2bbb892cb1304346735acab7aa0cc43d14fb [formerly 447eca7802]]
Former-commit-id: 88ca1768847b3f7c443a193ac79d18ff9957ea43 [formerly 14440818e7]
Former-commit-id: ce40c60dd3
|
2014-05-12 13:33:58 +01:00 |
|
Michael Gamazaychikov
|
6b302cac99
|
ASM #526 - Duration menu disabled after creating text for a COR SVS.
Change-Id: I23135a56247ba75c7ce980b5eddcf4e7dd30aebf
Former-commit-id: 3be98fa48b [formerly 4a7d050dd4] [formerly e7341afe4d] [formerly 3be98fa48b [formerly 4a7d050dd4] [formerly e7341afe4d] [formerly 588cfd0608 [formerly e7341afe4d [formerly f934537da168238e76f0be04fc518f6ad315637e]]]]
Former-commit-id: 588cfd0608
Former-commit-id: 9ba9f271ff [formerly 5c73491447] [formerly 3b43cbd66916a44017d57b01ad9b609c49dcbe38 [formerly 31c221bc37]]
Former-commit-id: fffd9a480021cc7ecd6925b8e701113be6a1d6c2 [formerly 7b5e8942cf]
Former-commit-id: b9d57aa0b4
|
2014-05-08 14:02:21 +01:00 |
|
Qinglu.Lin
|
db716647bb
|
ASM #514 - Line of Storms functionality behaving oddly in WarnGen
Change-Id: I0bd2b9e4200b5acbb19a06caa45f18d36346de39
Former-commit-id: d3220c8e71 [formerly 5f0e0bda69] [formerly 18e92f03c1] [formerly d3220c8e71 [formerly 5f0e0bda69] [formerly 18e92f03c1] [formerly d8753a4145 [formerly 18e92f03c1 [formerly 66a6c50cd501358e0c8c993631b288aa78dfdc97]]]]
Former-commit-id: d8753a4145
Former-commit-id: 153128e11e [formerly 580d7e3ba7] [formerly de233bb13dc17298e3aa8b3e59813a4bc72ebe5a [formerly 8de2d2f718]]
Former-commit-id: 27cacced16ec33e1bb5c01e87c75e6050fffec36 [formerly 6ba15bd00c]
Former-commit-id: 03f7862321
|
2014-05-05 11:54:56 -04:00 |
|
Steve Harris
|
55644af2ca
|
Merge branch 'master_14.1.2' (-2) into master_14.2.1 (-22)
Conflicts:
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge0ftIncr_PHISH.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge1ftIncr_PHISH.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge2ftIncr_PHISH.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge3ftIncr_PHISH.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_122E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_152E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_183E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_20.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_213E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_244E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_274E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_30.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_305E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_335E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_366E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_396E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_40.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_427E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_457E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_488E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_50.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_60.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_610E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_61E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_640E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_671E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_70.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_701E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_732E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_762E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_80.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_90.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_91E2.xml
cave/com.raytheon.uf.viz.derivparam/src/com/raytheon/uf/viz/derivparam/library/DerivedParameterGenerator.java
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/HeaderTextComp.java
cave/com.raytheon.viz.grid/localization/styleRules/gridImageryStyleRules.xml
cave/com.raytheon.viz.grid/localization/volumebrowser/FieldDisplayTypes.xml
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/D2DGridResource.java
cave/com.raytheon.viz.volumebrowser/localization/menus/xml/fieldsMenus.xml
edexOsgi/build.edex/esb/data/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/parameter/alias/gfeParamName.xml
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/TPCSurgeProb.xml
edexOsgi/com.raytheon.edex.plugin.grib/GribDecoder.py
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/decoderpostprocessors/TPCSurgeProbPostProcessor.java
edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grid/master_grib2_lookup.txt
edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grid/parameterNameAlias.txt
edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/largeGribPatterns.xml
Former-commit-id: 010301045d [formerly 9e149df799] [formerly 6ef3b9f1e5] [formerly 010301045d [formerly 9e149df799] [formerly 6ef3b9f1e5] [formerly 1c8f2f6185 [formerly 6ef3b9f1e5 [formerly c782956ef32875130bd97a0bdbffdf005e1940e3]]]]
Former-commit-id: 1c8f2f6185
Former-commit-id: 4b54c0498e [formerly 927a87b126] [formerly b9b41ab717fa5a9d55725f89e087b2c62f5811fa [formerly b797b4b1fa]]
Former-commit-id: 66b0c211b5eee3caba67b313d56f7fda8fa60cc9 [formerly 17318b1870]
Former-commit-id: 4fe84ba0fd
|
2014-05-05 08:21:02 -05:00 |
|
Qinglu.Lin
|
15a8bc45e2
|
ASM #123 Zone UGC line not locked
Change-Id: I5eb7ed0bee68599fe4ece0810fe76cb5c794d29c
Former-commit-id: deb29531b6 [formerly b51bdd9107] [formerly e489658072] [formerly deb29531b6 [formerly b51bdd9107] [formerly e489658072] [formerly 13c81f9468 [formerly e489658072 [formerly 108895dccefb42c71d0f47b13bfd64591e8dca98]]]]
Former-commit-id: 13c81f9468
Former-commit-id: 4c45207ae2 [formerly 895a652b4c] [formerly 5ecbbfe3f8d1edb9f4ce416b7a69ea39fbcab9d6 [formerly caf57dbabe]]
Former-commit-id: 27c17eceadf15fc08fbb4e8aeb1d2ee2b1ce1da9 [formerly 1bdf714eba]
Former-commit-id: f8c13f1d3b
|
2014-05-01 14:49:27 -04:00 |
|
Brian.Dyke
|
f2993215f3
|
Merged 13.5.5 -2 and -3 into 1412
Former-commit-id: 81d39113fe [formerly eff27f5504] [formerly a19f01c620] [formerly 81d39113fe [formerly eff27f5504] [formerly a19f01c620] [formerly e82fc8f89c [formerly a19f01c620 [formerly 4e921dbeab89e61635144b441ae0015155376c59]]]]
Former-commit-id: e82fc8f89c
Former-commit-id: f1ebebbac1 [formerly af2d8f5bad] [formerly 57b2a8a44845dea3266c201818f90765ddf026ee [formerly df6f06bef5]]
Former-commit-id: 43839e21018da6e40c7fe75ced0db2714eff9e66 [formerly 0fa669acce]
Former-commit-id: 378332d8bb
|
2014-04-24 13:01:50 -04:00 |
|
Richard Peter
|
626ab0bd58
|
Merge branch 'omaha_14.2.2' (14.2.2-3) into development
Conflicts:
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResource.java
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
cave/com.raytheon.viz.hydrobase/src/com/raytheon/viz/hydrobase/dialogs/QcAlertAlarmLimitsDlg.java
cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/resource/HRAPOverlayResource.java
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/MPEDisplayManager.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.textdb/src/com/raytheon/edex/textdb/dbapi/impl/TextDBStaticData.java
edexOsgi/com.raytheon.edex.textdb/src/com/raytheon/edex/textdb/ingest/TextDBStaticDataSubscriber.java
edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/styleRules/d2dContourStyleRules.xml
edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/styleRules/gridImageryStyleRules.xml
edexOsgi/com.raytheon.uf.edex.plugin.manualIngest/res/spring/manualIngest-spring.xml
Former-commit-id: 9b12d9ddaf [formerly cd51f3fa87] [formerly 3575d6586f] [formerly 9b12d9ddaf [formerly cd51f3fa87] [formerly 3575d6586f] [formerly 21ae3b5fcd [formerly 3575d6586f [formerly bd13bc332bcdd87723bec8669885f4594ad483b9]]]]
Former-commit-id: 21ae3b5fcd
Former-commit-id: 56089894f2 [formerly d65b11d404] [formerly 9377474013cb8e8722b3a32e83523c417b87fcd0 [formerly a7ec0bcf66]]
Former-commit-id: ea5917ddde80aa4f2fa095272512ef873794f21c [formerly b6482f2e54]
Former-commit-id: a22345ea6b
|
2014-04-11 16:23:09 -05:00 |
|
David Friedman
|
8ea6e0b064
|
Merge branch 'master_14.2.2' into asm_14.2.2
Remove unintentional changes from cd136c3.
Fix problem in warning-request.xml from 3c9c34c.
Conflicts:
cave/build/static/linux/cave/cave.sh
cave/build/static/linux/cave/caveUtil.sh
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/PolygonUtil.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
edexOsgi/com.raytheon.edex.plugin.warning/res/spring/warning-request.xml
edexOsgi/com.raytheon.uf.common.ohd/utility/common_static/base/hydro/Apps_defaults
edexOsgi/com.raytheon.uf.edex.plugin.manualIngest/res/spring/manualIngest-spring.xml
Change-Id: I814b0ae3c464bbb21b609870b3dca7d575ed948d
Former-commit-id: ee37afaf7b [formerly 32a7adbe4b] [formerly fd900e38c2] [formerly ee37afaf7b [formerly 32a7adbe4b] [formerly fd900e38c2] [formerly f146c7bcd0 [formerly fd900e38c2 [formerly cf35c1870fc4b6b3c2ceaf038274c4701f8046b1]]]]
Former-commit-id: f146c7bcd0
Former-commit-id: 1e4ac84f99 [formerly 1168a3eae5] [formerly 06e6f2e7e7ae2f1959eaefcb5e76c2a04c33de99 [formerly 533d15c863]]
Former-commit-id: beb961d5304e2c2df6afc0538bae8011c8b6f63f [formerly dde12b4fc3]
Former-commit-id: 8f8f55dd3c
|
2014-03-27 19:17:03 +00:00 |
|
Qinglu.Lin
|
b0cf607329
|
ASM #335 - Watch wording not being inserted for SMW and SMW followup
Change-Id: Ic2ab65e3690dccad47b87f99dd4fb9d801742e05
Former-commit-id: a62e75e8b5 [formerly 09e90dfe43] [formerly 4b3c821ce0] [formerly a62e75e8b5 [formerly 09e90dfe43] [formerly 4b3c821ce0] [formerly af82143e84 [formerly 4b3c821ce0 [formerly f114aa5e7348f0feb5d9da66b5cd389dfb21275a]]]]
Former-commit-id: af82143e84
Former-commit-id: 2b4ab71782 [formerly 1b352b8600] [formerly a5da7a6ab2edf30dc691e926f832381fb33cc183 [formerly bd7d68bd16]]
Former-commit-id: 8b795eb68de0b31c9a7c09c0052c419f92830442 [formerly 72b8b32e25]
Former-commit-id: 119fc9840e
|
2014-03-17 18:17:49 -04: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 |
|
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 |
|
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 |
|
Ron Anderson
|
c3b687b9a5
|
Merge branch 'master_14.1.1' into master_14.2.1
Conflicts:
cave/build/static/common/cave/etc/gfe/userPython/textUtilities/headline/HazardsTable.py
cave/com.raytheon.uf.viz.personalities.cave/src/com/raytheon/uf/viz/personalities/cave/workbench/VizWorkbenchAdvisor.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/StoreTransmitDlg.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/textformatter/CombinationsFileUtil.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/vtec/GFEVtecUtil.java
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDisplayCanvas.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/dao/CoreDao.java
rpms/awips2.core/Installer.ant/scripts/profile.d/awips2Ant.sh
rpms/awips2.core/Installer.tools/component.spec
Change-Id: I457923a64d369b97af3d99fa6b25bf353a1f33f4
Former-commit-id: 410f956cff [formerly e7f2b6883d] [formerly 32bcf9d0d0] [formerly 410f956cff [formerly e7f2b6883d] [formerly 32bcf9d0d0] [formerly 14a082a4e9 [formerly 32bcf9d0d0 [formerly 4155b9785e0a82078db6805659146980cafc2aa7]]]]
Former-commit-id: 14a082a4e9
Former-commit-id: 8779564e3a [formerly 0135771eec] [formerly daf9f7ed0c92599e36d2d85d87483ca351cda108 [formerly d4ba9eba94]]
Former-commit-id: 55baedb811a56a020df3ba68f97e40ee6307fb4c [formerly 68e03bf02f]
Former-commit-id: 8a7af092f2
|
2014-02-18 10:45:20 -06:00 |
|
Michael Gamazaychikov
|
049e969db3
|
ASM #94
Change-Id: I97797a7adbd17532b261987caf2fdcaa1d39c9ed
Former-commit-id: 7531090e3d [formerly 8cd5cce89e] [formerly 42399284ca] [formerly 7531090e3d [formerly 8cd5cce89e] [formerly 42399284ca] [formerly b63053d8b4 [formerly 42399284ca [formerly 3c9c34c84ac1cd4962c3e6f877bd33b37aab705a]]]]
Former-commit-id: b63053d8b4
Former-commit-id: affc8cbf35 [formerly 293dd963f1] [formerly 57d29eaf78d9034dfe9ee098e919a613c40d6647 [formerly 60de3bbc43]]
Former-commit-id: 2022e69af1758c32dad2fdb5d3ec158db7a4e7cb [formerly e5ca7e8740]
Former-commit-id: 554c3286a9
|
2014-02-11 01:32:37 +00:00 |
|