Nate Jensen
|
16b0d07c73
|
Omaha #3356 remove more unnecessary register buddies and policies
Change-Id: I3e39f9b8274b2b9104f3b3d037601c1553c43e13
Former-commit-id: 287275d716 [formerly 0fb9fc4f59] [formerly 2c74d90cc4] [formerly 2c74d90cc4 [formerly c0dab26b92]] [formerly 287275d716 [formerly 0fb9fc4f59] [formerly 2c74d90cc4] [formerly 2c74d90cc4 [formerly c0dab26b92]] [formerly 9d462e1dd9 [formerly 2c74d90cc4 [formerly c0dab26b92] [formerly 9d462e1dd9 [formerly b535d54c52c3e38bb9fa083ba911ad49c090f214]]]]]
Former-commit-id: 9d462e1dd9
Former-commit-id: 964f1a9a63 [formerly 25000511be] [formerly d5e948b7e2] [formerly 4454bd285b4a1ccdf2ed921ecd5a10bc45a75507 [formerly 50853652fc8d12a23e8399b69c56c2269a0b8e23] [formerly d5e948b7e2 [formerly 05a73b1e4b]]]
Former-commit-id: fb5ba0d8b611fbc99d44fb43f943d0f09ded6d61 [formerly 9728aa8c5981d6ffdaa1baa487fe07048ea977fa] [formerly 3188cd0af2 [formerly d87cfb8131]]
Former-commit-id: 3188cd0af2
Former-commit-id: b9e7dd0aa8
|
2014-09-03 11:34:10 -05:00 |
|
Steve Harris
|
aeef8875da
|
Merge branch 'master_14.3.1' (14.3.1-16) into omaha_14.4.1
Conflicts:
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/reflect/BundleReflections.java
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/reflect/BundleRepositoryGetter.java
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/reflect/SubClassLocator.java
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
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.edex.plugin.binlightning/src/com/raytheon/edex/plugin/binlightning/BinLightningDecoder.java
edexOsgi/com.raytheon.uf.common.comm/src/com/raytheon/uf/common/comm/HttpClient.java
edexOsgi/com.raytheon.uf.tools.cli/impl/capture
ldm/src/pqact/pqact.c
Former-commit-id: e31665a400 [formerly 3619a11a8a] [formerly bddf9c0f27] [formerly bddf9c0f27 [formerly 793064063b]] [formerly e31665a400 [formerly 3619a11a8a] [formerly bddf9c0f27] [formerly bddf9c0f27 [formerly 793064063b]] [formerly 5d58625abc [formerly bddf9c0f27 [formerly 793064063b] [formerly 5d58625abc [formerly 8793dca41f756ba812206b48391caea6e593a657]]]]]
Former-commit-id: 5d58625abc
Former-commit-id: bdf54d6c9b [formerly 10070d2762] [formerly 66b485c000] [formerly ae5df07fa69c767a230e2a3c9b71b0100d0048c1 [formerly db0dcd3c8aec6653a2b81e49b72319049b73eb54] [formerly 66b485c000 [formerly d984dd538f]]]
Former-commit-id: 529333408e5e144c649cd66c50031cc56795aa1e [formerly ecf6e2073b4dd08f6ed165eae9b0647f2d0b9dc4] [formerly ecf26b3ac5 [formerly e681e0a457]]
Former-commit-id: e61b05086c2c01b59d4b8382331f85c7ecd4efa2 [formerly ecf26b3ac5]
Former-commit-id: 3c8bfc8160
|
2014-08-29 10:17:52 -05:00 |
|
Brian.Dyke
|
d238fe909f
|
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: f13953059a [formerly 0a5ddf7457] [formerly a08db8d73d] [formerly a08db8d73d [formerly e654318431]] [formerly f13953059a [formerly 0a5ddf7457] [formerly a08db8d73d] [formerly a08db8d73d [formerly e654318431]] [formerly aa83bf804f [formerly a08db8d73d [formerly e654318431] [formerly aa83bf804f [formerly 7334d3991903dfe8a62728de33c21e81534fdbb6]]]]]
Former-commit-id: aa83bf804f
Former-commit-id: a19455a35a [formerly 4a56b6f6e1] [formerly f90649d7e7] [formerly 68463cb724c8468f8978b5fb07a99445cf027313 [formerly c580412a81e899b2803a785d3de77c4ea7ca97b3] [formerly f90649d7e7 [formerly f7f16ff9eb]]]
Former-commit-id: 44ca35c910c7065b51dd3a76485e002ac8fcb63b [formerly 2b5f667a78842762d60c8ab0ba442f22b9229095] [formerly 7e4ab705cc [formerly c0dc594eda]]
Former-commit-id: 1cde9cd7bdfb3330564a42c1fce83730b50bbe4c [formerly 7e4ab705cc]
Former-commit-id: 2da6c7b93b
|
2014-08-27 11:19:19 -04:00 |
|
Qinglu.Lin
|
828c4a9e92
|
ASM #15700 - Warngen issues an error and toggles off on Radar update
Change-Id: I51085cd1bb9c7286719f1bff4e04abe5a7a2363b
Former-commit-id: 49d40dcaad [formerly bd03ec7a6f] [formerly 3cc94603a2] [formerly 3cc94603a2 [formerly fb92838427]] [formerly 49d40dcaad [formerly bd03ec7a6f] [formerly 3cc94603a2] [formerly 3cc94603a2 [formerly fb92838427]] [formerly 2157a4aa3b [formerly 3cc94603a2 [formerly fb92838427] [formerly 2157a4aa3b [formerly b8a4741b2519e8c02a1b80ba8544be9b1c26d35c]]]]]
Former-commit-id: 2157a4aa3b
Former-commit-id: 2c9cefb7cc [formerly 2cde7ae918] [formerly 787f157850] [formerly 5f5d6357d66ace0188b5112e5d26c63e0c2e9d4e [formerly 0f8e6a12a3a39382b7066fa24db8ef861b31c909] [formerly 787f157850 [formerly 3037a17366]]]
Former-commit-id: f13c8aadba268d1fb699654f07dafc55f2ba0b8e [formerly b6f56818727e927936380f47630dfcdd4372ea9f] [formerly 77e6647de8 [formerly 040e1071b2]]
Former-commit-id: 77e6647de8
Former-commit-id: 90cab42717
|
2014-08-21 10:43:22 -04:00 |
|
Mark Peters
|
d1778b2dea
|
Omaha #3523 Replace Raytheon usage of IGraphicsTarget.TextStyle.NORMAL and directly assigning the text style
Change-Id: Idcc31d11251df8de949bd1bd9bf8c402a5d47f4f
Former-commit-id: d6d5e603ba [formerly 3b4f4394be] [formerly f6799659ea] [formerly f6799659ea [formerly 308ada356b]] [formerly d6d5e603ba [formerly 3b4f4394be] [formerly f6799659ea] [formerly f6799659ea [formerly 308ada356b]] [formerly 4011a4392c [formerly f6799659ea [formerly 308ada356b] [formerly 4011a4392c [formerly e409b578fcb15caadf28da57d2cb1860e1ea246c]]]]]
Former-commit-id: 4011a4392c
Former-commit-id: 5c32f045b2 [formerly d44f96faf7] [formerly c36257683c] [formerly 8c273c11e6c4989e2319b9db09070396ca2cbb9f [formerly 36239d6a2b4b192a959b7634eec27016d32ed009] [formerly c36257683c [formerly 03229efe86]]]
Former-commit-id: 4643a8c890f49a3a35b4dde4208e1290f5fd8d9e [formerly 7bf2fb8b62683087abeeff26f6dac51b1f68e787] [formerly d63684feaa [formerly b7209bee6e]]
Former-commit-id: d63684feaa
Former-commit-id: 46a7c253cf
|
2014-08-14 15:43:17 -05:00 |
|
Nate Jensen
|
05fdcfc7e6
|
Omaha #3356 cleanup of unnecessary register buddies and buddy policies
Change-Id: I1d6c279478f38876a8df67d2f9dd186a2efdeca0
Former-commit-id: 48e85580e2 [formerly d61c65787b] [formerly 253198b5bc] [formerly 253198b5bc [formerly b3083a663e]] [formerly 48e85580e2 [formerly d61c65787b] [formerly 253198b5bc] [formerly 253198b5bc [formerly b3083a663e]] [formerly 9b72a1399d [formerly 253198b5bc [formerly b3083a663e] [formerly 9b72a1399d [formerly 48536dd79d933508ac54b3b6e9bbd166fd218330]]]]]
Former-commit-id: 9b72a1399d
Former-commit-id: e0328eddc2 [formerly e7b11aaf88] [formerly 58a4cb95c1] [formerly 8f077fe127a08e65001a02bd37b66aeb527c2ca4 [formerly 1fed4e6852cd8eca79ebee598c5badd5a0a3fe14] [formerly 58a4cb95c1 [formerly d67083655a]]]
Former-commit-id: b64298a90fcca2ad20ae920c1205c27ce153e775 [formerly 7e191ad12969bca5c4c6b83a1e9488c58f4c6928] [formerly 7336692b85 [formerly 951feab33d]]
Former-commit-id: 7336692b85
Former-commit-id: f7ae70ac02
|
2014-08-14 10:22:37 -05:00 |
|
Nate Jensen
|
ce1f9d264e
|
Merge "Omaha #3472 Clicking & dragging the Az/Ran Overlay tool off the map causes the map to jump" into omaha_14.4.1
Former-commit-id: db03a73688 [formerly 63fcba10af] [formerly de91441935] [formerly de91441935 [formerly fed30c111e]] [formerly db03a73688 [formerly 63fcba10af] [formerly de91441935] [formerly de91441935 [formerly fed30c111e]] [formerly 310f314b81 [formerly de91441935 [formerly fed30c111e] [formerly 310f314b81 [formerly 76ca557a25e6b09b3412cfe7a2d154b3a522cf74]]]]]
Former-commit-id: 310f314b81
Former-commit-id: beff93a7fc [formerly 0ba6735695] [formerly 94081ece24] [formerly 43aff2641ef8bb1bda94f6d8aaec95e061872c1b [formerly 0cbcd23250ff764b8aad0b69437fe722629a129c] [formerly 94081ece24 [formerly b6163075ef]]]
Former-commit-id: e332edc9c81cd56b344324534778f971d19adff9 [formerly b0749f974b0e552437b304650e974aa2d15c23e0] [formerly 99c2786f94 [formerly 424d770910]]
Former-commit-id: 99c2786f94
Former-commit-id: a6ea5a2460
|
2014-08-11 13:25:17 -05:00 |
|
Mark Peters
|
50555f12ec
|
Omaha #3472 Clicking & dragging the Az/Ran Overlay tool off the map causes the map to jump
Change-Id: I5dc3fc528a8e62dd32d87524f99adb1a8c9e610e
Former-commit-id: e02065a73b [formerly 68f61a9454] [formerly 5121ddaa12] [formerly 5121ddaa12 [formerly a73ca1f8c1]] [formerly e02065a73b [formerly 68f61a9454] [formerly 5121ddaa12] [formerly 5121ddaa12 [formerly a73ca1f8c1]] [formerly 490f7ea209 [formerly 5121ddaa12 [formerly a73ca1f8c1] [formerly 490f7ea209 [formerly 1b0ac4736f7d63c5e49a48a28473ad6a38e6b6ea]]]]]
Former-commit-id: 490f7ea209
Former-commit-id: 602c08c9a8 [formerly 99709893a6] [formerly bbef55b2ce] [formerly 30756c6f5a6eee75feb3ced6d46cda7ef2567059 [formerly 72801197d2cb43781b6b0d626677539fc74c6eab] [formerly bbef55b2ce [formerly ff4ac7cbab]]]
Former-commit-id: 705e3abc26ee1503ef53cb0a3fcf885b0bdbfc61 [formerly cff02307e33dc821b28fb8a939a47e7bb87d46fd] [formerly 6c55a465eb [formerly 164928997d]]
Former-commit-id: 6c55a465eb
Former-commit-id: b755b5ef78
|
2014-08-11 10:08:38 -05:00 |
|
Brian Clements
|
c550499050
|
Omaha #3503 common.serialization changes
moved adapters to new plugins
Change-Id: I34c66b004ce1c5aa61c093fe2eeb2fe8d3b138b6
Former-commit-id: b7fba0ee31 [formerly 81144aa9e2] [formerly 9c09de5779] [formerly 9c09de5779 [formerly 90d492c1dc]] [formerly b7fba0ee31 [formerly 81144aa9e2] [formerly 9c09de5779] [formerly 9c09de5779 [formerly 90d492c1dc]] [formerly 415f2dff64 [formerly 9c09de5779 [formerly 90d492c1dc] [formerly 415f2dff64 [formerly adba61c3714678ce57f0de5bfd4f9aa860098bd9]]]]]
Former-commit-id: 415f2dff64
Former-commit-id: 867e26edf7 [formerly e61bbeab33] [formerly d6aae6eaeb] [formerly 3ca04daa78d396f73a1b5822c2da624075666025 [formerly 4bbada7b433206885b217a05943790769bea6e90] [formerly d6aae6eaeb [formerly 0e415fd863]]]
Former-commit-id: 9763b8a3ec86a463bd6006600991ee00015a310d [formerly abe85f086aa74f360d31be08a09ecfa5ffe31308] [formerly b83ec9df6c [formerly 54742cff70]]
Former-commit-id: b83ec9df6c
Former-commit-id: 51f49bd36d
|
2014-08-08 12:50:06 -05:00 |
|
Nate Jensen
|
6744e9b91a
|
Merge "Omaha #3356 remove unnecessary usage of ext and global buddy policies" into omaha_14.4.1
Former-commit-id: ca12ec45b9 [formerly 9b617fb455] [formerly c30297b1b0] [formerly c30297b1b0 [formerly b3af25916c]] [formerly ca12ec45b9 [formerly 9b617fb455] [formerly c30297b1b0] [formerly c30297b1b0 [formerly b3af25916c]] [formerly 61654ad2d1 [formerly c30297b1b0 [formerly b3af25916c] [formerly 61654ad2d1 [formerly 01773a5dfc82902e28fa730e174177b2ce08934e]]]]]
Former-commit-id: 61654ad2d1
Former-commit-id: 91e0fdc16f [formerly 8cef2c2968] [formerly 251a3f7686] [formerly a573ce15fb73dc860bcb5c7b6682ef0406b2fcca [formerly 1803acf2f70a71bc163eb7d5db861505992fb442] [formerly 251a3f7686 [formerly 94994852f0]]]
Former-commit-id: f899a35f02a1b6e9b2c11dda6bfc4eeb78470a92 [formerly 8dc7de47f2cb7e9b1347b532714a57124cf5646c] [formerly c7512d7308 [formerly f05fd71463]]
Former-commit-id: c7512d7308
Former-commit-id: f16f664dca
|
2014-08-04 14:49:57 -05:00 |
|
Nate Jensen
|
22f50785f8
|
Omaha #3356 remove unnecessary usage of ext and global buddy policies
Change-Id: I0007eb5bb21bb3a3d7d0757bb53856054b4f380d
Former-commit-id: 84762a24ac [formerly 9f0bd349b6] [formerly 41eb72aefd] [formerly 41eb72aefd [formerly 06a64080e7]] [formerly 84762a24ac [formerly 9f0bd349b6] [formerly 41eb72aefd] [formerly 41eb72aefd [formerly 06a64080e7]] [formerly 857f1b70cc [formerly 41eb72aefd [formerly 06a64080e7] [formerly 857f1b70cc [formerly 41306351920aee44bdf2d9648616ddc8a4511632]]]]]
Former-commit-id: 857f1b70cc
Former-commit-id: b13964a73f [formerly e755076e88] [formerly 94399b57de] [formerly 4770c2dd06d94a89aa82046c3ac32760cd5a6155 [formerly 6820c43c0ca17c39dac7accbe6af17dc176d28b0] [formerly 94399b57de [formerly a920937cb5]]]
Former-commit-id: 2559546096de7ff2a9abb7ecca282fa99676ec34 [formerly bac985ba257cbf743e030d0988fd67f24eaea66e] [formerly cbf0360401 [formerly f51d409d97]]
Former-commit-id: cbf0360401
Former-commit-id: 9082d39544
|
2014-08-04 12:30:55 -05:00 |
|
Mark Peters
|
ae7d48f35a
|
Omaha #3430 Error returned when MB3 clicking off the map with a snapping tool in edit mode
Change-Id: Iba81f6dc58b1223252711296b66a88a8afb02cdd
Former-commit-id: 88a35686da [formerly e8e3c7858e] [formerly 7aee990658] [formerly 7aee990658 [formerly de149c4a4f]] [formerly 88a35686da [formerly e8e3c7858e] [formerly 7aee990658] [formerly 7aee990658 [formerly de149c4a4f]] [formerly cf2a2d47b9 [formerly 7aee990658 [formerly de149c4a4f] [formerly cf2a2d47b9 [formerly d81e1ac43cbf10b0cd6f475e41fc242ab3c6a3c7]]]]]
Former-commit-id: cf2a2d47b9
Former-commit-id: 7ad2eb5483 [formerly c8a5d8e195] [formerly dce12dda03] [formerly 11f3a1bca0fa34050c51277a0caf792e38c18e87 [formerly ec9f0a739d19d64ab795697121eac3d40fdc8d72] [formerly dce12dda03 [formerly 29bd1467dc]]]
Former-commit-id: 29db0811f8b7d40302712243e4895d05af3b4a44 [formerly f968d95dbcc97a44865b18b104c52f3b851b42cc] [formerly 5fec6a3fa8 [formerly 5d22073714]]
Former-commit-id: 5fec6a3fa8
Former-commit-id: e960a03a1c
|
2014-08-04 10:24:08 -05:00 |
|
Mark Peters
|
76521fe18e
|
Omaha #3465 Replace plugin calls to deprecated IGraphicsTarget.drawStrings()
Change-Id: Ib72cf8806852aff718af56c5f2c2cf4e07f9f548
Former-commit-id: 24108c38bd [formerly 90a74cb89b] [formerly b40e589488] [formerly b40e589488 [formerly ad794f8fba]] [formerly 24108c38bd [formerly 90a74cb89b] [formerly b40e589488] [formerly b40e589488 [formerly ad794f8fba]] [formerly 47aec2aae3 [formerly b40e589488 [formerly ad794f8fba] [formerly 47aec2aae3 [formerly 29d170af7a0c36e614a84923c2fb5054db73c390]]]]]
Former-commit-id: 47aec2aae3
Former-commit-id: b6af07e03c [formerly 661b68cfc7] [formerly 776d62c5f9] [formerly 70b53c87dad251fe4b7022b8aa47945e960077f7 [formerly 0e60c6aac1c5a6eccbb49b9c14a4b97cb0ee8748] [formerly 776d62c5f9 [formerly 6103909706]]]
Former-commit-id: 4bc0f847d8e3dfbb5b95f545df4435206e8e2bc3 [formerly d63f7c0d0c2d2c2632f8c39a5a674d29401fed39] [formerly fcdb86686d [formerly 79b4f922ec]]
Former-commit-id: fcdb86686d
Former-commit-id: de295d1c7c
|
2014-07-30 16:03:57 -05:00 |
|
Mark Peters
|
1ac3a2bc88
|
Omaha #3429 Replace Raytheon plugin calls to deprecated IGraphicsTarget.drawLine()
Change-Id: I9de68a9a047a2d6c3744b29de292efb7cfb44bbf
Former-commit-id: e9159478bf [formerly 6376572795] [formerly 11abefd4de] [formerly 11abefd4de [formerly 437e127ebc]] [formerly e9159478bf [formerly 6376572795] [formerly 11abefd4de] [formerly 11abefd4de [formerly 437e127ebc]] [formerly bac12d844b [formerly 11abefd4de [formerly 437e127ebc] [formerly bac12d844b [formerly a222b29ff24bf81d1c8aefd54fa33f52461c9c25]]]]]
Former-commit-id: bac12d844b
Former-commit-id: 3ae196a465 [formerly 88edbdafea] [formerly 95886b5ded] [formerly 1b7ff82efe7d342c527a9ee5c512eea5e9f2072d [formerly 1492820d8873fe4e06b826ecddbb5536f26a2abc] [formerly 95886b5ded [formerly 6edd39cc9e]]]
Former-commit-id: 5410719b9dbbd902591876c2e646fd37c5c84a70 [formerly cdffd110dc0c39f2afadf75b08b0881b15b96f9a] [formerly 011ef40360 [formerly baecaaaca0]]
Former-commit-id: 011ef40360
Former-commit-id: 5cbe006dc9
|
2014-07-29 11:20:53 -05:00 |
|
Mark Peters
|
f2f8cf087d
|
Omaha #3430 Remove errors returned when MB3 clicking off the map with snapping tool in editable mode
Change-Id: Id4fbe8480e1d796eed448a791982570bb85f657c
Former-commit-id: a8d9bb2c3f [formerly 14604bcc7b] [formerly 23538197f6] [formerly 23538197f6 [formerly 33e311c361]] [formerly a8d9bb2c3f [formerly 14604bcc7b] [formerly 23538197f6] [formerly 23538197f6 [formerly 33e311c361]] [formerly cc690ec2c3 [formerly 23538197f6 [formerly 33e311c361] [formerly cc690ec2c3 [formerly b27dc2ad7076e73461d880e4daa987f49496f30d]]]]]
Former-commit-id: cc690ec2c3
Former-commit-id: d12b1d5b1f [formerly e28f394b97] [formerly 0356569e9f] [formerly 3286f68aa7ed10abca651c827386b5d97a793cfd [formerly 2a77cc92bf9909ae7070ddd4770b41778d1e7c50] [formerly 0356569e9f [formerly c4eb912c7d]]]
Former-commit-id: ac05851a33a0ccfa234861455a3ee8748dd74542 [formerly 6a66f1dd7727d1b46bffd2ae45a9a31dbc699efb] [formerly 3393501814 [formerly 7685d6ac9a]]
Former-commit-id: 3393501814
Former-commit-id: ec50c16d7e
|
2014-07-28 14:44:28 -05:00 |
|
Lee Venable
|
752a04ac7e
|
Omaha #3400 - removed application modal shell style
Former-commit-id: 2d2fba8962 [formerly 8c010849e9] [formerly 4ec7dd68dc] [formerly 4ec7dd68dc [formerly 143e42b887]] [formerly 2d2fba8962 [formerly 8c010849e9] [formerly 4ec7dd68dc] [formerly 4ec7dd68dc [formerly 143e42b887]] [formerly c068efccc3 [formerly 4ec7dd68dc [formerly 143e42b887] [formerly c068efccc3 [formerly 4841fab5ff0eab3c4f27b56e71f2e4cb35b32aaa]]]]]
Former-commit-id: c068efccc3
Former-commit-id: a6ac923a62 [formerly fc1b82d9fd] [formerly f4555772f1] [formerly 2908e9b29b60d9a8eba9f0b42a153f24c86633dd [formerly 42f8430d6aecc8cade0a0e59ee771acb2c572849] [formerly f4555772f1 [formerly 82b9b320c5]]]
Former-commit-id: 8514c52d09d6f80e2439717f5ea78f68a126551f [formerly ddb40d450b39e9795a61cb98abb1c981ac66ee87] [formerly 5eb631d759 [formerly 7efc684837]]
Former-commit-id: 5eb631d759
Former-commit-id: e5c778806d
|
2014-07-25 10:56:48 -05:00 |
|
Mark Peters
|
0c23290fb9
|
Omaha #3412 Replace drawCircle calls
Change-Id: I812f1941b0fe1c7601126e327bb001772eedf5ca
Former-commit-id: cda57bcb66 [formerly d04f7dd252] [formerly b5a25e7372] [formerly b5a25e7372 [formerly e638d2f41b]] [formerly cda57bcb66 [formerly d04f7dd252] [formerly b5a25e7372] [formerly b5a25e7372 [formerly e638d2f41b]] [formerly e4c455f5c0 [formerly b5a25e7372 [formerly e638d2f41b] [formerly e4c455f5c0 [formerly c176ef7e45f8ad9e8273dd1a74ace2075aacdddd]]]]]
Former-commit-id: e4c455f5c0
Former-commit-id: 91701ce809 [formerly 66fafe363b] [formerly 30a6e96d7c] [formerly 7923a54c02727af1917ab51a198c4afa9b140493 [formerly a4e5ff382cd813f911beab0fb26c8f30196d7ec9] [formerly 30a6e96d7c [formerly e48c2b7116]]]
Former-commit-id: ca068803194c848d0f4dca18b6b84460890cca2f [formerly 781f6322906c1d4bfd6979543164111cd6386e57] [formerly 969c6a4685 [formerly 3aee17fbb5]]
Former-commit-id: 969c6a4685
Former-commit-id: 0411b26ec6
|
2014-07-21 17:07:02 -05:00 |
|
Richard Peter
|
9435beb69c
|
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: 94dfb1d2b8 [formerly ed38bf2372] [formerly 6636b301e5] [formerly 6636b301e5 [formerly 93bbd98cbc]] [formerly 94dfb1d2b8 [formerly ed38bf2372] [formerly 6636b301e5] [formerly 6636b301e5 [formerly 93bbd98cbc]] [formerly 8ecc27f714 [formerly 6636b301e5 [formerly 93bbd98cbc] [formerly 8ecc27f714 [formerly fc71e1cb26481e91c7d0c16ed0bd06ec5c8c22b9]]]]]
Former-commit-id: 8ecc27f714
Former-commit-id: 0d7f87bb5b [formerly 948e0cd011] [formerly 552ac6d640] [formerly 3802e1ae7885edfbc70e2a3fa559bbd04ab6bec5 [formerly bb5cc0ca71fa6abf17e95b29fbe41a184ac1297e] [formerly 552ac6d640 [formerly fc27824dbc]]]
Former-commit-id: bed0154ec372a35b775bee7dca9e16376b10aef8 [formerly 98c7362b289abd5b8e115f957b14dcd73116b99a] [formerly 342192e967 [formerly 0fefdc7cd6]]
Former-commit-id: 342192e967
Former-commit-id: 0b0b58e89c
|
2014-07-01 15:34:39 -05:00 |
|
Steve Harris
|
7a29f74a3d
|
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: b2ca44adc7 [formerly 741dc31fcb] [formerly 2f2958df37] [formerly 2f2958df37 [formerly d4dc1723c1]] [formerly b2ca44adc7 [formerly 741dc31fcb] [formerly 2f2958df37] [formerly 2f2958df37 [formerly d4dc1723c1]] [formerly 7acd9ab2dd [formerly 2f2958df37 [formerly d4dc1723c1] [formerly 7acd9ab2dd [formerly d25ab509cb53d559edbd520dd1e3c036166f2e29]]]]]
Former-commit-id: 7acd9ab2dd
Former-commit-id: 020a525bfd [formerly d70da4127e] [formerly 7fb4663d75] [formerly 3e0604521c6e7522f3a4123eee8600cb5a71226f [formerly 109f5e557e8f5a7076b56c4f8d0f0c548c0f0cc6] [formerly 7fb4663d75 [formerly dcbab5621f]]]
Former-commit-id: 9365f3461acd78bd354b2cc5cd317b9d8c76d98e [formerly 8343b8e876918b72044e0b509f5b5b8afdbd53e2] [formerly 8fb747ad27 [formerly 71357da9d2]]
Former-commit-id: 8fb747ad27
Former-commit-id: 1bbbdc9c62
|
2014-07-01 11:08:46 -04:00 |
|
Steve Harris
|
eca5b25817
|
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: 37b3b421db [formerly 869235c02a] [formerly 16f5ff0979] [formerly 16f5ff0979 [formerly b84dda5930]] [formerly 37b3b421db [formerly 869235c02a] [formerly 16f5ff0979] [formerly 16f5ff0979 [formerly b84dda5930]] [formerly 419c5f4aba [formerly 16f5ff0979 [formerly b84dda5930] [formerly 419c5f4aba [formerly ce5767f2bbf5c9627bd43e766c6193c261c48af3]]]]]
Former-commit-id: 419c5f4aba
Former-commit-id: 8e58645759 [formerly bab435f286] [formerly af06c5a890] [formerly a279361a319d31856e62ae271287fe2634f63eea [formerly dd639a780b77ef5a2f827ee961c20e9db23d2d31] [formerly af06c5a890 [formerly 66d30e59a3]]]
Former-commit-id: e21ac397453f253cbebf9ec8143ee59c17397567 [formerly 27bd7f3ff5ce8e46cd91569a3f0cf62fa9127e53] [formerly 196f53e609 [formerly 935542914d]]
Former-commit-id: 196f53e609
Former-commit-id: 7e7529e482
|
2014-06-20 14:01:55 -04:00 |
|
Brian.Dyke
|
4ab4b1ef0c
|
CM-MERGE:OB13.5.6-4 into 14.1.3
Former-commit-id: 48fb810c83 [formerly e3dc97e246] [formerly be589ceb9b] [formerly be589ceb9b [formerly 399c06820a]] [formerly 48fb810c83 [formerly e3dc97e246] [formerly be589ceb9b] [formerly be589ceb9b [formerly 399c06820a]] [formerly 8ecdd9a192 [formerly be589ceb9b [formerly 399c06820a] [formerly 8ecdd9a192 [formerly 86dc406cd227362abc5274f4cd64813ceb91d00d]]]]]
Former-commit-id: 8ecdd9a192
Former-commit-id: c220a11003 [formerly f09000ec64] [formerly e28febcf27] [formerly 00089684d6f405bf63b66585cb6f0cb2bd6fb18d [formerly 9723a25d830a41cf2e060dc218ad841643217c3e] [formerly e28febcf27 [formerly 9031f58d02]]]
Former-commit-id: 9b1a982118aacc5098b56968eb1784574b216c56 [formerly c6144f8a9f4e5c44b2c2c7442f0100f646622fba] [formerly b602d29456 [formerly 3e10995d87]]
Former-commit-id: 6ae36b38dc1dffb3b54c97f99b7dad83ade736bc [formerly b602d29456]
Former-commit-id: 71ca3ae180
|
2014-06-18 08:55:49 -04:00 |
|
Ben Steffensmeier
|
12f1335e37
|
Omaha #2061 Remove references to IDecoderGettable.Amount from Range Rings.
Former-commit-id: 30f908214c [formerly db668f8b63] [formerly 5a4f7a1fd4] [formerly 5a4f7a1fd4 [formerly f292f204c9]] [formerly 30f908214c [formerly db668f8b63] [formerly 5a4f7a1fd4] [formerly 5a4f7a1fd4 [formerly f292f204c9]] [formerly fc25774506 [formerly 5a4f7a1fd4 [formerly f292f204c9] [formerly fc25774506 [formerly e267e8b0bae314abf3396db6072c6ff8adc732bf]]]]]
Former-commit-id: fc25774506
Former-commit-id: 9674d36a4b [formerly c9b474afb9] [formerly 217734a2ba] [formerly be5bde5991bd716e9c4e96137ef854d6191319ed [formerly f401961b28b14a7264ad7debe15758c82f45e504] [formerly 217734a2ba [formerly 94b465fa15]]]
Former-commit-id: e6dcbe48395477b8fe3ef98bacecea12d82cb2da [formerly 0558994679c2da78da91ba8ad2e4c69c953ea5d5] [formerly 2aebff4f06 [formerly 3c8b94e08a]]
Former-commit-id: 2aebff4f06
Former-commit-id: ed865c330a
|
2014-06-11 13:45:42 -05:00 |
|
Ben Steffensmeier
|
4ef7eeae94
|
Omaha #3263 Synchronize dataTimes of storm track resources.
Former-commit-id: ce53d5ca1f [formerly e7128150f9] [formerly 8783e9e23c] [formerly 8783e9e23c [formerly eff1921f70]] [formerly ce53d5ca1f [formerly e7128150f9] [formerly 8783e9e23c] [formerly 8783e9e23c [formerly eff1921f70]] [formerly cad15768cc [formerly 8783e9e23c [formerly eff1921f70] [formerly cad15768cc [formerly d0a3a73a3a2375a49dc3e224a1c13956530d3351]]]]]
Former-commit-id: cad15768cc
Former-commit-id: c5e5b19fc1 [formerly 814cabbcfc] [formerly e4ac81c0e9] [formerly eeb8a4b72c5d6ce60bd9e2c0d9773abf9663de72 [formerly 0968abe7b80aa03d6d67b8c88ad9529a151531f3] [formerly e4ac81c0e9 [formerly b02383f878]]]
Former-commit-id: 56c490c8055a698dc83ee98332adee60efb16a3c [formerly f97a310ca82b1a763f344ac25119445501694a5b] [formerly c0b8a49ee9 [formerly f60667703f]]
Former-commit-id: c0b8a49ee9
Former-commit-id: 82f3aaa41e
|
2014-06-10 16:34:44 -05:00 |
|
Brian.Dyke
|
d4db1ed8e9
|
Merge branch 'master_14.1.3' into master_14.2.2 CM-MERGE:14.1.3-1 into 14.2.2
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
Former-commit-id: e46de9cb1a [formerly 7056d79f70] [formerly 0f07e14bf1] [formerly 0f07e14bf1 [formerly f72380ad60]] [formerly e46de9cb1a [formerly 7056d79f70] [formerly 0f07e14bf1] [formerly 0f07e14bf1 [formerly f72380ad60]] [formerly 9ab17ddecb [formerly 0f07e14bf1 [formerly f72380ad60] [formerly 9ab17ddecb [formerly 797aa6bfbf2802aa7355b7a4a77d0fb4f54dfd6a]]]]]
Former-commit-id: 9ab17ddecb
Former-commit-id: 28ccd9ecc0 [formerly 5893782ec3] [formerly 816dcf74e4] [formerly 57cdbcea8780144a4444063478dccb85ddbc4c69 [formerly d838e1972c1a8529e2efc996d44a235ce685e8db] [formerly 816dcf74e4 [formerly 49cd9574d9]]]
Former-commit-id: 0d019fed510d7de771ca0535a93e09b4ae8af7ee [formerly b46938d836881d648f671f55d48408d36e6cb22f] [formerly 1ae1410e46 [formerly a4b39dfca5]]
Former-commit-id: 9b065abc04253aaf413ebdfaa1eb4821960d6127 [formerly 1ae1410e46]
Former-commit-id: f5befd7116
|
2014-06-10 13:56:03 -04:00 |
|
Brian.Dyke
|
ade575138d
|
CM-MERGE:OB13.5.6-1,-2 into 14.1.3
Former-commit-id: f512b9c51e [formerly 64a10ce12d] [formerly ef5c74dece] [formerly ef5c74dece [formerly c1b3f9d180]] [formerly f512b9c51e [formerly 64a10ce12d] [formerly ef5c74dece] [formerly ef5c74dece [formerly c1b3f9d180]] [formerly 8874d41872 [formerly ef5c74dece [formerly c1b3f9d180] [formerly 8874d41872 [formerly b859032bcec187616adfd414dd1ce5fe27829e9e]]]]]
Former-commit-id: 8874d41872
Former-commit-id: 2c9cdbd7b6 [formerly d6ebcad87e] [formerly 4f0fc67b1f] [formerly 5a09a2a2fc07851b1a02ee853528cabdf2c91146 [formerly c763da54d370b72fa17bd0154f839ff80cd9226a] [formerly 4f0fc67b1f [formerly f568b5606a]]]
Former-commit-id: a96ceafe13347c19b02a306f8b8e4b0d3f27c638 [formerly cb4c4f5cdbcafd5e7f18339757c3484f03c17e30] [formerly a39afc1dfa [formerly 81d732477e]]
Former-commit-id: a39afc1dfa
Former-commit-id: 7caa757318
|
2014-06-10 12:52:59 -04:00 |
|
Michael Gamazaychikov
|
0324991ba7
|
ASM #114 - Problem with Distance Speed Tool.
Change-Id: I2b3218b2fb407f99cf9c81edf69feb042a6fee75
Former-commit-id: 9c8ea9175b [formerly efd0fb50b8] [formerly e5a9fa0827] [formerly e5a9fa0827 [formerly c07bcacbf8]] [formerly 9c8ea9175b [formerly efd0fb50b8] [formerly e5a9fa0827] [formerly e5a9fa0827 [formerly c07bcacbf8]] [formerly 50ab77046b [formerly e5a9fa0827 [formerly c07bcacbf8] [formerly 50ab77046b [formerly a38308fa5a6efe9a07ecd84bd93662bea32afc94]]]]]
Former-commit-id: 50ab77046b
Former-commit-id: 0ec2896a37 [formerly fc5acb6bcb] [formerly a2423cfadc] [formerly b40093b9faa61b20a9a359277a1abd5814e2eb35 [formerly a99f478987db9b40c18652f3f209154a8dfc3177] [formerly a2423cfadc [formerly 5efb82ea3e]]]
Former-commit-id: e8b0cdce3cdf55a8a7b31e9d96c3de482663ffb0 [formerly 177375df5384d0a8fa51c23b24915e671ade7ce1] [formerly 94595e6af4 [formerly 29e197404f]]
Former-commit-id: 94595e6af4
Former-commit-id: b3afeb981b
|
2014-06-05 13:43:04 +01:00 |
|
Michael Gamazaychikov
|
84473205db
|
ASM #114 - Problem with Distance Speed Tool (merge with 13.5.4 changes).
Change-Id: Ic4d6f50c28d0aba440a02010b09b2e3b3117fe85
Former-commit-id: 4c1074cd34 [formerly b3d76892d1] [formerly 8ae5d535de] [formerly 8ae5d535de [formerly 63409ef272]] [formerly 4c1074cd34 [formerly b3d76892d1] [formerly 8ae5d535de] [formerly 8ae5d535de [formerly 63409ef272]] [formerly 5bff9f2ac8 [formerly 8ae5d535de [formerly 63409ef272] [formerly 5bff9f2ac8 [formerly f3ee76edfd95e9c25eff89d1ecbff9e466b3ca75]]]]]
Former-commit-id: 5bff9f2ac8
Former-commit-id: f68a237e53 [formerly b499ee2828] [formerly 0d38d04dad] [formerly de86e857178734353fddc8c8ca7cbe90cd21da1b [formerly 3f60fc9aefaa49ce841bebfd87ef42af677038af] [formerly 0d38d04dad [formerly 134f486069]]]
Former-commit-id: e276a04692b5c4c1d22213d29fc890697741ccff [formerly de7589ac82c2fe4ab8fce61c3a0e6a30b30502d2] [formerly 0217549622 [formerly 55d44735ef]]
Former-commit-id: 0217549622
Former-commit-id: a8672786bf
|
2014-05-21 15:12:08 +01:00 |
|
brian.dyke
|
5e35d72091
|
Merge branch 'master_14.3.1-4' into asm_14.3.1
Conflicts:
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResource.java
edexOsgi/com.raytheon.uf.edex.grid.staticdata/src/com/raytheon/uf/edex/grid/staticdata/StaticDataGenerator.java
edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/purge/gridPurgeRules.xml
Former-commit-id: 8fc637d27d [formerly 4d161aaf90] [formerly 9626317825] [formerly 9626317825 [formerly 011d121e4b]] [formerly 8fc637d27d [formerly 4d161aaf90] [formerly 9626317825] [formerly 9626317825 [formerly 011d121e4b]] [formerly 58683ad040 [formerly 9626317825 [formerly 011d121e4b] [formerly 58683ad040 [formerly 52358cb3e2ba2c7ff4ff9c9a5de03af50c3a1199]]]]]
Former-commit-id: 58683ad040
Former-commit-id: ff29ac1dd9 [formerly a2add51880] [formerly 2e105c1d5d] [formerly dd84aabda68bf0ba92959f80f4ff4af042362e53 [formerly cba44a8343721392c8a010e859fb1efaca4b604b] [formerly 2e105c1d5d [formerly bc4649765a]]]
Former-commit-id: 88785597564d5189fdec2d4d2cb7af8f51f44e24 [formerly 161c7365002f1434a02f072bc8ba71aba3cbf346] [formerly b2e3c50ec0 [formerly b42011fc76]]
Former-commit-id: b2e3c50ec0
Former-commit-id: 5c9495ee04
|
2014-05-19 09:45:37 -04:00 |
|
Qinglu.Lin
|
26a7d15172
|
ASM #514 - Line of Storms functionality behaving oddly in WarnGen
Change-Id: I0bd2b9e4200b5acbb19a06caa45f18d36346de39
Former-commit-id: d65b42634a [formerly d3220c8e71] [formerly 5f0e0bda69] [formerly 5f0e0bda69 [formerly 18e92f03c1]] [formerly d65b42634a [formerly d3220c8e71] [formerly 5f0e0bda69] [formerly 5f0e0bda69 [formerly 18e92f03c1]] [formerly d8753a4145 [formerly 5f0e0bda69 [formerly 18e92f03c1] [formerly d8753a4145 [formerly 66a6c50cd501358e0c8c993631b288aa78dfdc97]]]]]
Former-commit-id: d8753a4145
Former-commit-id: d5ecef6039 [formerly 153128e11e] [formerly 580d7e3ba7] [formerly c36f5c8397b6ef8ccad39b5be803ab467a88b70b [formerly de233bb13dc17298e3aa8b3e59813a4bc72ebe5a] [formerly 580d7e3ba7 [formerly 8de2d2f718]]]
Former-commit-id: 37c8c5718d1c15e0534c17f1c919bc523c172699 [formerly 27cacced16ec33e1bb5c01e87c75e6050fffec36] [formerly 03f7862321 [formerly 6ba15bd00c]]
Former-commit-id: 03f7862321
Former-commit-id: db716647bb
|
2014-05-05 11:54:56 -04:00 |
|
Richard Peter
|
be03491898
|
Merge branch 'master_14.3.1' (14.3.1-2) into omaha_14.3.1
Conflicts:
cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/CaseCreationDlg.java
cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/GenerateCaseDlg.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.edex.utilitysrv/res/spring/utility-request.xml
edexOsgi/com.raytheon.uf.common.colormap/src/com/raytheon/uf/common/colormap/image/Colormapper.java
edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/SerializationUtil.java
edexOsgi/com.raytheon.uf.edex.textdbsrv/res/spring/textdbsrv-request.xml
Change-Id: I316979d4036b2e2d05b361c8c466747b04ee4900
Former-commit-id: 3d9938c5a3 [formerly 8b1a177110] [formerly 67683dd891] [formerly 67683dd891 [formerly 44b1782461]] [formerly 3d9938c5a3 [formerly 8b1a177110] [formerly 67683dd891] [formerly 67683dd891 [formerly 44b1782461]] [formerly 32957285fc [formerly 67683dd891 [formerly 44b1782461] [formerly 32957285fc [formerly 311c52426b3715d3a73c1fa79a8fd427a4b1b09d]]]]]
Former-commit-id: 32957285fc
Former-commit-id: a0ffae6c6b [formerly 0dfa8cc4c6] [formerly 6966b79246] [formerly f7f2cdcc4b250524846ce9a4063e651d4182d7a2 [formerly 2a324b0264c6962014f41df55690c7e2b09955e1] [formerly 6966b79246 [formerly 80d4153878]]]
Former-commit-id: 986eca78fd87d8ec7780dff8945df5a6f4027c92 [formerly 5715dc841fc8db519f94f6126094e2ff4eb83ea8] [formerly 938e39a0fc [formerly 24a3fe1466]]
Former-commit-id: bdad2c5a4d9e80d74a8de91b9c0f77f719cfbb3d [formerly 938e39a0fc]
Former-commit-id: e748b7c1e5
|
2014-04-28 16:27:40 -05:00 |
|
Brian.Dyke
|
cec09f3da0
|
Merge branch 'master_14.2.2' into master_14.3.1
Merge (14.2.2-5 into 14.3.1-1)
Conflicts:
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/GFESpatialDisplayManager.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/grid/dataset/alias/gfeParamInfo.xml
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py
edexOsgi/com.raytheon.uf.common.archive/src/com/raytheon/uf/common/archive/config/ArchiveConfigManager.java
edexOsgi/com.raytheon.uf.common.python/utility/common_static/base/python/MasterInterface.py
edexOsgi/com.raytheon.uf.edex.datadelivery.registry/src/com/raytheon/uf/edex/datadelivery/registry/federation/RegistryFederationManager.java
edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/ebxml/services/lifecycle/LifecycleManagerImpl.java
Former-commit-id: 83727709c6 [formerly 362d882b40] [formerly f0b8ea5822] [formerly f0b8ea5822 [formerly fb1f5aa593]] [formerly 83727709c6 [formerly 362d882b40] [formerly f0b8ea5822] [formerly f0b8ea5822 [formerly fb1f5aa593]] [formerly 3524838f9f [formerly f0b8ea5822 [formerly fb1f5aa593] [formerly 3524838f9f [formerly f54d2c639a915db14f01f56a7fcc5841b60e1509]]]]]
Former-commit-id: 3524838f9f
Former-commit-id: 3e80889eb6 [formerly 14a63a19e1] [formerly bf3758efa3] [formerly 7eb8ff57ff4d7d383497a38960663b90f905f7b8 [formerly bb5a7e713dac6962660d9c769971464b6792cb76] [formerly bf3758efa3 [formerly 029f5753ad]]]
Former-commit-id: 960ad127021a3962ec78e308ec84ad9dadc4cc78 [formerly 4f6c777830575250a298510d89cfba1ef9df9753] [formerly f31d8cc8cf [formerly c6d3fe6952]]
Former-commit-id: f31d8cc8cf
Former-commit-id: 19b4bb7dcc
|
2014-04-25 11:06:11 -04:00 |
|
Lee Venable
|
7fa79ba236
|
Issue #3041 - added dispose check to runAsync call and cleaned up code.
Change-Id: I50e6ce1a214a884221fbc256a133e57e579862da
Former-commit-id: 0423078c18 [formerly ed407b11c6] [formerly ac914e72e7] [formerly ac914e72e7 [formerly 3c45a24efb]] [formerly 0423078c18 [formerly ed407b11c6] [formerly ac914e72e7] [formerly ac914e72e7 [formerly 3c45a24efb]] [formerly dcb7e697e8 [formerly ac914e72e7 [formerly 3c45a24efb] [formerly dcb7e697e8 [formerly ed2fc05f61861efe6c70b8fc73ad10d27bb73c12]]]]]
Former-commit-id: dcb7e697e8
Former-commit-id: 732d8ef70d [formerly e5d73f64ac] [formerly 91d37d783c] [formerly 55fb8423e3d752d6ff7f3e53b388c74319114bae [formerly dcaad16ef8d601c796b1e22040cf86806d2002cf] [formerly 91d37d783c [formerly 20764b1d97]]]
Former-commit-id: 7eb7b41f366a7c4e64fa9a9c7a712ab4369cdd15 [formerly af8a618de055822348d6ef19a4bba61729b5bc48] [formerly d6e34a221f [formerly 294d8ff917]]
Former-commit-id: d6e34a221f
Former-commit-id: 69a239a78a
|
2014-04-21 13:47:31 -05:00 |
|
Brian.Dyke
|
10015e8c95
|
Merged 14.2.1 -17, -18 into 1422-3
Former-commit-id: ad705df872 [formerly 735801a7e7] [formerly 9df6fb2d4d] [formerly 9df6fb2d4d [formerly 12a482e1d7]] [formerly ad705df872 [formerly 735801a7e7] [formerly 9df6fb2d4d] [formerly 9df6fb2d4d [formerly 12a482e1d7]] [formerly b8829139a2 [formerly 9df6fb2d4d [formerly 12a482e1d7] [formerly b8829139a2 [formerly 712064db471de93da585f9c765bb4dfbe510df53]]]]]
Former-commit-id: b8829139a2
Former-commit-id: 44cb4a3b7d [formerly 9c4385efbe] [formerly 6f35818917] [formerly 500f2f566a21bd3825b53550bfa48de4104809bd [formerly 007cb5daf20362de356dbfbefce51ee972d9ab3a] [formerly 6f35818917 [formerly 0ea7c51ad7]]]
Former-commit-id: b099056d209b8945faf5704944762075e646cac8 [formerly 286e1b30c773c91540e1e54ed0825014dadb3b10] [formerly de500c093f [formerly a925ba6219]]
Former-commit-id: de500c093f
Former-commit-id: 143d9a143a
|
2014-04-17 14:42:35 -04:00 |
|
Richard Peter
|
cc60be39d7
|
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: 0fa9c8709a [formerly 9b12d9ddaf] [formerly cd51f3fa87] [formerly cd51f3fa87 [formerly 3575d6586f]] [formerly 0fa9c8709a [formerly 9b12d9ddaf] [formerly cd51f3fa87] [formerly cd51f3fa87 [formerly 3575d6586f]] [formerly 21ae3b5fcd [formerly cd51f3fa87 [formerly 3575d6586f] [formerly 21ae3b5fcd [formerly bd13bc332bcdd87723bec8669885f4594ad483b9]]]]]
Former-commit-id: 21ae3b5fcd
Former-commit-id: a655029277 [formerly 56089894f2] [formerly d65b11d404] [formerly cba185d0d926f9dea67500ef8d8ab9da489ee4bb [formerly 9377474013cb8e8722b3a32e83523c417b87fcd0] [formerly d65b11d404 [formerly a7ec0bcf66]]]
Former-commit-id: 70c651ece580f217c6e5e6df78b1cbb6c5cec4c5 [formerly ea5917ddde80aa4f2fa095272512ef873794f21c] [formerly a22345ea6b [formerly b6482f2e54]]
Former-commit-id: e0178e9061d12ecb24c62f10b17719ef0668f099 [formerly a22345ea6b]
Former-commit-id: 626ab0bd58
|
2014-04-11 16:23:09 -05:00 |
|
Richard Peter
|
3425d4bf98
|
Merge branch 'master_14.1.2' into master_14.2.1
Conflicts:
cave/build/static/common/cave/etc/gfe/userPython/textUtilities/regular/VectorRelatedPhrases.py
cave/com.raytheon.uf.viz.thinclient.cave/src/com/raytheon/uf/viz/thinclient/cave/refresh/ThinClientDataUpdateTree.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/GfeClient.java
edexOsgi/build.edex/esb/conf/log4j.xml
edexOsgi/build.edex/esb/data/utility/edex_static/base/textproducts/templates/utility/SAF_Site_MultiPil_Definition.py
edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/SerializationUtil.java
edexOsgi/com.raytheon.uf.edex.activetable/utility/common_static/base/vtec/MergeVTEC.py
Former-commit-id: 288febacc7 [formerly efd1003a50] [formerly 5676090443] [formerly 5676090443 [formerly 95eba8dcf6]] [formerly 288febacc7 [formerly efd1003a50] [formerly 5676090443] [formerly 5676090443 [formerly 95eba8dcf6]] [formerly b15d288530 [formerly 5676090443 [formerly 95eba8dcf6] [formerly b15d288530 [formerly 3c8cf44cc2573c17e20c93fd5153c5ed54df12c2]]]]]
Former-commit-id: b15d288530
Former-commit-id: 7cfc0b06c7 [formerly 47795836f2] [formerly f1b85f6964] [formerly ed8609133e05b5d0ee1912e5ac34a16a3fe104ac [formerly 12e55bf5c019cdd33ebe8c550d444fb3e73016ff] [formerly f1b85f6964 [formerly 73aab15d85]]]
Former-commit-id: 6626f62bd1588dc01ce63797bcf8d58af4b1297d [formerly 3660d57b987b8ab590b095e98b193f3d1ff95669] [formerly 421b2716a4 [formerly b667e0509f]]
Former-commit-id: 421b2716a4
Former-commit-id: 52a54f5e9f
|
2014-04-09 16:00:54 -05:00 |
|
Brian.Dyke
|
b658b5f6e3
|
Merged 1354 -7 and -8 into 1412
Former-commit-id: 2ab8bd77d9 [formerly 7de936dfba] [formerly e4136f79dd] [formerly e4136f79dd [formerly 947194c998]] [formerly 2ab8bd77d9 [formerly 7de936dfba] [formerly e4136f79dd] [formerly e4136f79dd [formerly 947194c998]] [formerly 929b736038 [formerly e4136f79dd [formerly 947194c998] [formerly 929b736038 [formerly 082b54dc10676b7090f8a1c9a01929a6d7da2667]]]]]
Former-commit-id: 929b736038
Former-commit-id: ce1349740a [formerly a6ebdbfc3a] [formerly d76d3a26cb] [formerly 33d6d32d894986ee2f5ffc28ddcd6ef5cc520fdd [formerly ef99224ab38fbdf6c62ed3f358f4c50051cbc248] [formerly d76d3a26cb [formerly 5163a31a66]]]
Former-commit-id: 42d85363cd5650bc15042d72f7c945046ecf99f8 [formerly 281a7b2833a1dc51969eab1f2b614dfd6fa8f7eb] [formerly 8ef50f023b [formerly 462952ce65]]
Former-commit-id: b2323c9228e7ea0d024a7d90a43f0aa5061524ba [formerly 8ef50f023b]
Former-commit-id: 38a8f60a43
|
2014-04-09 11:39:07 -04:00 |
|
Everett Kladstrup
|
0071c738d4
|
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: 853bc4ad0b [formerly eab1358602] [formerly 8b19b3601a] [formerly 8b19b3601a [formerly 06d6961c0f]] [formerly 853bc4ad0b [formerly eab1358602] [formerly 8b19b3601a] [formerly 8b19b3601a [formerly 06d6961c0f]] [formerly 0699041518 [formerly 8b19b3601a [formerly 06d6961c0f] [formerly 0699041518 [formerly ad4a8cfbbc6de72810492c8f1de9701d381b6019]]]]]
Former-commit-id: 0699041518
Former-commit-id: 4c60039942 [formerly 29ce7781c9] [formerly 86bf2b5ea0] [formerly 1ffb072e3ddcc73123d0d9bf8e3ed1cb9a342b66 [formerly eb5b00071037510aefc04c8c20411cc18c44abb0] [formerly 86bf2b5ea0 [formerly 260d0beddc]]]
Former-commit-id: c5e0dbcd1c615a2e22f6ed46d6ca3390f60edfd7 [formerly 41d01092799ccea952f65c9d6b66d93b56557541] [formerly 7b2683532a [formerly d96b56c91a]]
Former-commit-id: 7b2683532a
Former-commit-id: f815fbcb60
|
2014-04-09 09:31:12 -05:00 |
|
Brian.Dyke
|
55bcb03c5c
|
Merged 1354 -5 and -6 into 1412 based on 1411-25
Former-commit-id: 0c8117982f [formerly 2eec862ebb] [formerly 17477e7db1] [formerly 17477e7db1 [formerly 6a28fcb156]] [formerly 0c8117982f [formerly 2eec862ebb] [formerly 17477e7db1] [formerly 17477e7db1 [formerly 6a28fcb156]] [formerly dd98c213c7 [formerly 17477e7db1 [formerly 6a28fcb156] [formerly dd98c213c7 [formerly 407b42b0eff676a95483e219d6be899e45effd6c]]]]]
Former-commit-id: dd98c213c7
Former-commit-id: a1b4b5a315 [formerly 8ba2694d8e] [formerly 47d9095211] [formerly fc3c00a17bb7a79f8b61454b8d40e68f136d1ced [formerly 637b118d4cff6a2a054282ce2aabc47a5819c54c] [formerly 47d9095211 [formerly 9f37f61cf8]]]
Former-commit-id: 370566fade3e49cee3d314d2d3ac2049f642d474 [formerly a50a2cebaea771c45178ef7f0d701260c24962c6] [formerly 39b5e7fe67 [formerly be574897cc]]
Former-commit-id: 39b5e7fe67
Former-commit-id: ae3f5dbff6
|
2014-04-04 12:57:32 -04:00 |
|
David Friedman
|
8230919596
|
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: b3492e55de [formerly ee37afaf7b] [formerly 32a7adbe4b] [formerly 32a7adbe4b [formerly fd900e38c2]] [formerly b3492e55de [formerly ee37afaf7b] [formerly 32a7adbe4b] [formerly 32a7adbe4b [formerly fd900e38c2]] [formerly f146c7bcd0 [formerly 32a7adbe4b [formerly fd900e38c2] [formerly f146c7bcd0 [formerly cf35c1870fc4b6b3c2ceaf038274c4701f8046b1]]]]]
Former-commit-id: f146c7bcd0
Former-commit-id: b0bec4816d [formerly 1e4ac84f99] [formerly 1168a3eae5] [formerly 292af91e33e58076664a7b293339b7ad623ff349 [formerly 06e6f2e7e7ae2f1959eaefcb5e76c2a04c33de99] [formerly 1168a3eae5 [formerly 533d15c863]]]
Former-commit-id: 241abf743c90e94431e5559e7fcdeb450730b8fb [formerly beb961d5304e2c2df6afc0538bae8011c8b6f63f] [formerly 8f8f55dd3c [formerly dde12b4fc3]]
Former-commit-id: 8f8f55dd3c
Former-commit-id: 8ea6e0b064
|
2014-03-27 19:17:03 +00:00 |
|
Max Schenkelberg
|
3f97b77096
|
Issue #2804 Fixed clipping pane issues where clipped map borders would be visible due to other resources not resetting up the clipping pane when done.
Change-Id: If27cd7c8e11cdc6287303e6d5fc1f4990e300ada
Former-commit-id: 70fec6a068 [formerly 4bcdc9f85b] [formerly 6edfb8965f] [formerly 6edfb8965f [formerly dbcbd1b560]] [formerly 70fec6a068 [formerly 4bcdc9f85b] [formerly 6edfb8965f] [formerly 6edfb8965f [formerly dbcbd1b560]] [formerly 1854bbb477 [formerly 6edfb8965f [formerly dbcbd1b560] [formerly 1854bbb477 [formerly 51664693bd87df52acdb74d5286b61eeb06b792d]]]]]
Former-commit-id: 1854bbb477
Former-commit-id: 19d25e1f8c [formerly c37910a689] [formerly bff80c3ee9] [formerly 8560eb0aef67c72443f4df3086c608f06a5633e2 [formerly 64e66813ccc56d3b7a703a331fd119c8cbcceb08] [formerly bff80c3ee9 [formerly 6658c94e6e]]]
Former-commit-id: 700d3caaa366fc60355ca674c37b2af27364f8fd [formerly ac56a95b831199d75f4f7799c88a6cd9f119118f] [formerly 83103254e7 [formerly 96bdc00728]]
Former-commit-id: 83103254e7
Former-commit-id: bee18f29d0
|
2014-03-03 17:59:48 -06:00 |
|
Juliya Dynina
|
3b33f5d7eb
|
Merge "ASM #114" into asm_14.2.2
Former-commit-id: a337a92f7b [formerly dd71746c6f] [formerly 3edd73f78c] [formerly 3edd73f78c [formerly 575ed3610d]] [formerly a337a92f7b [formerly dd71746c6f] [formerly 3edd73f78c] [formerly 3edd73f78c [formerly 575ed3610d]] [formerly c6253811e8 [formerly 3edd73f78c [formerly 575ed3610d] [formerly c6253811e8 [formerly d719e88d510424020955f06d8b597d2df3573836]]]]]
Former-commit-id: c6253811e8
Former-commit-id: c5ffcd2aae [formerly d191fb83af] [formerly f54454f8f1] [formerly 4cc610007f8835901f4aaa806393ebc6efdf9d07 [formerly f3f8b80f5f698a4e575a4f3e5ff5b88856aa9c27] [formerly f54454f8f1 [formerly 430b9a1ace]]]
Former-commit-id: a8484991806043844216d6be8c7f8e23db9faa50 [formerly 98f642b65c54a5116368dc81ddbcde695e6ba5e2] [formerly 05ad2e4da5 [formerly eb96dc613f]]
Former-commit-id: 05ad2e4da5
Former-commit-id: f5a8116a91
|
2014-02-05 10:42:30 -05:00 |
|
David Friedman
|
f0c6c25b8b
|
ASM #110
Change-Id: I9df0f0491fa96ecb4c8f46125d987179f3aefc2f
Former-commit-id: 8d32611be4 [formerly 0372fdd6cc] [formerly d36cbb2ca9] [formerly d36cbb2ca9 [formerly 769086c0b7]] [formerly 8d32611be4 [formerly 0372fdd6cc] [formerly d36cbb2ca9] [formerly d36cbb2ca9 [formerly 769086c0b7]] [formerly e18c49ea72 [formerly d36cbb2ca9 [formerly 769086c0b7] [formerly e18c49ea72 [formerly c4b3411f4d5f7632e3c804316bd5959d16cc97f0]]]]]
Former-commit-id: e18c49ea72
Former-commit-id: 460c6c42d3 [formerly b5ae8c70c9] [formerly 0ce67592ac] [formerly 7481de12678ee827b418bf99a63d03a5fdbc87ef [formerly e28494606e9e07a3b76cb461cbaa151022eaec7a] [formerly 0ce67592ac [formerly 052e12b777]]]
Former-commit-id: bac88ad8a86cba50cb8e26f1a4e02af8a2677baf [formerly c8d8caa7c4052f15b2141148e2780b7ddd6971a5] [formerly e73e546582 [formerly 5a5c72df2f]]
Former-commit-id: e73e546582
Former-commit-id: 226093833d
|
2014-01-29 20:23:55 +00:00 |
|
Michael Gamazaychikov
|
5cadc861fd
|
ASM #114
Change-Id: I6308422a99e66701852e3b6de6c89b756513ef02
Former-commit-id: 1bec1e7cb4 [formerly 73deca037f] [formerly 297d1cffc6] [formerly 297d1cffc6 [formerly 97f9c2ea92]] [formerly 1bec1e7cb4 [formerly 73deca037f] [formerly 297d1cffc6] [formerly 297d1cffc6 [formerly 97f9c2ea92]] [formerly 8f90c0dee2 [formerly 297d1cffc6 [formerly 97f9c2ea92] [formerly 8f90c0dee2 [formerly 56dc40096e58fa8ae40b9f2cd6a1bd8f9dd3d35a]]]]]
Former-commit-id: 8f90c0dee2
Former-commit-id: 2674cabaa1 [formerly b117e710a8] [formerly 0198607fe0] [formerly d591c74ed77f67a35e077df4247a16ee17de3eb2 [formerly 8ea9bd6aedb12599a646b4ebb3e81c3350dde192] [formerly 0198607fe0 [formerly 7d7cf7cfab]]]
Former-commit-id: f37bc83670948fb62aacfa3a4848e5d86552156c [formerly 85370b5fb289a43a0b50de0ecd47f600f4f09889] [formerly 01e92945cc [formerly e478ff7fdc]]
Former-commit-id: 01e92945cc
Former-commit-id: 4888397de8
|
2014-01-29 10:58:18 -05:00 |
|
brian.dyke
|
d0df06c218
|
merge 14.2.1-3 into asm-14.2.2
Former-commit-id: 5b74176d3b [formerly becf6322c6] [formerly 4a62e83835] [formerly f121ee384ae6474f6d0db204389a1736d5bede01 [formerly 4a62e83835 [formerly 2294c81a57]]] [formerly 5b74176d3b [formerly becf6322c6] [formerly 4a62e83835] [formerly f121ee384ae6474f6d0db204389a1736d5bede01 [formerly 4a62e83835 [formerly 2294c81a57]]] [formerly f10f6d4e8a [formerly 4a62e83835 [formerly 2294c81a57] [formerly f10f6d4e8a [formerly a116be206fc8a24dd12610db37db6f26c65a19b0]]]]]
Former-commit-id: f10f6d4e8a
Former-commit-id: 21a827151b [formerly ac37e2ea2e] [formerly 621464ac0d] [formerly 9043d578b89b573988a90ad05bb77fa0d18398cc [formerly 83bf7b38976fc3a19f898b0fe2c8e7790a8d7629] [formerly 621464ac0d [formerly e9e2eb3be0]]]
Former-commit-id: 9f664eca18786308211e3ab9e6cacef5813f30a4 [formerly ee40d762efff70a1679bc3c2641d377b51facc3b] [formerly ca9263003a [formerly dcf5f25ed1]]
Former-commit-id: ca9263003a
Former-commit-id: 4744c64069
|
2014-01-27 15:27:49 -05:00 |
|
David Friedman
|
2cac342c30
|
Issue #114
Change-Id: I7fd218b0120fe8d8eb6ab535d6d07b40c6c0773d
Former-commit-id: 0097b674c4 [formerly 846bc47100] [formerly 6c1b1f33ee] [formerly 6c1b1f33ee [formerly 01d657fd50]] [formerly 0097b674c4 [formerly 846bc47100] [formerly 6c1b1f33ee] [formerly 6c1b1f33ee [formerly 01d657fd50]] [formerly fe50967163 [formerly 6c1b1f33ee [formerly 01d657fd50] [formerly fe50967163 [formerly cd136c3a57f7836606755ad9d1de7a3b8234d1d8]]]]]
Former-commit-id: fe50967163
Former-commit-id: 5e104608eb [formerly 8685594a4e] [formerly 1eae25014b] [formerly 21c152bb221a0fd010d43f00431c436e3029f26e [formerly f8126e54325a5b478e8e024aea02fb5815472921] [formerly 1eae25014b [formerly 0975f982f2]]]
Former-commit-id: 1c31c73579d8548d0c6a1fa2c46564d68623fe3c [formerly 0604b9e27cfa960f2eeffeed42ad8f007b634e81] [formerly 91e52302b0 [formerly 6fadfec657]]
Former-commit-id: 91e52302b0
Former-commit-id: 7dbf0d3618
|
2013-12-20 20:33:18 +00:00 |
|
Ben Steffensmeier
|
bbc7ab21f7
|
Issue #2491 Remove uneeded ISerializableObject files.
Former-commit-id: fd03ef5064 [formerly 230309c25f] [formerly f34bfc1e5b] [formerly f34bfc1e5b [formerly c14cc609a8]] [formerly fd03ef5064 [formerly 230309c25f] [formerly f34bfc1e5b] [formerly f34bfc1e5b [formerly c14cc609a8]] [formerly cac1f07cbb [formerly f34bfc1e5b [formerly c14cc609a8] [formerly cac1f07cbb [formerly fd4cc4fde9507cd9abbf394ea5823a8f315c7d55]]]]]
Former-commit-id: cac1f07cbb
Former-commit-id: f2a6f89402 [formerly e03a1c1202] [formerly ce9653ab15] [formerly bf9c9e9735d90828ebe8daa9f552037b1b112098 [formerly cbb9e5689b5ecaf7c5b0202dbf3d51fae0c0dda9] [formerly ce9653ab15 [formerly a06bdc56d6]]]
Former-commit-id: 19d2e2210fffba4b206f1b12c3f85b44df6e56b3 [formerly 65760735e4213dff6ee5ff8730b9a56f136c8d54] [formerly 7f38aac48c [formerly 3955ac729f]]
Former-commit-id: 7f38aac48c
Former-commit-id: fed726dd48
|
2013-10-25 15:31:39 -05:00 |
|
Nate Jensen
|
35fa7e9ffd
|
Issue #2400 fix so active map editor is used if applicable
Change-Id: I642edc1bdc94eac871a07c26e900c2431f567ab1
Former-commit-id: 3b8442dca7 [formerly 6f44e0c9e3] [formerly 58c9aced4e] [formerly 58c9aced4e [formerly 8e9e495149]] [formerly 3b8442dca7 [formerly 6f44e0c9e3] [formerly 58c9aced4e] [formerly 58c9aced4e [formerly 8e9e495149]] [formerly c1dd4b40fb [formerly 58c9aced4e [formerly 8e9e495149] [formerly c1dd4b40fb [formerly 563212924964f8ca66cba789d7867b19c68d0682]]]]]
Former-commit-id: c1dd4b40fb
Former-commit-id: d8e31081b0 [formerly 3a4fc09777] [formerly 81f5ecb21a] [formerly 10a5562971cecf968fc2570890adf6eb28f12ff7 [formerly 876c39cce804bd2eaf674c9c20e970b9219de559] [formerly 81f5ecb21a [formerly 136ea71235]]]
Former-commit-id: 5b96388f2010a375cf1fe21d512c010685c8dba4 [formerly 8f67c9aecbad713073c6c28ec81520dae762c7f9] [formerly 8b62ea092a [formerly 726f38c27f]]
Former-commit-id: 8b62ea092a
Former-commit-id: 344dfd805b
|
2013-09-30 11:47:26 -05:00 |
|
Nate Jensen
|
153f809996
|
Issue #2360 don't allow mouse actions on layer if layer is invisible
Change-Id: Id8e169d4af96902e72b2509d2f53e39ac6cc0a8a
Former-commit-id: 6beacd37cd [formerly 9b3101dd50] [formerly 906e9ad7e9] [formerly 906e9ad7e9 [formerly 08bd2c0241]] [formerly 6beacd37cd [formerly 9b3101dd50] [formerly 906e9ad7e9] [formerly 906e9ad7e9 [formerly 08bd2c0241]] [formerly ce457b5be4 [formerly 906e9ad7e9 [formerly 08bd2c0241] [formerly ce457b5be4 [formerly e4e6f46be381f83c7273d84e62d274575048aac2]]]]]
Former-commit-id: ce457b5be4
Former-commit-id: cebd5a8b68 [formerly 0773241c7e] [formerly 450f5d063d] [formerly 0f6a64a07b29f18eaea863208334e9f41b58e628 [formerly 2fc838a1d47b7b1629df2407f1c65f9b5a1a0317] [formerly 450f5d063d [formerly 11c1fa94ae]]]
Former-commit-id: 788981e8652087173176ed3d0ac06340245ab358 [formerly df68e10efee18652a36d5b86894795a3c32a86c8] [formerly 1c84ac6a75 [formerly 1150d848e4]]
Former-commit-id: 1c84ac6a75
Former-commit-id: 9f6248831e
|
2013-09-18 17:33:20 -05:00 |
|
Max Schenkelberg
|
7d5be39fa7
|
Issue #2277 Switched DataCubeContainer calls to not use ScriptCreator
Amend: Added comments as requested
Change-Id: Ib787d43638f20babfc7f89ce2eac958e31d21c3c
Former-commit-id: ff28590621 [formerly 3509baaa74] [formerly 8a500677d3] [formerly 8a500677d3 [formerly b633f9987a]] [formerly ff28590621 [formerly 3509baaa74] [formerly 8a500677d3] [formerly 8a500677d3 [formerly b633f9987a]] [formerly 2d1db7d0e2 [formerly 8a500677d3 [formerly b633f9987a] [formerly 2d1db7d0e2 [formerly efb402d2835f715143cddffeec2bd7c20d0a65f6]]]]]
Former-commit-id: 2d1db7d0e2
Former-commit-id: 50142c5a25 [formerly 70c91ed24b] [formerly 1bdef4ddd3] [formerly 97e5a1ae96f2388dc905a91bd700c97bd71fe2c7 [formerly c6fb597995ca49d9e40c0fe52f6d3e660affe671] [formerly 1bdef4ddd3 [formerly 61e6dd1316]]]
Former-commit-id: 8c1b5efe9449ef68ec178efb40e121dc5e89f521 [formerly c7d9f743abf7aa67f2754beecdece51254dec003] [formerly 1a466db041 [formerly 66d023227d]]
Former-commit-id: 1a466db041
Former-commit-id: 76be1e8862
|
2013-09-09 10:10:11 -05:00 |
|
Ben Steffensmeier
|
6007053035
|
Issue #2310 Switch awipstools to load using bundles.
Change-Id: I9a24e6359bd43bfb7c8f84686348f532748503c4
Former-commit-id: 0b330e7c36 [formerly 6f29122c14] [formerly ecf667fce9] [formerly ecf667fce9 [formerly d75fdcb916]] [formerly 0b330e7c36 [formerly 6f29122c14] [formerly ecf667fce9] [formerly ecf667fce9 [formerly d75fdcb916]] [formerly 87b6474106 [formerly ecf667fce9 [formerly d75fdcb916] [formerly 87b6474106 [formerly afc80cb00cce9b22f1ecd730b60da1de1afbfb2e]]]]]
Former-commit-id: 87b6474106
Former-commit-id: 9f40060b48 [formerly 5998b5aa02] [formerly 19cc13d9bf] [formerly 83943cb20243ecf8a1468c4f17ff6327ce8c8cae [formerly 0f540dd74f1e8e6723b36d8b78e242b7a0b0b4ec] [formerly 19cc13d9bf [formerly a6661a8831]]]
Former-commit-id: 82c54530755f40c19eea2c2f15c2f4616c275baf [formerly 1255a1be6e2fef1e238a582d3935a554a8a57cee] [formerly e8ab7969a9 [formerly 04f5cd8f2a]]
Former-commit-id: e8ab7969a9
Former-commit-id: d868f36b2b
|
2013-09-04 16:05:09 -05:00 |
|